修改主风机、局扇模型

public/js/config.js

@@ -4,8 +4,8 @@ const VUE_APP_URL = {
   webRtcUrl: '//192.168.183.216:8000' // rtsp服务器IP地址
 }
 const History_Type = {
-  // type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口，vent是走的咱们的，目前神东的项目都用remote, 其他矿用vent)
-  type: 'vent', // remote、vent
+  type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口，vent是走的咱们的，目前神东的项目都用remote, 其他矿用vent)
+  // type: 'vent', // remote、vent
   deviceType: []
 }
 

src/hooks/web/useWebColumns.ts

@@ -9,14 +9,14 @@ const arrToColumns = (tableHeaderColumns = []) => {
   const columns: BasicColumn[] = [];
   tableHeaderColumns.forEach((item: any) => {
     const columnsItem = {
-      title: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+      title: item.des, //_dictText
       dataIndex: item.dict ? `${item.monitorcode}_dictText` : item.monitorcode,
       width: item.width || 100,
       defaultHidden: !item.showflag,
       align: 'center',
       // sorter: item.sort ? true : false,
       customRender: ({ text }) => {
-        return text != null ? text : '-';
+        return (text == null || text == '' || text == undefined) ? '-' : text;
       },
     };
     columns.push(columnsItem);

src/utils/threejs/main.worker.ts

@@ -47,7 +47,7 @@ export function initModalWorker() {
     'ztfj/dzp_2023-06-02.glb',
     'ztfj/fbm_2023-06-02.glb',
     'ztfj/ztfj-fc_2023-06-02.glb',
-    'ztfj/ztfj_2023-06-02.glb',
+    'ztfj/ztfj_2023-12-12.glb',
     'fire/laneway_2023-06-02.glb',
     'fire/chamber_2023-06-02.glb',
     'fire/workFace_2023-06-29.glb',

src/views/vent/deviceManager/deviceTable/index.vue

@@ -44,14 +44,14 @@
       let columnsItem;
       if (item.type == 1 || item.type == 10) {
         columnsItem = {
-          label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+          label: item.des, //_dictText
           field: item.monitorcode,
           component: item.type == 1 ? 'Input' : item.type == 10 ? 'InputTextArea' : '',
         };
       } else {
         if (item.type == 2 && item['monitorcode'] == 'nsubstationid') {
           columnsItem = {
-            label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+            label: item.des, //_dictText
             field: item.monitorcode,
             component: 'ApiSelect',
             componentProps: {
@@ -63,7 +63,7 @@
         }
         if (item.type == 3) {
           columnsItem = {
-            label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+            label: item.des, //_dictText
             field: item.monitorcode,
             component: 'RadioGroup',
             defaultValue: 1,
@@ -80,7 +80,7 @@
         }
         if (item.type == 4) {
           columnsItem = {
-            label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+            label: item.des, //_dictText
             field: item.monitorcode,
             component: 'JDictSelectTag',
             componentProps: {

src/views/vent/deviceManager/workingFace/index.vue

@@ -38,14 +38,14 @@
         let columnsItem;
         if (item.type == 1 || item.type == 10) {
           columnsItem = {
-            label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+            label: item.des, //_dictText
             field: item.monitorcode,
             component: item.type == 1 ? 'Input' : item.type == 10 ? 'InputTextArea' : '',
           };
         } else {
           if (item.type == 3) {
             columnsItem = {
-              label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+              label: item.des, //_dictText
               field: item.monitorcode,
               component: 'RadioGroup',
               defaultValue: 1,
@@ -62,7 +62,7 @@
           }
           if (item.type == 4) {
             columnsItem = {
-              label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+              label: item.des, //_dictText
               field: item.monitorcode,
               component: 'JDictSelectTag',
               componentProps: {

src/views/vent/monitorManager/comment/GroupMonitorTable.vue

@@ -223,19 +223,27 @@
               }else{
                 resultData1[columnKey] = data[key1];
                 resultData2[columnKey] = data[key2];
+                if (resultData1[columnKey] == undefined && resultData2[columnKey] == undefined) {
+                  resultData1[columnKey] = data[columnKey]
+                  resultData2[columnKey] = data[columnKey]
+                }
               }              
             } else if(columnKey.startsWith('fan')) {
               const key1 = columnKey.replace('fan', 'fan1');
               const key2 = columnKey.replace('fan', 'fan2');
               if (columnKey.endsWith('_merge')) {
-                resultData1[columnKey] = (data[key1] == 0 || data[key1] == null || data[key1] == undefined) ? data[key2] : data[key1];
+                resultData1[columnKey] = (!data[key1] || data[key1] == 0 || data[key1] == null || data[key1] == undefined ) ? data[key2] : data[key1];
               } else {
                 resultData1[columnKey] = data[key1];
                 resultData2[columnKey] = data[key2];
+                if(resultData1[columnKey] == undefined && resultData2[columnKey] == undefined){
+                  resultData1[columnKey] = data[columnKey]
+                  resultData2[columnKey] = data[columnKey]
+                }
               }
             } else if (columnKey.endsWith('_merge')) {
               resultData1[columnKey] = data[columnKey];
-            }else {
+            } else {
               resultData1[columnKey] = resultData2[columnKey] = data[columnKey];
             }
           }

src/views/vent/monitorManager/comment/components/DeviceBaseInfo.vue

@@ -36,14 +36,14 @@ const arrToFormColumns = (tableHeaderColumns = [], devicetype) => {
     let columnsItem;
     if (item.type == 1 || item.type == 10) {
       columnsItem = {
-        label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+        label: item.des, //_dictText
         field: item.monitorcode,
         component: item.type == 1 ? 'Input' : item.type == 10 ? 'InputTextArea' : '',
       };
     } else {
       if (item.type == 2 && item['monitorcode'] == 'nsubstationid') {
         columnsItem = {
-          label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+          label: item.des, //_dictText
           field: item.monitorcode,
           component: 'ApiSelect',
           componentProps: {
@@ -55,7 +55,7 @@ const arrToFormColumns = (tableHeaderColumns = [], devicetype) => {
       }
       if (item.type == 3) {
         columnsItem = {
-          label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+          label: item.des, //_dictText
           field: item.monitorcode,
           component: 'RadioGroup',
           defaultValue: 1,
@@ -72,7 +72,7 @@ const arrToFormColumns = (tableHeaderColumns = [], devicetype) => {
       }
       if (item.type == 4) {
         columnsItem = {
-          label: item.unit ? `${item.des}(${item.unit})` : item.des, //_dictText
+          label: item.des, //_dictText
           field: item.monitorcode,
           component: 'JDictSelectTag',
           componentProps: {

src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -300,7 +300,7 @@ export const haveDetailArr = [
   'fanmain',
   'fiber',
   'bundletube',
-  'dusting',
+  // 'dusting',
   'pump',
   'safetymonitor',
   'nitrogen',

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -362,7 +362,7 @@ const deviceType = ref('') // 监测设备类型
 const systemType = ref('')
 const systemID = ref('') // 系统监测时，系统id
 const selectedKeys = ref<string[]>([]);
-const expandedKeys = ref<string[]>(['0-0-0-1']);
+const expandedKeys = ref<string[]>([]);
 const scroll = reactive({
   y: 210
 })
@@ -393,8 +393,10 @@ const onSelect: TreeProps['onSelect'] = (keys, e) => {
     timer = undefined
   }
   setTimeout(() => {
+    expandedKeys.value = keys
     selectedKeys.value = keys
     treeNodeTitle.value = e.node.title
+    console.log('树选择器--------------->', selectedKeys.value, treeNodeTitle.value, e)
     dataSource.value = []
     activeKey.value = '1'
     timer = null
@@ -695,6 +697,9 @@ async function findTreeDataValue(obj) {
         selectedKeys.value = [item.key]
         expandedKeys.value = [item.key]
         treeNodeTitle.value = item.title
+
+        console.log('99999999999999999999999', selectedKeys.value, )
+
         return true
       }
       return false

src/views/vent/monitorManager/mainFanMonitor/index.vue

@@ -452,8 +452,7 @@
           } else {
             MonitorDataTable.value.setSelectedRowKeys(dataSource.value[0]['deviceID'])
           }
-        }
-        
+        }        
         Object.assign(selectData, deviceBaseList.value, dataSource.value[selectRowIndex.value]);
         if (selectData['Fan1StartStatus'] == 1 && selectData['Fan2StartStatus'] == 0) {
           frontMonitorIsShow.value = true

src/views/vent/monitorManager/mainFanMonitor/main.threejs.ts

@@ -221,8 +221,8 @@ export const playAnimate = async (selectData, duration?) => {
   if (!mainWindObj) return;
   if (modalType === 'mainWindRect') {
     if (selectData) {
-      if (selectData['Fan1FreqHz'] == undefined || selectData['Fan1FreqHz'] == null || !selectData['Fan1FreqHz']) selectData['Fan1FreqHz'] = 50;
-      if (selectData['Fan2FreqHz'] == undefined || selectData['Fan2FreqHz'] == null || !selectData['Fan2FreqHz']) selectData['Fan2FreqHz'] = 50;
+      if (selectData['Fan1FreqHz'] == undefined || selectData['Fan1FreqHz'] == null || selectData['Fan1FreqHz'] == '') selectData['Fan1FreqHz'] = 50;
+      if (selectData['Fan2FreqHz'] == undefined || selectData['Fan2FreqHz'] == null || selectData['Fan2FreqHz'] == '') selectData['Fan2FreqHz'] = 50;
       mainWindObj.resetSmokeParam('front', selectData.Fan1FreqHz, duration);
       mainWindObj.resetSmokeParam('back', selectData.Fan2FreqHz, duration);
       if (selectData.Fan1StartStatus == 1) {