注氮、历史优化

src/views/vent/monitorManager/balancePressMonitor/balancePress.threejs.base.ts

@@ -20,7 +20,6 @@ class balancePressBase {
   }
 
   addLight() {
-
     const directionalLight = new THREE.DirectionalLight(0xffffff, 1);
     directionalLight.position.set(34, 7, -61);
     this.group?.add(directionalLight);
@@ -103,7 +102,7 @@ class balancePressBase {
         y: 275,
       },
       {
-        text: `${selectData.fault}`,
+        text: `${selectData.warnLevel_str ? selectData.warnLevel_str : '-'}`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -255,7 +254,6 @@ class balancePressBase {
   }
 
   runFly(deviceType, state, duration?) {
-
     if (state === 'open') {
       if (deviceType === 'top') {
         if (this.downSmoke?.frameId) {

src/views/vent/monitorManager/balancePressMonitor1/balancePress.three.ts

@@ -172,7 +172,7 @@ export const addText = (selectData) => {
       y: 275,
     },
     {
-      text: `${selectData.fault}`,
+      text: `${selectData.warnLevel_str ? selectData.warnLevel_str : '-'}`,
       font: 'normal 30px Arial',
       color: '#009900',
       strokeStyle: '#002200',

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

@@ -208,7 +208,7 @@ import { onMounted } from 'vue';
                 // labelField: 'strinstallpos',
                 // valueField: 'id',
                 onChange: (e, option) => {
-                  if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind'])) historyType.value = option['strinstallpos'] || option['strtype'] || option['devicekind']
+                  if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind'])) historyType.value = option['strtype'] || option['devicekind']
                 },
               },
               colProps: {
@@ -337,7 +337,7 @@ import { onMounted } from 'vue';
               // valueField: 'id',
               // numberToString: true,
               onChange: (e, option) => {
-                if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind'])) historyType.value = option['strinstallpos'] || option['strtype'] || option['devicekind']
+                if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind'])) historyType.value = option['strtype'] || option['devicekind']
               },
             },
             // componentProps: ({ formModel }) => {

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

@@ -472,7 +472,7 @@ onUnmounted(() => {
   width: 100%;
   height: 100%;
   top: 10px;
-  position: absolute;
+  position: relative;
   z-index: 99;
   pointer-events: none;
 

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

@@ -139,7 +139,7 @@ export const addText = (selectData) => {
       y: 165,
     },
     {
-      text: `${selectData.flength ? selectData.flength : '-'}`,
+      text: `${selectData.fchimenylength ? selectData.fchimenylength : '-'}`,
       font: 'normal 30px Arial',
       color: '#009900',
       strokeStyle: '#002200',
@@ -155,7 +155,7 @@ export const addText = (selectData) => {
       y: 220,
     },
     {
-      text: ` ${selectData.fsectarea ? selectData.fsectarea : '-'}`,
+      text: ` ${selectData.fchimenydiamlimit ? selectData.fchimenydiamlimit : '-'}`,
       font: 'normal 30px Arial',
       color: '#009900',
       strokeStyle: '#002200',
@@ -179,11 +179,11 @@ export const addText = (selectData) => {
       y: 275,
     },
     {
-      text: `国能神东煤炭集团监制`,
+      text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤炭科学技术研究院有限公司研制',
       font: 'normal 28px Arial',
       color: '#009900',
       strokeStyle: '#002200',
-      x: 80, //20  煤炭科学技术研究院有限公司研制
+      x: History_Type['type'] == 'remote' ? 80 : 20, //20  煤炭科学技术研究院有限公司研制
       y: 325,
     },
   ];

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

@@ -42,7 +42,7 @@
       <div class="top-center row">
         <div class="vent-flex-row" id="fanLocalSelectDom" v-if="getDictItemsByCode('fanlocaltype')">
           <span style="color: #00f5fe; margin-left: 5px;">风机类型：</span>
-          <JDictSelectTag v-model:value="devicekide" placeholder="请选择性别" dictCode="fanlocaltype" :getPopupContainer="getPopupContainer" @change="changeDeviceKind" />
+          <JDictSelectTag v-model:value="devicekide" dictCode="fanlocaltype" :showChooseOption="false" :getPopupContainer="getPopupContainer" @change="changeDeviceKind" />
         </div>
         <div class="button-box" v-for="(item, index) in modalTypeArr.leftBtnArr" :key="index" @click="showModal(item)">{{ item.value }}</div>
       </div>
@@ -507,10 +507,12 @@
   const changeDeviceKind = (e) => {
     devicekide.value = e
     loading.value = true
+    selectRowIndex.value = -1
     nextTick( () => {
-      selectRowIndex.value = 0
-      Object.assign(selectData, {})
+      // selectRowIndex.value = 0
+      selectData = lodash.cloneDeep(initData)
       loading.value = false
+      if(selectData.deviceID)MonitorDataTable.value.setSelectedRowKeys([selectData.deviceID])
     })
   }
 
@@ -546,6 +548,9 @@
         data = Object.assign(data, readData);
         dataSource.value.push(data);
       });
+      if (MonitorDataTable.value && selectRowIndex.value == -1) {
+        MonitorDataTable.value.setSelectedRowKeys([dataSource.value[0]['deviceID']])
+      }
       const data: any = toRaw(dataSource.value[selectRowIndex.value]); //maxarea
       return data;
     }else{
@@ -567,7 +572,7 @@
             MonitorDataTable.value.setSelectedRowKeys(dataSource.value[0]['deviceID'])
           }
         }
-        selectData = lodash.cloneDeep(initData)
+        selectData = Object.assign(deviceBaseList.value, lodash.cloneDeep(initData)) 
     
         if(dataSource.value.length > 0 && dataSource.value[selectRowIndex.value] ){
           Object.assign(selectData, dataSource.value[selectRowIndex.value])
@@ -589,13 +594,13 @@
     }
   };
 
-  // // 获取设备基本信息列表
-  // const deviceBaseList = ref([]);
-  // function getDeviceBaseList() {
-  //   getTableList({ pageSize: 1000 }).then((res) => {
-  //     deviceBaseList.value = res.records;
-  //   });
-  // };
+  // 获取设备基本信息列表
+  const deviceBaseList = ref([]);
+  function getDeviceBaseList() {
+    getTableList({ pageSize: 1000 }).then((res) => {
+      deviceBaseList.value = res.records;
+    });
+  };
 
   // 切换检测数据
   function getSelectRow(id) {
@@ -787,7 +792,7 @@
 
 
   onBeforeMount(() => {
-    // getDeviceBaseList();
+    getDeviceBaseList();
   });
 
   onMounted(() => {

src/views/vent/monitorManager/gateMonitor/gate.threejs.three.ts

@@ -1,3 +1,4 @@
+
 import * as THREE from 'three';
 import { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
 import { getTextCanvas, renderVideo } from '/@/utils/threejs/util';
@@ -130,7 +131,7 @@ class Fm2 {
         y: 275,
       },
       {
-        text: `${selectData.fault}`,
+        text: `${selectData.warnLevel_str ? selectData.warnLevel_str : '-'}`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -138,11 +139,11 @@ class Fm2 {
         y: 275,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤炭科学技术研究院有限公司研制',
         font: 'normal 28px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
-        x: 20,
+        x: History_Type['type'] == 'remote' ? 80 : 20,
         y: 325,
       },
     ];

src/views/vent/monitorManager/gateMonitor/gate.threejs.two.ts

@@ -109,7 +109,7 @@ class Fm1 {
         y: 100,
       },
       {
-        text: `压力(Pa):`,
+        text: `巷道径高度(m):`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -117,7 +117,7 @@ class Fm1 {
         y: 155,
       },
       {
-        text: `${selectData.frontRearDP}`,
+        text: `${selectData.fclearheight ? selectData.fclearheight : '-'}`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -125,7 +125,7 @@ class Fm1 {
         y: 155,
       },
       {
-        text: `动力源压力(MPa): `,
+        text: `巷道径宽度(m): `,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -133,7 +133,7 @@ class Fm1 {
         y: 215,
       },
       {
-        text: ` ${selectData.sourcePressure}`,
+        text: ` ${selectData.fclearwidth ? selectData.fclearwidth : '-'}`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -149,7 +149,7 @@ class Fm1 {
         y: 275,
       },
       {
-        text: `${selectData.fault}`,
+        text: `${selectData.warnLevel_str ? selectData.warnLevel_str : '-'}`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -157,11 +157,11 @@ class Fm1 {
         y: 275,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤炭科学技术研究院有限公司研制',
         font: 'normal 28px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
-        x: 20,
+        x: History_Type['type'] == 'remote' ? 80 : 20,
         y: 325,
       },
     ];
@@ -328,7 +328,6 @@ class Fm1 {
 
   // 播放动画
   play(handlerState, timeScale = 0.01) {
-
     let handler = () => {};
     switch (handlerState) {
       case 1: // 打开前门

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

@@ -101,7 +101,16 @@
                     v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 1 && record.rearGateClose == 0"
                     color="default">打开</a-tag>
                 </template>
-
+                <template v-if="column.dataIndex === 'warnLevel'">
+                  <a-tag v-if="record.warnLevel == '101'" color="green">蓝色预警</a-tag>
+                  <a-tag v-else-if="record.warnLevel == '102'" color="#FF5812">黄色预警</a-tag>
+                  <a-tag v-else-if="record.warnLevel == '103'" color="#FF5812">橙色预警</a-tag>
+                  <a-tag v-else-if="record.warnLevel == '104'" color="#FF5812">红色预警</a-tag>
+                  <a-tag v-else-if="record.warnLevel == '201'" color="#FF0000">报警</a-tag>
+                  <a-tag v-else-if="record.warnLevel == '10000'" color="#FF5812">数据超限</a-tag>
+                  <a-tag v-else-if="record.warnLevel == '1001'" color="default">网络中断</a-tag>
+                  <a-tag v-else color="green">正常</a-tag>
+                </template>
                 <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : 'red'">{{
                   record.warnFlag == 0 ? '正常' : '报警'
                 }}</a-tag>

src/views/vent/monitorManager/nitrogen/components/nitrogenHome.vue

@@ -3,7 +3,7 @@
     <div v-show="monitorDataGroupFlag == 1" id="compressorCss3D"  class="threejs-Object-CSS compressorCss3D-box"
         style="width: 100%; height: 100%; position: absolute; pointer-events: none; overflow: hidden; z-index: 2; top: 0px; left: 0px">
         <!-- <a-spin :spinning="loading" /> -->
-        <div  v-for="(groupNum, index) in monitorDataGroupNum1" :key="index" class="modal-monitor">
+        <div  v-for="(groupNum, index) in monitorDataGroupNum" :key="index" class="modal-monitor">
           <fourBorderBg :class="`kyj${groupNum}`" :id="`nitrogenMonitor${groupNum}`">
             <div class="title">{{ groupNum }}号空压机 </div>
             <div class="monitor-item">
@@ -49,59 +49,11 @@
           </fourBorderBg>
         </div>
     </div>
-    <div v-show="monitorDataGroupFlag == 2" id="compressorCss3D1" class="threejs-Object-CSS compressorCss3D-box"
-        style="width: 100%; height: 100%; position: absolute; pointer-events: none; overflow: hidden; z-index: 3; top: 0px; left: 0px">
-        <div  v-for="(groupNum, index) in monitorDataGroupNum2" :key="index" class="modal-monitor">
-            <fourBorderBg :class="`kyj${groupNum}`" :id="`nitrogenMonitor${groupNum}`">
-              <div class="title">{{ groupNum }}号空压机 </div>
-              <div class="monitor-item">
-                <span class="monitor-title">机头温度:</span>
-                <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_HeadTemp`] ?
-                  monitorData[`PRE${groupNum}_CPR_HeadTemp`] : '-' }}</span><span class="unit"></span>℃</span>
-              </div>
-              <div class="monitor-item">
-                <span class="monitor-title">冷却温度:</span>
-                <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_CoolantTemp`] ?
-                  monitorData[`PRE${groupNum}_CPR_CoolantTemp`] : '-' }}</span><span class="unit">℃</span></span>
-              </div>
-              <div class="monitor-item">
-                <span class="monitor-title">排气温度:</span>
-                <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] ? monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] : '-' }}</span><span class="unit">℃</span></span>
-              </div>
-              <div class="signal-item">
-                <div class="signal"><span class="monitor-title">运行信号</span><span
-                    :class="{ 'signal-round': true, 'signal-round-run': monitorData[`PRE${groupNum}_MOT_Running`] == '1', 'signal-round-gry': monitorData[`PRE${groupNum}_MOT_Running`] != '1' }"></span>
-                </div>
-                <div class="signal"><span class="monitor-title">故障信号</span><span
-                    :class="{ 'signal-round': true, 'signal-round-warning': monitorData[`PRE${groupNum}_MOT_Fault`] == '1', 'signal-round-gry': monitorData[`PRE${groupNum}_MOT_Fault`] != '1' }"></span>
-                </div>
-              </div>
-            </fourBorderBg>
-            <fourBorderBg :class="`cqg${groupNum}`" :id="`cqgMonitor${groupNum}`">
-              <div class="title">{{ groupNum }}号储气罐 </div>
-              <div class="monitor-item">
-                <span class="monitor-title">气囊温度:</span>
-                <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_VLS_Temp`] ?
-                  monitorData[`PRE${groupNum}_VLS_Temp`] : '-' }}</span><span class="unit">℃</span></span>
-              </div>
-              <!-- <div class="monitor-item">
-              <span class="monitor-title">气囊压力<span class="unit"></span>:</span>
-              <span class="monitor-val"><span class="val">{{ monitorData[groupNum - 1] && monitorData[groupNum - 1]['airReceiverPress'] ?
-                monitorData[groupNum - 1]['airReceiverPress'] : '-' }}</span><span class="unit">Mpa</span></span>
-            </div>
-            <div class="monitor-item">
-              <span class="monitor-title">气囊流量<span class="unit"></span>:</span>
-              <span class="monitor-val"><span class="val">{{ monitorData[groupNum - 1] && monitorData[groupNum - 1]['airReceiverFlow'] ?
-                monitorData[groupNum - 1]['airReceiverFlow'] : '-' }}</span><span class="unit">m³/k</span></span>
-            </div> -->
-            </fourBorderBg>
-          </div>
-    </div>
     <div class="nitrogen-home">
-      <div style="position: absolute; color: #fff; top: 30px; pointer-events: auto; display: flex;">
+      <!-- <div style="position: absolute; color: #fff; top: 30px; pointer-events: auto; display: flex;">
         <span class="tab-button-box" :class="{'tab-button-box-active': monitorDataGroupFlag == 1}" @click="setMonitorGroupNum(monitorDataGroupNum1, 1)">压风系统1</span>
         <span class="tab-button-box" :class="{ 'tab-button-box-active': monitorDataGroupFlag == 2 }" @click="setMonitorGroupNum(monitorDataGroupNum2, 2)">压风系统2</span>
-      </div>
+      </div> -->
       <div class="total-data">
         <div class="item">总流量(m³/min)：<span class="val">{{ monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] ? monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] : '-' }}</span></div>
         <div class="item">总压力(bar)：<span class="val">{{ monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] ? monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] : '-' }}</span></div>
@@ -209,10 +161,10 @@ import fourBorderBg from '../../../comment/components/fourBorderBg.vue'
 import { mountedThree, destroy, setModelType, clearCssText } from '../nitrogen.threejs'
 import { list } from '../nitrogen.api'
 import ventBox1 from '/@/components/vent/ventBox1.vue'
-import { monitorDataGroupNum1, monitorDataGroupNum2, airCompressorState, showMonitorData, monitorData } from '../nitrogen.data'
+import { monitorDataGroupNum1, monitorDataGroupNum2, monitorDataGroupNum3, airCompressorState, showMonitorData, monitorData } from '../nitrogen.data'
 
 const loading = ref(true)
-const monitorDataGroupNum = ref(monitorDataGroupNum1)
+const monitorDataGroupNum = ref(4)
 const monitorDataGroupFlag = ref(1)
 const kyjs = ['1号空压机', '2号空压机', '3号空压机', '4号空压机'];
 const cqgs = ['1号储气罐', '2号储气罐', '3号储气罐', '4号储气罐'];
@@ -226,7 +178,7 @@ async function getMonitor(flag?) {
       if (timer) {
         timer = null;
       }
-      await getMonitor();
+      await getMonitor(false);
     }, flag ? 0 : 1000);
   }
 };
@@ -234,142 +186,6 @@ async function getMonitor(flag?) {
 async function getDataSource() {
   const res = await list({ devicetype: 'forcFan', pagetype: 'normal' });
   let dataSource = res.msgTxt[0].datalist[0];
-  // dataSource =  
-  //   {
-  //     "msgType": null,
-  //     "deviceID": "1705212847586627592",
-  //     "strname": "压风机系统",
-  //     "strinstallpos": "压风机系统",
-  //     "fsectarea": "null",
-  //     "stationname": "压风机系统分站",
-  //     "deviceType": "forcFan",
-  //     "typeName": null,
-  //     "netStatus": 1,
-  //     "warnFlag": 0,
-  //     "warnLevel": null,
-  //     "warnLevel_str": null,
-  //     "warnTime": null,
-  //     "readTime": "2023-10-24 08:47:27",
-  //     "warnDes": "",
-  //     "frontGateOpenCtrl": null,
-  //     "rearGateOpenCtrl": null,
-  //     "readData": {
-  //       "PRE1_MOT_PhaseATemp": "526",
-  //       "PRE3_CPR_CoolantTemp": "12",
-  //       "PRE4_CPR_HeadTemp": "13",
-  //       "PRE2_MOT_PhaseATempAlarm": "0",
-  //       "PRE5_MOT_Fault": "0",
-  //       "PRE4_MOT_PhaseATempStop": "0",
-  //       "PRE4_CPR_LoadPre": "65",
-  //       "PRE5_CPR_LoadPre": "62",
-  //       "PRE4_MOT_CtrlMode": "1",
-  //       "PRE2_CPR_LoadorUnload": "1",
-  //       "PRE3_MOT_PhaseBTemp": "133",
-  //       "PRE1_CPR_ExhaustPre": "66",
-  //       "PRE1_MOT_PhaseATempAlarm": "0",
-  //       "PRE5_CPR_UnLoadPre": "69",
-  //       "PRE4_MOT_PhaseATemp": "129",
-  //       "PRE5_MOT_PhaseCTemp": "685",
-  //       "PRE5_MOT_PhaseATemp": "681",
-  //       "PRE5_VLS_Temp": "590",
-  //       "PRE1_CPR_LoadTime": "8344",
-  //       "PRE2_CPR_LoadTime": "5553",
-  //       "PRE4_CPR_LoadorUnload": "0",
-  //       "PRE5_MOT_PhaseATempAlarm": "0",
-  //       "PRE3_CPR_LoadTime": "4511",
-  //       "PRE5_CPR_LoadTime": "6032",
-  //       "PRE1_MOT_PhaseATempStop": "0",
-  //       "PRE2_MOT_CompProtFault": "0",
-  //       "PRE5_MOT_PhaseATempStop": "0",
-  //       "PRE3_MOT_PhaseATempStop": "0",
-  //       "PRE1_VLS_Temp": "436",
-  //       "PRE2_CPR_ExhaustPre": "71",
-  //       "PRE5_MOT_CtrlMode": "1",
-  //       "PRE3_CPR_ExhaustTemp": "10",
-  //       "PRE3_MOT_TotalRunTime": "5342",
-  //       "P RE2_MOT_PhaseATemp": "541",
-  //       "PRE4_MOT_PhaseCTemp": "130",
-  //       "PRE4_MOT_PhaseATempAlarm": "0",
-  //       "timestamp": "1698108447720",
-  //       "PRE3_VLS_Temp": "219",
-  //       "PRE1_HostorLoc": "0",
-  //       "PRE2_MOT_Running": "1",
-  //       "PRE1_CPR_LoadPre": "65",
-  //       "PRE1_MOT_Running": "1",
-  //       "PRE4_MOT_Fault": "0",
-  //       "PRE2_CPR_LoadPre": "65",
-  //       "PRE3_MOT_Running": "0",
-  //       "PRE4_MOT_Running": "0",
-  //       "PRE3_CPR_LoadPre": "65",
-  //       "PRE1_MOT_CtrlMode": "1",
-  //       "PRE3_MOT_CtrlMode": "1",
-  //       "PRE3_CPR_LoadorUnload": "0",
-  //       "PRE2_MOT_PhaseCTemp": "550",
-  //       "PRE1_CPR_CoolantTemp": "71",
-  //       "PRE1_MOT_PhaseBTemp": "539",
-  //       "PRE3_MOT_PhaseATempAlarm": "0",
-  //       "PRE5_MOT_Running": "1",
-  //       "PRE1_MOT_Fault": "0",
-  //       "PRE4_CPR_ExhaustPre": "66",
-  //       "PRE4_CPR_CoolantTemp": "12",
-  //       "PRE5_CPR_ExhaustTemp": "76",
-  //       "PRE2_CPR_HeadTemp": "89",
-  //       "PRE3_MOT_PhaseCTemp": "135",
-  //       "PRE4_CPR_LoadTime": "5084",
-  //       "sign": "0",
-  //       "PRE1_CPR_UnLoadPre": "72",
-  //       "PRE4_HostorLoc": "0",
-  //       "PRE4_MOT_CompProtFault": "0",
-  //       "PRE1_CPR_LoadorUnload": "1",
-  //       "PRE3_CPR_ExhaustPre": "68",
-  //       "PRE2_CPR_ExhaustTemp": "77",
-  //       "PRE2_MOT_PhaseATempStop": "0",
-  //       "PRE5_MOT_CompProtFault": "0",
-  //       "PRE2_MOT_Fault": "0",
-  //       "PRE5_MOT_PhaseBTemp": "676",
-  //       "PRE3_MOT_PhaseATemp": "134",
-  //       "PRE4_MOT_PhaseBTemp": "130",
-  //       "PRE2_CPR_CoolantTemp": "66",
-  //       "PRE3_HostorLoc": "0",
-  //       "PRE4_MOT_TotalRunTime": "5104",
-  //       "PRE1_MOT_TotalRunTime": "8416",
-  //       "PRE3_MOT_CompProtFault": "0",
-  //       "PRE3_MOT_Fault": "0",
-  //       "PRE4_CPR_UnLoadPre": "72",
-  //       "PRE1_CPR_HeadTemp": "97",
-  //       "PRE2_HostorLoc": "0",
-  //       "PRE2_MOT_PhaseBTemp": "562",
-  //       "PRE3_CPR_HeadTemp": "13",
-  //       "PRE2_MOT_TotalRunTime": "5586",
-  //       "PRE5_CPR_HeadTemp": "95",
-  //       "PRE3_CPR_UnLoadPre": "72",
-  //       "PRE4_VLS_Temp": "166",
-  //       "PRE5_CPR_CoolantTemp": "70",
-  //       "PRE1_MOT_CompProtFault": "0",
-  //       "PRE5_MOT_TotalRunTime": "7825",
-  //       "PRE2_MOT_CtrlMode": "1",
-  //       "PRE5_CPR_ExhaustPre": "68",
-  //       "PRE1_MOT_PhaseCTemp": "544",
-  //       "PRE5_CPR_LoadorUnload": "1",
-  //       "PRE2_CPR_UnLoadPre": "72",
-  //       "PRE4_CPR_ExhaustTemp": "11",
-  //       "PRE2_VLS_Temp": "445",
-  //       "isRun": "-2",
-  //       "PRE5_HostorLoc": "0",
-  //       "PRE1_CPR_ExhaustTemp": "68"
-  //     },
-  //     "readDataDes": null,
-  //     "summaryHour": [],
-  //     "summaryDay": [],
-  //     "history": [],
-  //     "totalInfo": null,
-  //     "sign": null,
-  //     "cameras": [],
-  //     "links": [],
-  //     "other1": null,
-  //     "other2": null,
-  //     "other3": null
-  //   }
   if(dataSource){
     monitorData.value = Object.assign(dataSource, dataSource.readData);
   }
@@ -386,12 +202,6 @@ async function getDataSource() {
   loading.value = false
 };
 
-function setMonitorGroupNum(num, flag){
-  
-  monitorDataGroupNum.value = num
-  monitorDataGroupFlag.value = flag
-}
-
 function handlerDevice(data) {
   // if (data.length < 1) return
   // handleAirCompressor({ id: data.id, compressRunF1: data.compressRunSigF1 }).then(res => {
@@ -421,7 +231,7 @@ watch(monitorDataGroupFlag, (newVal) => {
 })
 
 onMounted(async () => {
-  mountedThree(monitorDataGroupNum1, monitorDataGroupNum2).then(async() => {
+  mountedThree(monitorDataGroupNum3).then(async() => {
     await getMonitor(true)
     setModelType('compressor1')
   })

src/views/vent/monitorManager/obfurage1Monitor/gate.threejs.three.ts

@@ -130,7 +130,7 @@ class Fm2 {
         y: 275,
       },
       {
-        text: `${selectData.fault}`,
+        text: `${selectData.warnLevel_str ? selectData.warnLevel_str : '-'}`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',

src/views/vent/monitorManager/obfurage1Monitor/gate.threejs.two.ts

@@ -149,7 +149,7 @@ class Fm1 {
         y: 275,
       },
       {
-        text: `${selectData.fault}`,
+        text: `${selectData.warnLevel_str ? selectData.warnLevel_str : '-'}`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',

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

@@ -1,5 +1,4 @@
 import * as THREE from 'three';
-
 import { getTextCanvas, renderVideo } from '/@/utils/threejs/util';
 import gsap from 'gsap';
 
@@ -129,11 +128,11 @@ class singleWindow {
         y: 200,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤炭科学技术研究院有限公司研制',
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
-        x: 60,
+        x: History_Type['type'] == 'remote' ? 120 : 60,
         y: 302,
       },
     ];

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

@@ -1,5 +1,4 @@
 import * as THREE from 'three';
-
 import { getTextCanvas, renderVideo } from '/@/utils/threejs/util';
 import gsap from 'gsap';
 
@@ -123,11 +122,11 @@ class doubleWindow {
         y: 205,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤炭科学技术研究院有限公司研制',
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
-        x: 60,
+        x: History_Type['type'] == 'remote' ? 120 : 60,
         y: 302,
       },
     ];