唐润平：下拉框优化，编辑视角调整

src/components/content/tunnelScene/TunnelScene.vue

@@ -46,7 +46,7 @@ const info = ref(null);
 const edit = ref(null);
 let demo; //定义demo全局变量
 // const loader = new OBJLoader();
-const loader = new GLTFLoader();
+const loader = new OBJLoader();
 let hdrLoader = new RGBELoader();
 let backColorSet = three.sRGBEncoding;
 
@@ -68,17 +68,13 @@ async function handleMounted() {
 
   // 初始化设备模型
   try {
-    const deviceList = [];
-    let result = await loadModel("/devicesModel/fan.glb");
-    deviceList.push(result);
-    result = await loadModel("/devicesModel/sensor.glb");
-    deviceList.push(result);
+    const map = new Map();
+    map.set("equ_fan", await loadModel("/devicesModel/fan.obj"));
+    map.set("equ_sensors", await loadModel("/devicesModel/sensors.obj"));
 
     // 给对象初加载设备模型
-    demo.initDevicesModel(deviceList);
-    console.info("设备模型加载完毕");
-    // 清空内存
-    result = null;
+    demo.initDevicesModel(map);
+    console.info("设备模型加载完毕", deviceList);
   } catch (err) {
     console.log(err);
   }
@@ -139,15 +135,17 @@ function lClickCallback(demo) {
 }
 
 let pointNum = ref(0);
+let targetP;
 // 右键点击附着点后调函数
 function rClickCallback(demo) {
   function editDev(targetPoint = null) {
     hasDevice = targetPoint.hasDevice;
+    targetP = targetPoint;
     pointNum.value = Number(
       targetPoint.name.substring(
         targetPoint.name.indexOf("_") + 1,
         targetPoint.name.lastIndexOf("_")
-      )
+      ) - 1
     );
 
     if (!targetPoint.info) return;
@@ -157,8 +155,8 @@ function rClickCallback(demo) {
 }
 
 // 添加设备
-function handleAddEqu() {
-  console.log("添加", pointInfo);
+function handleAddEqu(e) {
+  console.log("添加的设备属性", e);
 }
 
 // 删除设备
@@ -180,6 +178,7 @@ function handleCancel() {
   if (!demo) return;
   // 关闭标签
   demo.isControlOrbit(true);
+  demo._resetState();
   demo.clearTagsObj();
 }
 </script>