1. 局部风机模型初始位置调整

2. 上湾风窗模型加载优化

src/views/vent/monitorManager/compressor/components/nitrogenHome_dltj.vue

@@ -8,7 +8,15 @@
     <a-spin :spinning="loading" />
     <div v-for="groupNum in monitorDataGroupNum" :key="groupNum" class="modal-monitor">
       <fourBorderBg :class="`kyj${groupNum}`" :id="`nitrogenMonitor${groupNum}`">
-        <div class="title">空压机{{ groupNum }} </div>
+        <!-- <div class="title">空压机{{ groupNum }} </div> -->
+        <div class="title">
+          {{ monitorData ? monitorData['strname' + groupNum] : '-' }}
+          （
+          <span :style="{ color: monitorData && monitorData['Status' + groupNum] == '1' ? '#67fc00' : '#e9170b' }">
+            {{ monitorData && monitorData['Status' + groupNum] == '1' ? '运行' : '停止' }}
+          </span>
+          ）
+        </div>
         <template v-for="(preMonitor, preMonitorIndex) in preMonitorListData" :key="preMonitorIndex">
           <div v-if="preMonitor.code !== 'signal'" class="monitor-item">
             <span class="monitor-title">{{ preMonitor.title }}:</span>
@@ -100,7 +108,7 @@
           <div class="item item-l" v-for="groupNum in monitorDataGroupNum" :key="groupNum">
             <ventBox1>
               <template #title>
-                <div>空压机{{ groupNum }}</div>
+                <div>{{ monitorData['strname' + groupNum] }}</div>
               </template>
               <template #container>
                 <div class="monitor-box">
@@ -180,13 +188,7 @@
           <span class="monitor-title">{{ data.title }} :</span>
           <span class="monitor-val" v-if="!refresh"
             ><span class="val">
-              {{
-                monitorData.length > 0 && monitorData[0][data.code]
-                  ? data.raw
-                    ? monitorData[0][data.code]
-                    : parseFloat(monitorData[0][data.code]).toFixed(2)
-                  : '-'
-              }}
+              {{ monitorData && monitorData[data.code] ? (data.raw ? monitorData[data.code] : parseFloat(monitorData[data.code]).toFixed(2)) : '-' }}
             </span>
             <span class="unit">{{ data.unit }}</span></span
           >
