唐润平：接口重写

src/components/content/tunnelScene/TunnelScene.vue

@@ -3,17 +3,34 @@
     <div id="cvs" ref="content"></div>
     <dev-info ref="info" :devInfo="devInfo" />
     <!-- 这里的预览模式需要做成不能修改的模式 -->
-    <edit-dialog ref="edit" @addEquipment="handleAddEqu" @removeEquipment="handleRemoveEqu" @cancel="handleCancel"
-      :hasDev="hasDevice" :pointNum="pointNum" :tunnelId="tunnelId" :position="targetP?.name" :hasEquipment="hasDevice"
-      :pointGap="pointGap" />
-    <el-dialog v-model="centerDialogVisible" width="30%" destroy-on-close center :show-close="false" style="
+    <edit-dialog
+      ref="edit"
+      @addEquipment="handleAddEqu"
+      @removeEquipment="handleRemoveEqu"
+      @cancel="handleCancel"
+      :hasDev="hasDevice"
+      :pointNum="pointNum"
+      :tunnelId="params.tunnelId"
+      :position="targetP?.name"
+      :hasEquipment="hasDevice"
+      :pointGap="pointGap"
+      :form="params.form"
+    />
+    <el-dialog
+      v-model="centerDialogVisible"
+      width="30%"
+      destroy-on-close
+      center
+      :show-close="false"
+      style="
         margin: 20% auto;
         width: 569px;
         height: 330px;
         background: rgba(7, 35, 72, 0.79);
         border-radius: 20px;
         border: 2px solid #0f82af;
-      ">
+      "
+    >
       <p id="remove-title">是否确定删除该设备</p>
       <div class="btn">
         <button @click="centerDialogVisible = false">取消</button>
@@ -49,45 +66,38 @@ import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
 import { onMounted, reactive, ref, watch } from "vue";
 import { ElMessage } from "element-plus";
-import { useModelSceneStore } from "@/store/modelSceneStore";
+import { deleteEquipment, initData } from "./request";
 
 // 获取html标签跟随组件dom
 const content = ref(null);
 const info = ref(null);
 const edit = ref(null);
-const store = useModelSceneStore();
-
+let modelList = ref(null);
 let demo; //定义demo对象
 const loader = new OBJLoader();
 let hdrLoader = new RGBELoader();
 let backColorSet = three.sRGBEncoding;
 
-const params = defineProps(["isedit", "tunnelId", "tunnelLength"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
-
+const params = defineProps(["isedit", "tunnelId", "tunnelLength", "form"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
 
 let isedit = ref(params.isedit);
-
 let tunnelId = reactive(params.tunnelId);
-console.log(tunnelId);
-console.log(params.tunnelLength);
 
 watch(
   () => params.tunnelLength,
   (now) => {
-    params.tunnelLength = now
+    params.tunnelLength = now;
     console.log(params.tunnelLength);
-    pointGap = now / 20
+    pointGap = now / 20;
   },
   { deep: true }
-)
+);
 
 let pointGap = reactive(params.tunnelLength);
 
-
 onMounted(handleMounted);
 // 挂载后回调
 async function handleMounted() {
-
   const doms = [info.value.$el, edit.value.$el];
   demo = new ThreeDScene(three, content.value);
   //看是不是预览模式，然后继续相关的操作(会在demo中的初始化中进行)
@@ -106,12 +116,7 @@ async function handleMounted() {
 
   //加载HDR背景图片
   demo.loadBackground(hdrLoader, backColorSet);
-  watch(
-    () => params.tunnelId,
-    async () => {
-      const text = await store.initData(params.tunnelId);
-    }
-  );
+
   // 初始化设备模型
   try {
     const map = new Map();
@@ -119,16 +124,15 @@ async function handleMounted() {
     map.set("equ_sensors", await loadModel("/devicesModel/sensors.obj"));
     demo.initDevicesModel(map);
     // 初始化
-    const equipmentList = await store.getEquipmentList();
-    demo.editTunnelInit(equipmentList);
+    modelList.value = await initData(params.tunnelId, params.form);
+    console.log("init", params.tunnelId);
+    demo.editTunnelInit(modelList.value);
   } catch (err) {
     ElMessage({
-      message: "场景加载异常！",
+      message: "场景初始化异常！",
       type: "warning",
     });
   }
-
-
 }
 
 // 每个模型加载回调
@@ -139,7 +143,7 @@ function loadModel(path) {
       (obj) => {
         resolve(obj);
       },
-      (xhr) => { },
+      (xhr) => {},
       (err) => {
         reject(err);
       }
@@ -225,8 +229,7 @@ function handleRemoveEqu() {
 // 对话框确认删除
 function handleConfirmAddEqu() {
   console.log("target:", targetP.value.info);
-  store
-    .deleteEquipment(10000, params.tunnelId, targetP.value.info.equipmentId)
+  deleteEquipment(targetP.value.info.equipmentId, pointGap)
     .then((res) => {
       demo.removeEquipment(targetP.value);
       centerDialogVisible.value = false;
@@ -235,9 +238,9 @@ function handleConfirmAddEqu() {
         type: "success",
       });
     })
-    .catch((err) => {
+    .catch((res) => {
       ElMessage({
-        message: "请求异常！",
+        message: "删除失败！",
         type: "warning",
       });
     });