Merge branch 'dev' of http://192.168.0.115:3000/bill/4pc into dev

src/lib/board/4dmap.js

@@ -13380,7 +13380,7 @@ const Du = (s, t) => {
     fill: "#000"
   }), u = new Oo({
     visible: !1,
-    opacity: 0.75,
+    opacity: 1,
     name: "label",
     offsetX: -i.width / 2,
     offsetY: -6
@@ -13389,20 +13389,22 @@ const Du = (s, t) => {
   const f = new dn({
     name: "text",
     text: s.title || `P${s.id}`,
-    fontFamily: "Calibri",
-    fontSize: 10,
-    padding: 5,
-    fill: "#000"
+    fontFamily: "Inter",
+    fontSize: 12,
+    padding: 8,
+    fill: "#303133"
   });
   u.add(
     new To({
       name: "tag",
-      fill: "rgba(255, 255, 255, 0.8)",
+      fill: "rgba(255, 255, 255, 1)",
       pointerDirection: "down",
-      pointerWidth: 5,
-      pointerHeight: 5,
+      pointerWidth: 8,
+      pointerHeight: 8,
       lineJoin: "round",
       shadowColor: "black",
+      cornerRadius: 2,
+      opacity: 1,
       shadowBlur: 10,
       shadowOffsetX: 10,
       shadowOffsetY: 10,
@@ -13423,7 +13425,7 @@ const Du = (s, t) => {
     },
     setData(m) {
       let [v, _] = Gt(d, [1, 1]);
-      d.scale({ x: v, y: _ }), d.x(m[0]), d.y(m[1]), f.text(s.title || `P${s.id}`), ~t.editPolygonNdx ? (A.text((t.editPolygonNdx + 1).toString()).visible(!0), A.offsetX(-h.width() / 2 + A.width() / 2), l.shape.visible(!0), a.visible(!1)) : (A.visible(!1), l.shape.visible(!1), a.visible(e.status.selectPoiIds.includes(s.id)));
+      d.scale({ x: v, y: _ }), d.x(m[0]), d.y(m[1]), f.text(t.attrib.title || `P${s.id}`), ~t.editPolygonNdx ? (A.text((t.editPolygonNdx + 1).toString()).visible(!0), A.offsetX(-h.width() / 2 + A.width() / 2), l.shape.visible(!0), a.visible(!1)) : (A.visible(!1), l.shape.visible(!1), a.visible(e.status.selectPoiIds.includes(s.id)));
     },
     draging() {
       ~t.editPolygonNdx && (n.fill("#e0403c"), a.fill("#e0403c"));

src/view/map/coord.vue

@@ -53,7 +53,7 @@
                 v-else
                 class="box-item"
                 effect="dark"
-                :content="data.raw.name || node.label"
+                :content="data.raw.name || node.label.toString()"
                 placement="top"
               >
                 <div class="title-box">

src/view/map/install.ts

@@ -63,10 +63,17 @@ watch(
 
 // -------board------
 export const board = createBoard({ map: mapManage.map });
-watch(boardData, (data) => data && board.setData(data), {
-  immediate: true,
-  flush: "pre",
-});
+watch(
+  boardData,
+  (data, oldData) => {
+    data && board.setData(data);
+    console.log(data, data === oldData);
+  },
+  {
+    immediate: true,
+    flush: "pre",
+  }
+);
 
 export const boardDataChange = (dataChange?: () => void) => {
   dataChange && dataChange();

src/view/pano/pano.vue

@@ -211,7 +211,7 @@ onMounted(() => {
 onUnmounted(() => mergeFuns(...destroyFns)());
 watchEffect(() => {
   if (router.currentRoute.value.name === "pano" && point.value) {
-    setDocTitle(point.value.name);
+    setDocTitle(point.value.name || relics.value.name);
   }
 });
 </script>