bill vor 1 Jahr
Ursprung
Commit
3abca978d9
4 geänderte Dateien mit 27 neuen und 13 gelöschten Zeilen
  1. 5 2
      src/view/map/map-board.vue
  2. 15 4
      src/view/map/map-right.vue
  3. 2 2
      tsconfig.json
  4. 5 5
      vite.config.ts

+ 5 - 2
src/view/map/map-board.vue

@@ -29,7 +29,7 @@
         </div>
       </div>
     </Teleport>
-    <div id="map" class="map-container" ref="mapContainer" @click.stop>
+    <div id="map" class="map-container" ref="mapContainer" @click.stop="unActiveId">
       <div class="map-component">
         <el-select
           v-model="tileType"
@@ -54,6 +54,7 @@
         v-if="isCurrentTab(0)"
         @fly-point="flyScenePoint"
         @fly-scene="flyScene"
+        :boardPolygons="board.polygon"
         @goto-point="gotoPointPage"
       />
       <MapRightPoly
@@ -178,7 +179,9 @@ const flyScene = (scene: Scene) => {
   totalPos[1] /= numCalc;
   flyPos(totalPos);
 };
-
+const unActiveId = () => {
+  board.polygon.status.activePointId = null;
+};
 const flyScenePoint = (point: ScenePoint) => {
   flyPos(point.pos);
   board.polygon.status.activePointId = point.id.toString();

+ 15 - 4
src/view/map/map-right.vue

@@ -167,12 +167,13 @@ import { SceneStatus } from "@/store/scene";
 import StateGpsIcon from "@/assets/state_gps.svg";
 import PanoramaIcon from "@/assets/panorama.svg";
 import FrameIcon from "@/assets/frame.svg";
-import { DrawingDataType } from "@/request/drawing";
+import { DrawingDataType, getDrawingDetailFetch } from "@/request/drawing";
 import { alert } from "@/helper/message";
-import { getWholeLineLinesByPointId } from "drawing-board";
+import { Polygons, getWholeLineLinesByPointId } from "drawing-board";
 
 const props = defineProps<{
   data: DrawingDataType | null;
+  boardPolygons: Polygons;
 }>();
 
 const emit = defineEmits<{
@@ -215,6 +216,13 @@ const getSelectPoints = () =>
     .filter((option: any) => option.type === "point")
     .map((option: any) => option.raw) as ScenePoint[];
 
+watchEffect(() => {
+  if (treeRef.value) {
+    props.boardPolygons.status.selectPoiIds = getSelectPoints().map((point) =>
+      point.id.toString()
+    );
+  }
+});
 const addHandler = async () => {
   const sceneCodes = scenes.value.map((scene) => scene.sceneCode);
   await selectScenes({
@@ -243,17 +251,20 @@ const delRelicsScenes = (scenes: Pick<Scene, "sceneId" | "sceneCode">[]) =>
   );
 
 const delSceneHandler = async (scenes: Scene[]) => {
+  const res = await getDrawingDetailFetch(String(relicsId.value));
   for (const scene of scenes) {
     const que = scene.scenePos.some((pos) => {
       const id = pos.id.toString();
-      return getWholeLineLinesByPointId(props.data as any, id).length !== 0;
+      console.log(getWholeLineLinesByPointId(res.data as any, id), id);
+      return getWholeLineLinesByPointId(res.data as any, id).length !== 0;
     });
     if (que) {
       await alert("已存在矢量图数据,不可删除。");
+      return;
     }
   }
 
-  console.log(props.data);
+  console.log(res.data);
   return;
   await delRelicsScenes(scenes);
   await refreshScenes();

+ 2 - 2
tsconfig.json

@@ -27,8 +27,8 @@
         "src/*"
       ],
       "drawing-board": [
-        "./src/lib/board/4dmap.d.ts"
-        // "../drawing-board/src/app/4dmap/index.ts"
+        // "./src/lib/board/4dmap.d.ts"
+        "../drawing-board/src/app/4dmap/index.ts"
       ]
     }
   },

+ 5 - 5
vite.config.ts

@@ -16,11 +16,11 @@ export default ({ mode }: any) =>
         },
         {
           find: "drawing-board",
-          replacement: resolve(__dirname, "./src/lib/board/4dmap.js"),
-          // replacement: resolve(
-          //   __dirname,
-          //   "../drawing-board/src/app/4dmap/index.ts"
-          // ),
+          // replacement: resolve(__dirname, "./src/lib/board/4dmap.js"),
+          replacement: resolve(
+            __dirname,
+            "../drawing-board/src/app/4dmap/index.ts"
+          ),
         },
       ],
     },