Browse Source

【Mod 0000 新增斜对射测风装置

hongrunxia 1 week ago
parent
commit
0a459eca9a

+ 10 - 5
src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -258,13 +258,18 @@
       gdeviceids: props.deviceId ? [props.deviceId] : deviceOptions.value[0] ? [deviceOptions.value[0]['value']] : [''],
     });
     if (stationType.value !== 'redis') {
+      // await getForm().updateSchema({
+      //   field: 'gdeviceids',
+      //   defaultValue: [props.deviceId ? props.deviceId : deviceOptions.value[0] ? deviceOptions.value[0]['value'] : ''],
+      //   componentProps: {
+      //     mode: 'multiple',
+      //     maxTagCount: 'responsive',
+      //   },
+      // });
+      // 暂时处理为单选
       await getForm().updateSchema({
         field: 'gdeviceids',
-        defaultValue: [props.deviceId ? props.deviceId : deviceOptions.value[0] ? deviceOptions.value[0]['value'] : ''],
-        componentProps: {
-          mode: 'multiple',
-          maxTagCount: 'responsive',
-        },
+        defaultValue: props.deviceId ? props.deviceId : deviceOptions.value[0] ? deviceOptions.value[0]['value'] : '',
       });
     } else {
       await getForm().updateSchema({

+ 13 - 1
src/views/vent/monitorManager/compressor/components/nitrogenHome_blt.vue

@@ -120,6 +120,7 @@
         </div>
       </div>
     </div>
+    <div ref="playerRef" class="player-box"></div>
   </div>
   <HandleModal :modal-is-show="modalIsShow" :modal-title="modalTitle" :modal-type="modalType" @handle-ok="handleOK" @handle-cancel="handleCancel" />
 </template>
@@ -138,6 +139,7 @@
   import lodash from 'lodash';
   import { formatNum } from '/@/utils/ventutil';
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { useCamera } from '/@/hooks/system/useCamera';
 
   const globalConfig = inject('globalConfig');
 
@@ -151,6 +153,8 @@
       require: true,
     },
   });
+  const playerRef = ref();
+  const { getCamera, removeCamera } = useCamera();
   const refresh = ref(false);
   const modalTitle = ref(''); // 模态框标题显示内容,根据设备操作类型决定
   const modalType = ref(''); // 模态框内容显示类型,设备操作类型
@@ -354,7 +358,15 @@
     modalTitle.value = '';
     modalType.value = '';
   }
-
+  watch(
+    () => props.deviceId,
+    async (deviceId) => {
+      if (deviceId) {
+        await getCamera(deviceId, playerRef.value, 'nitrogen');
+        getDataSource(props.deviceId, true);
+      }
+    }
+  );
   watch([monitorDataGroupNum, loading], ([newMonitorDataGroupNum, newLoading]) => {
     nextTick(() => {
       if (newMonitorDataGroupNum && !newLoading) {

+ 3 - 2
src/views/vent/monitorManager/compressor/nitrogen.data.ts

@@ -224,12 +224,13 @@ export function getMonitorComponent() {
     case 'sdmtjtsgtmk': // 石圪台
     case 'sdmtjtbetmk': // bet
     case 'sdmtjtcctmk': // bet
+    case 'sdmtjtjjmk': // 锦界
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bet.vue'));
       return nitrogenHome;
     case 'sdmtjtbdmk': // bd
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bd.vue'));
       return nitrogenHome;
-    case 'sdmtjtjjmk': // 锦界
+    // case 'sdmtjtjjmk': // 锦界
     case 'sdmtjtyjlmk': //yjl
     case 'sdmtjtbltmk': // 补连塔
       // debugger;
@@ -247,7 +248,7 @@ export function getMonitorComponent() {
     default:
       // nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_blt.vue'));
       // nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bet.vue'));
-      nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_dltj.vue'));
+      nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bet.vue'));
       return nitrogenHome;
   }
 }

+ 2 - 0
src/views/vent/monitorManager/windrectMonitor/duishe.threejs.ts

@@ -24,6 +24,8 @@ class dsWindRect {
     this.group.name = this.modelName;
   }
   setModelType(deviceType) {
+    // deviceType = 'two';
+    // debugger;
     this.deviceType = deviceType;
     const dsgdObj = this.group.getObjectByName('dsgd');
     const dsmoveObj = this.group.getObjectByName('dsmove');

+ 5 - 5
src/views/vent/monitorManager/windrectMonitor/index.vue

@@ -584,13 +584,13 @@
           // type = 'duisheFixed';
         }
         if (selectRow.deviceType.startsWith('windrect_ds_four')) {
+          //windrect_ds_two
           type = 'dsWindRect_four';
         }
-        if (
-          selectRow.deviceType.startsWith('windrect_ds_two') ||
-          selectRow.deviceType.startsWith('windrect_ds_sut') ||
-          selectRow.deviceType.startsWith('windrect_muti')
-        ) {
+        if (selectRow.deviceType.startsWith('windrect_ds_two')) {
+          type = 'dsWindRect_two';
+        }
+        if (selectRow.deviceType.startsWith('windrect_ds_sut') || selectRow.deviceType.startsWith('windrect_muti')) {
           type = 'duisheFixed';
         }
         if (