修改障碍物保存逻辑

src/views/index.vue

@@ -972,7 +972,7 @@
 </template>
 <script setup>
 import Ruler from "@/components/ruler.vue";
-import {onMounted, ref, watch, computed} from "vue";
+import {computed, onMounted, ref, watch} from "vue";
 import {
   addShildData,
   DeleteCData,
@@ -981,10 +981,13 @@ import {
   GetAllCData,
   getArea,
   getParasPos,
-  getParasSignalpro, GetSetting,
+  getParasSignalpro,
+  GetSetting,
   getShildList,
   InserDealObstacleModel,
-  InsertCListData, PosSetting, PostDealObstacleModel,
+  InsertCListData,
+  PosSetting,
+  PostDealObstacleModel,
   RestartWork,
   setParasPos,
   setParasSignalpro,
@@ -1000,9 +1003,10 @@ import {useRouter} from "vue-router";
 import {ElMessage} from "element-plus";
 import {
   calcRectangleFromPoints,
-  getLocalPositionRelativeToP4,
+  correctDeviation,
   getDeviationValue,
-  correctDeviation, parseTime
+  getLocalPositionRelativeToP4,
+  parseTime
 } from '@/utils/tool'
 
 const date1 = ref([])
@@ -1484,10 +1488,7 @@ const addShildItem = () => {
   }
   tableData1.value = tableData1.value.filter(v => !(v.Lon === shildForm.value.lon && v.Lat === shildForm.value.lat && v.Strength === shildForm.value.strength))
   if (data) {
-    let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex.value = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex.value = index
-    }
   }
 
   addShildData(shildForm.value).then(e => {
@@ -1547,10 +1548,7 @@ const delPoint = (e) => {
 
 
   if (data) {
-    let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex.value = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex.value = index
-    }
   }
 }
 // 打开处置模态框
@@ -1583,10 +1581,7 @@ const handleObstacle = () => {
     dialog1.value = false
     tableData1.value = tableData1.value.filter(v => !(v.Lon === dialog1Form.value.longitude && v.Lat === dialog1Form.value.latitude && v.Strength === dialog1Form.value.strength))
     if (data) {
-      let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+      dotIndex.value = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-      if (index >= 0) {
-        dotIndex.value = index
-      }
     }
   })
 }
@@ -1617,10 +1612,7 @@ const batchDisposal = () => {
   })
   getShildTableList()
   if (data) {
-    let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex.value = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex.value = index
-    }
   }
 }
 // 批量删除
@@ -1641,10 +1633,7 @@ const batchDel = () => {
     }
   })
   if (data) {
-    let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex.value = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex.value = index
-    }
   }
 }
 // 批量固定
@@ -1674,10 +1663,7 @@ const batchShild = () => {
   })
   getShildTableList()
   if (data) {
-    let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex.value = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex.value = index
-    }
   }
 }
 
@@ -1706,10 +1692,7 @@ const addShildItem1 = () => {
   }
   tableData1.value = tableData1.value.filter(v => !(v.Lon === shildForm.value.lon && v.Lat === shildForm.value.lat && v.Strength === shildForm.value.strength))
   if (data) {
-    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex1.value = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex1.value = index
-    }
   }
 
   addShildData(shildForm1.value).then(e => {
@@ -1769,10 +1752,7 @@ const delPoint1 = (e) => {
 
 
   if (data) {
-    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex1.value = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex1.value = index
-    }
   }
 }
 // 打开处置模态框
@@ -1805,10 +1785,7 @@ const handleObstacle1 = () => {
     dialog2.value = false
     tableData1.value = tableData1.value.filter(v => !(v.Lon === dialog1Form.value.longitude && v.Lat === dialog1Form.value.latitude && v.Strength === dialog1Form.value.strength))
     if (data) {
-      let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+      dotIndex1.value = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-      if (index >= 0) {
-        dotIndex1.value = index
-      }
     }
   })
 }
@@ -1839,10 +1816,7 @@ const batchDisposal1 = () => {
   })
   getShildTableList()
   if (data) {
-    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex1.value = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex1.value = index
-    }
   }
 }
 // 批量删除
@@ -1863,10 +1837,7 @@ const batchDel1 = () => {
     }
   })
   if (data) {
-    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex1.value = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex1.value = index
-    }
   }
 }
 // 批量固定
@@ -1896,10 +1867,7 @@ const batchShild1 = () => {
   })
   getShildTableList()
   if (data) {
-    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    dotIndex1.value = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
-    if (index >= 0) {
-      dotIndex1.value = index
-    }
   }
 }