From 3ce5582ea3dc7e4f5955c6af58992dc56417b8f1 Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Fri, 29 Dec 2023 22:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9Atest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/TunnelScene.vue           |  1 -
 .../tunnelScene/editEquComp/editDialog.vue        | 15 ++++-----------
 .../content/tunnelScene/request/index.js          |  4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index b0add02..c2f81cc 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -125,7 +125,6 @@ async function handleMounted() {
     demo.initDevicesModel(map);
     // 初始化
     modelList.value = await initData(params.tunnelId, params.form);
-    console.log("init", params.tunnelId);
     demo.editTunnelInit(modelList.value);
   } catch (err) {
     ElMessage({
diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue
index 16434de..3ee40e9 100644
--- a/src/components/content/tunnelScene/editEquComp/editDialog.vue
+++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue
@@ -70,17 +70,7 @@ const pointDistance_str = computed(
   () =>
     `${params.pointGap}米*${params.pointNum}=${(
       params.pointGap * params.pointNum
-    ).toFixed(2)}米`
-);
-
-watch(
-  () => params.form,
-  () => {
-    initData(params.tunnelId, params.form);
-  },
-  {
-    deep: true,
-  }
+    ).toFixed(1)}米`
 );
 
 // 请求数据模型
@@ -106,11 +96,13 @@ function resetEquipmentSetting() {
 // 绑定选择的设备类型
 function handleTypeChange(optionItem) {
   equipmentSetting.equipmentType = optionItem.value;
+  console.log("option", optionItem);
 }
 function handleEquipmentChange(equipmentItem) {
   equipmentSetting.equipmentName = equipmentItem.label;
   equipmentSetting.equipmentId = equipmentItem.equipmentId;
   equipmentSetting.typeKey = equipmentItem.value;
+  console.log("option", equipmentItem);
 }
 // 设备类型选项参数
 let options = reactive([{ label: "暂无数据", value: "" }]);
@@ -180,6 +172,7 @@ function addEquipment() {
     return;
   }
   equipmentSetting.position = params.position;
+  console.log("add", equipmentSetting);
   // 合法请求
   saveEquipment(equipmentSetting, params.pointGap)
     .then((res) => {
diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js
index babe138..fd4558f 100644
--- a/src/components/content/tunnelScene/request/index.js
+++ b/src/components/content/tunnelScene/request/index.js
@@ -9,7 +9,6 @@ export const initData = (tunnelId, otherInfo) => {
       .then((res) => {
         originData = toRaw(otherInfo);
         if (res.data.tunnelThreeConfig) {
-          console.log("data", res.data);
           modelEquipmentList = JSON.parse(res.data.tunnelThreeConfig);
         }
         console.log("test", modelEquipmentList, originData);
@@ -107,7 +106,7 @@ export const deleteEquipment = (equipmentId, pointGap) => {
       .then((res) => {
         if (res?.code === 1000) {
           modelEquipmentList = modelEquipmentList.filter(
-            (item) => item.equipmentId === equipmentId
+            (item) => item.equipmentId != equipmentId
           );
           resolve();
         }
@@ -141,5 +140,6 @@ function hasEquipment(equipmentId) {
   modelEquipmentList.forEach((item) => {
     if (item.equipmentId === equipmentId) result = true;
   });
+  console.log("add", modelEquipmentList);
   return result;
 }