@@ -312,7 +314,7 @@
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     if (res) {
       const result = res;
-      debugger;
+
       // const result = {
       //   cmd: 'monitordata',
       //   msgTxt: [
@@ -489,6 +491,9 @@
       //             LeakageLock1: '0',
       //             MainMotor_Current1: '95',
       //             OpenFail1: '0',
+      //             o2Val: '20.23',
+      //             temperature: '19.5',
+      //             fumes_str: '0.2',
       //           },
       //           readDataDes: null,
       //           summaryHour: [],
@@ -572,13 +577,14 @@
       if (!result || result.msgTxt.length < 1) return;
       let dataSoreDatas = {};
       let netStatus = 0;
-      result.msgTxt.forEach((item) => {
+      result.msgTxt.forEach((item, index) => {
         if (item.type && item.type.startsWith('nitrogen')) {
           airCompressorState.length = 0;
 
           if (item.type.startsWith('nitrogen_52507')) {
             if (deviceType.value !== 'nitrogen_52507') deviceType.value = 'nitrogen_52507';
             dataSoreDatas = Object.assign(dataSoreDatas, item['datalist'][0], item['datalist'][0]['readData']);
+            dataSoreDatas['strname' + (index + 1)] = item['datalist'][0]['strname'];
             if (item['datalist'][0]['netStatus']) {
               netStatus = 1;
             }

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.three.bk.ts

@@ -278,7 +278,8 @@ export const addCssText = () => {
       fanLocalCSS3D.name = 'text2';
       fanLocalCSS3D.scale.set(0.1, 0.1, 0.1);
       fanLocalCSS3D.rotation.y = -Math.PI / 2;
-      fanLocalCSS3D.position.set(74.63, 13.54, 3.84);
+      // fanLocalCSS3D.position.set(74.63, 13.54, 3.84);
+      fanLocalCSS3D.position.set(57.84, 10.54, 0.08);
       group.add(fanLocalCSS3D);
     }
   }

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.base.ts

@@ -448,9 +448,9 @@ class ModelContext {
       if (element) {
         const fanLocalCSS3D = new CSS3DObject(element);
         fanLocalCSS3D.name = 'text2';
-        fanLocalCSS3D.scale.set(0.1, 0.1, 0.1);
+        fanLocalCSS3D.scale.set(0.15, 0.15, 0.15);
         fanLocalCSS3D.rotation.y = -Math.PI / 2;
-        fanLocalCSS3D.position.set(57.84, 10.54, 0.08);
+        fanLocalCSS3D.position.set(85.62, 17.65, 7.71);
         this.group.add(fanLocalCSS3D);
       }
     }
@@ -595,15 +595,15 @@ class ModelContext {
       }
       setTimeout(async () => {
         if (childGroup) this.group?.add(childGroup);
-        const oldCameraPosition = { x: 615, y: 275, z: 744 };
-        await animateCamera(
-          oldCameraPosition,
-          { x: 0, y: 0, z: 0 },
-          { x: 0.08, y: 21.73, z: 78.45 },
-          { x: 0.13, y: -0.82, z: 0.236 },
-          this.model,
-          0.8
-        );
+        // const oldCameraPosition = { x: 615, y: 275, z: 744 };
+        // await animateCamera(
+        //   oldCameraPosition,
+        //   { x: 0, y: 0, z: 0 },
+        //   { x: 0.08, y: 21.73, z: 78.45 },
+        //   { x: 0.13, y: -0.82, z: 0.236 },
+        //   this.model,
+        //   0.8
+        // );
         resolve(null);
       }, 300);
     });

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.ts

@@ -4,6 +4,7 @@ import FanLocal from './fanLocal.threejs.base';
 import FanLocalDual from './fanLocalDual.threejs.base';
 import { animateCamera } from '/@/utils/threejs/util';
 import useEvent from '../../../../utils/threejs/useEvent';
+import { modal } from 'vxe-table';
 
 /** 模型总控制器 */
 let model: UseThree;
@@ -24,6 +25,7 @@ const { mouseDownFn } = useEvent();
 function dispatchMouseEvent(event) {
   if (event.button == 0 && model && group) {
     mouseDownFn(model, group, event, () => {});
+    console.log(model.camera, model.orbitControls);
   }
 }
 
@@ -93,16 +95,20 @@ export function setModelType(modelType: 'fanLocal' | 'fanLocalDual' | string, su
           group.children.forEach((e) => {
             e.visible = true;
           });
-          const oldCameraPosition = { x: -693, y: 474, z: 398 };
-          const position = { x: 14.826074594663222, y: 16.901762713393836, z: 36.459944037951004 };
-          await animateCamera(
-            oldCameraPosition,
-            { x: 0, y: 0, z: 0 },
-            { x: position.x, y: position.y, z: position.z },
-            { x: 0, y: 0, z: 0 },
-            model,
-            0.8
-          );
+          // const oldCameraPosition = { x: -693, y: 474, z: 398 };
+          // const position = { x: 14.826074594663222, y: 16.901762713393836, z: 36.459944037951004 };
+          // await animateCamera(
+          //   oldCameraPosition,
+          //   { x: 0, y: 0, z: 0 },
+          //   { x: position.x, y: position.y, z: position.z },
+          //   { x: 0, y: 0, z: 0 },
+          //   model,
+          //   0.8
+          // );
+
+          // 模型不同需要不同的初始角度与位置
+          const oldCameraPosition = { x: 615, y: 275, z: 744 };
+          await animateCamera(oldCameraPosition, { x: 0, y: 0, z: 0 }, { x: -1.85, y: 13.58, z: 37.39 }, { x: -1.83, y: 2.58, z: -0.75 }, model, 0.8);
           resolve(null);
         }, 400);
       }
@@ -130,10 +136,11 @@ export function mountedThree(sceneSelctor: string, cssSelectors: string[]) {
     });
     const model2 = new FanLocalDual(model);
     await model2.mountedThree();
-    modelContextList.push({
-      type: 'fanLocalDual',
-      context: model2,
-    });
+    // 暂时先不加双行
+    // modelContextList.push({
+    //   type: 'fanLocalDual',
+    //   context: model2,
+    // });
 
     initEventListender();
     setCamera();

src/views/vent/monitorManager/windowMonitor/shuangdaoFcSw.threejs.ts

@@ -284,7 +284,7 @@ class doubleWindow {
 
   mountedThree(playerDom) {
     return new Promise((resolve) => {
-      this.model.setGLTFModel('ddFc').then((gltf) => {
+      this.model.setGLTFModel('ddFc_sw').then((gltf) => {
         const fcModal = gltf[0];
         fcModal.name = 'ddFc';
         this.group?.add(fcModal);