[Fix 0000] 优化主风机箭头方向

src/utils/encryption/signMd5Utils.js

@@ -9,7 +9,7 @@ export default class signMd5Utils {
    */
 
   static sortAsc(jsonObj) {
-    let arr = new Array();
+    let arr = [];
     let num = 0;
     for (let i in jsonObj) {
       arr[num] = i;

src/utils/threejs/main.worker.ts

@@ -54,8 +54,8 @@ export function initModalWorker() {
     'ztfj/dzp_2023-06-02.glb',
     'ztfj/fbm_2023-06-02.glb',
     'ztfj/ztfj-fc_2023-06-02.glb',
-    'ztfj/ztfj_2024-12-25.glb',
-    'ztfj/ztfj-xj_2024-07-12.glb',
+    'ztfj/ztfj_2025-02-21.glb',
+    'ztfj/ztfj-xj_2025-02-22.glb',
     'fire/laneway_2024-03-04.glb',
     'fire/laneway-device_2024-03-19.glb',
     'fire/chamber_2023-06-02.glb',

src/views/super/drag/page/components/PageModal.vue

@@ -14,7 +14,7 @@
   import { saveOrUpdate } from '../page.api';
   import { removeCacheByDynKey } from '/@/utils/auth';
   import { JDragConfigEnum } from '/@/enums/jeecgEnum';
-  import { encryptByBase64,decodeByBase64 } from '/@/utils/cipher.ts';
+  import { encryptByBase64, decodeByBase64 } from '/@/utils/cipher.ts';
   // 声明Emits
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
@@ -30,11 +30,11 @@
     setModalProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
     if (unref(isUpdate)) {
-			let obj = {...data.record}
-			//解密
-			if(obj.protectionCode && obj.protectionCode.length>0){
-				 obj.protectionCode = decodeByBase64( obj.protectionCode)
-			}
+      let obj = { ...data.record };
+      //解密
+      if (obj.protectionCode && obj.protectionCode.length > 0) {
+        obj.protectionCode = decodeByBase64(obj.protectionCode);
+      }
       //表单赋值
       await setFieldsValue({
         ...obj,
@@ -53,9 +53,9 @@
       const values = await validate();
       setModalProps({ confirmLoading: true });
       //加密
-      if(values.protectionCode){
+      if (values.protectionCode) {
         values.protectionCode = encryptByBase64(values.protectionCode);
-			}
+      }
       //提交表单
       const res = await saveOrUpdate(values, isUpdate.value);
       //编辑后，将缓存中的密码清除掉

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

@@ -46,8 +46,8 @@ export const locationList = [
 ];
 
 export function getMonitorComponent() {
-  // const { sysOrgCode } = useGlobSetting();
-  const sysOrgCode = 'sdmtjtsgtmk';
+  const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtsgtmk';
   let FiberModal;
   switch (sysOrgCode) {
     case 'sdmtjtsgtmk': //石圪台

src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal.hlg.vue

@@ -115,9 +115,6 @@
           dataIndex: 'position',
           width: 60,
           align: 'center',
-          customRender: ({ index }) => {
-            return `测点${index + 1}`;
-          },
         },
         {
           title: '最高温度(℃)',
@@ -188,37 +185,541 @@
 
       watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
         console.log(newDataSource, 'newDataSource--------------');
-        deviceList.value = newDataSource as any[];
+
         // if (newActiveID != oldActiveID) {
         //   activeDeviceID.value = newActiveID as string;
         // }
+        // newDataSource = [
+        //   {
+        //     msgType: null,
+        //     deviceID: '1754025882387599361',
+        //     strname: '31煤中央变电所电缆沟-通道一',
+        //     strinstallpos: '31煤中央变电所电缆沟-通道一',
+        //     fsectarea: 'null',
+        //     stationname: '光纤测温',
+        //     stationtype: 'redis',
+        //     deviceType: 'fiber_normal',
+        //     typeName: '光纤测温',
+        //     netStatus: 1,
+        //     warnFlag: 0,
+        //     warnLevel: 0,
+        //     warnLevel_str: '正常',
+        //     syswarnLevel: null,
+        //     syswarnLevel_str: null,
+        //     syswarnLevel_des: null,
+        //     warnTime: null,
+        //     readTime: '2025-02-17 14:48:00',
+        //     warnDes: '',
+        //     frontGateOpenCtrl: null,
+        //     rearGateOpenCtrl: null,
+        //     readData: {
+        //       Section9_AlarmTemp: '0.00',
+        //       Section13_BeginPosition: '5010.00',
+        //       Section4_MaxTempPos: '1207.00',
+        //       Section2_BeginPosition: '91.00',
+        //       Section10_EndPosition: '4126.00',
+        //       sign: '0',
+        //       Section2_AlarmTemp: '0.00',
+        //       Section2_MaxTemp: '19.00',
+        //       Section12_AlarmTemp: '0.00',
+        //       Section8_EndPosition: '3777.00',
+        //       Section12_MaxTempPos: '5007.00',
+        //       Section7_EndPosition: '3296.00',
+        //       Section9_EndPosition: '3956.00',
+        //       Section1_BeginPosition: '1.00',
+        //       Section6_EndPosition: '2293.00',
+        //       Section7_BeginPosition: '2796.00',
+        //       Section6_MaxTemp: '14.00',
+        //       Section12_MaxTemp: '14.00',
+        //       Section1_MaxTempPos: '67.00',
+        //       Section13_EndPosition: '5364.00',
+        //       Section11_EndPosition: '4626.00',
+        //       Section4_MaxTemp: '14.00',
+        //       Section5_AlarmTemp: '0.00',
+        //       Section12_EndPosition: '5009.00',
+        //       Section11_MaxTempPos: '4143.00',
+        //       Section12_BeginPosition: '4627.00',
+        //       Section9_MaxTempPos: '3941.00',
+        //       Section13_AlarmTemp: '0.00',
+        //       maxValue: '27.00',
+        //       Section1_AlarmTemp: '0.00',
+        //       Section2_MaxTempPos: '91.00',
+        //       Section8_MaxTemp: '15.00',
+        //       Section8_AlarmTemp: '0.00',
+        //       Section6_BeginPosition: '1793.00',
+        //       Section10_MaxTempPos: '3997.00',
+        //       Section10_AlarmTemp: '0.00',
+        //       Section3_MaxTempPos: '291.00',
+        //       Section4_AlarmTemp: '0.00',
+        //       Section11_BeginPosition: '4127.00',
+        //       Section9_BeginPosition: '3778.00',
+        //       Section1_MaxTemp: '19.00',
+        //       Section3_MaxTemp: '16.00',
+        //       Section7_AlarmTemp: '0.00',
+        //       Section13_MaxTempPos: '5010.00',
+        //       Section10_BeginPosition: '3957.00',
+        //       Section5_MaxTempPos: '1316.00',
+        //       Section11_AlarmTemp: '0.00',
+        //       Section8_MaxTempPos: '3736.00',
+        //       Section5_BeginPosition: '1292.00',
+        //       Section11_MaxTemp: '21.00',
+        //       Section5_MaxTemp: '14.00',
+        //       Section10_MaxTemp: '27.00',
+        //       Section1_EndPosition: '90.00',
+        //       Section3_BeginPosition: '291.00',
+        //       Section2_EndPosition: '290.00',
+        //       Section9_MaxTemp: '26.00',
+        //       Section6_MaxTempPos: '1816.00',
+        //       Section4_EndPosition: '1291.00',
+        //       Section3_AlarmTemp: '0.00',
+        //       Section5_EndPosition: '1792.00',
+        //       Section3_EndPosition: '791.00',
+        //       Section7_MaxTemp: '14.00',
+        //       Section13_MaxTemp: '14.00',
+        //       Section8_BeginPosition: '3297.00',
+        //       Section7_MaxTempPos: '3285.00',
+        //       Section6_AlarmTemp: '0.00',
+        //       isRun: '-2',
+        //       Section4_BeginPosition: '792.00',
+        //     },
+        //     readDataDes: null,
+        //     summaryHour: [],
+        //     summaryDay: [],
+        //     history: [],
+        //     dayhistory: [],
+        //     totalInfo: null,
+        //     sign: null,
+        //     cameras: [],
+        //     links: [],
+        //     avgParam: {
+        //       avg_gas_value: null,
+        //       min_temperature_value: null,
+        //       min_no_value: null,
+        //       avg_no_value: null,
+        //       max_ch4_value: null,
+        //       min_co2_value: null,
+        //       min_m3_value: null,
+        //       max_o2_value: null,
+        //       avg_va_value: null,
+        //       max_c2h2_value: null,
+        //       min_c2h4_value: null,
+        //       max_no_value: null,
+        //       avg_m3_value: null,
+        //       max_co_value: null,
+        //       min_va_value: null,
+        //       min_ch4_value: null,
+        //       max_temperature_value: null,
+        //       min_gas_value: null,
+        //       device_id: 1754025882387599361,
+        //       min_o2_value: null,
+        //       avg_temperature_value: null,
+        //       max_dusting_value: null,
+        //       min_c2h2_value: null,
+        //       min_dusting_value: null,
+        //       avg_c2h4_value: null,
+        //       max_c2h4_value: null,
+        //       avg_o2_value: null,
+        //       avg_co2_value: null,
+        //       max_gas_value: null,
+        //       max_va_value: null,
+        //       max_co2_value: null,
+        //       avg_co_value: null,
+        //       max_m3_value: null,
+        //       avg_dusting_value: null,
+        //       avg_c2h2_value: null,
+        //       avg_ch4_value: null,
+        //       min_co_value: null,
+        //     },
+        //     other1: null,
+        //     other2: null,
+        //     other3: null,
+        //     remarkInfo: null,
+        //     linkInfo: null,
+        //     addrIndex: null,
+        //     warnLogNotOkCount: 0,
+        //     otherInfo: null,
+        //     orderNum: 0,
+        //     pointNumber: '',
+        //     supportNum: '',
+        //     totalLength: '',
+        //     intervalLength: '',
+        //     fireCause: '',
+        //     endPos: '三盘区主运至31307顺槽机尾',
+        //     startPos: '31煤中央变电所电缆沟',
+        //     deviceId: 1754025882387599361,
+        //   },
+        //   {
+        //     msgType: null,
+        //     deviceID: '1754025882387599362',
+        //     strname: '31煤中央变电所电缆沟-通道二',
+        //     strinstallpos: '31煤中央变电所电缆沟-通道二',
+        //     fsectarea: 'null',
+        //     stationname: '光纤测温',
+        //     stationtype: 'redis',
+        //     deviceType: 'fiber_normal',
+        //     typeName: '光纤测温',
+        //     netStatus: 1,
+        //     warnFlag: 0,
+        //     warnLevel: 0,
+        //     warnLevel_str: '正常',
+        //     syswarnLevel: null,
+        //     syswarnLevel_str: null,
+        //     syswarnLevel_des: null,
+        //     warnTime: null,
+        //     readTime: '2025-02-17 14:48:00',
+        //     warnDes: '',
+        //     frontGateOpenCtrl: null,
+        //     rearGateOpenCtrl: null,
+        //     readData: {
+        //       Section11_MaxTempPos: '1453.00',
+        //       Section9_AlarmTemp: '0.00',
+        //       Section10_MaxTemp: '23.00',
+        //       Section9_BeginPosition: '1336.00',
+        //       Section9_MaxTemp: '23.00',
+        //       Section9_MaxTempPos: '1425.00',
+        //       maxValue: '23.00',
+        //       Section10_EndPosition: '1452.00',
+        //       sign: '0',
+        //       Section8_MaxTemp: '19.00',
+        //       Section8_BeginPosition: '1235.00',
+        //       Section8_AlarmTemp: '0.00',
+        //       Section8_EndPosition: '1335.00',
+        //       Section10_BeginPosition: '1437.00',
+        //       Section9_EndPosition: '1436.00',
+        //       Section10_AlarmTemp: '0.00',
+        //       Section10_MaxTempPos: '1447.00',
+        //       Section11_AlarmTemp: '0.00',
+        //       Section8_MaxTempPos: '1295.00',
+        //       Section11_BeginPosition: '1453.00',
+        //       Section11_EndPosition: '1458.00',
+        //       isRun: '-2',
+        //       Section11_MaxTemp: '6.00',
+        //     },
+        //     readDataDes: null,
+        //     summaryHour: [],
+        //     summaryDay: [],
+        //     history: [],
+        //     dayhistory: [],
+        //     totalInfo: null,
+        //     sign: null,
+        //     cameras: [],
+        //     links: [],
+        //     avgParam: {
+        //       avg_gas_value: null,
+        //       min_temperature_value: null,
+        //       min_no_value: null,
+        //       avg_no_value: null,
+        //       max_ch4_value: null,
+        //       min_co2_value: null,
+        //       min_m3_value: null,
+        //       max_o2_value: null,
+        //       avg_va_value: null,
+        //       max_c2h2_value: null,
+        //       min_c2h4_value: null,
+        //       max_no_value: null,
+        //       avg_m3_value: null,
+        //       max_co_value: null,
+        //       min_va_value: null,
+        //       min_ch4_value: null,
+        //       max_temperature_value: null,
+        //       min_gas_value: null,
+        //       device_id: 1754025882387599362,
+        //       min_o2_value: null,
+        //       avg_temperature_value: null,
+        //       max_dusting_value: null,
+        //       min_c2h2_value: null,
+        //       min_dusting_value: null,
+        //       avg_c2h4_value: null,
+        //       max_c2h4_value: null,
+        //       avg_o2_value: null,
+        //       avg_co2_value: null,
+        //       max_gas_value: null,
+        //       max_va_value: null,
+        //       max_co2_value: null,
+        //       avg_co_value: null,
+        //       max_m3_value: null,
+        //       avg_dusting_value: null,
+        //       avg_c2h2_value: null,
+        //       avg_ch4_value: null,
+        //       min_co_value: null,
+        //     },
+        //     other1: null,
+        //     other2: null,
+        //     other3: null,
+        //     remarkInfo: null,
+        //     linkInfo: null,
+        //     addrIndex: null,
+        //     warnLogNotOkCount: 0,
+        //     otherInfo: null,
+        //     orderNum: 0,
+        //     pointNumber: '',
+        //     supportNum: '',
+        //     totalLength: '',
+        //     intervalLength: '',
+        //     fireCause: '',
+        //     endPos: '配仓配电室',
+        //     startPos: '31煤中央变电所电缆沟',
+        //     deviceId: 1754025882387599362,
+        //   },
+        //   {
+        //     msgType: null,
+        //     deviceID: '1754025882387599363',
+        //     strname: '31煤中央变电所电缆沟-通道三',
+        //     strinstallpos: '31煤中央变电所电缆沟-通道三',
+        //     fsectarea: 'null',
+        //     stationname: '光纤测温',
+        //     stationtype: 'redis',
+        //     deviceType: 'fiber_normal',
+        //     typeName: '光纤测温',
+        //     netStatus: 1,
+        //     warnFlag: 0,
+        //     warnLevel: 0,
+        //     warnLevel_str: '正常',
+        //     syswarnLevel: null,
+        //     syswarnLevel_str: null,
+        //     syswarnLevel_des: null,
+        //     warnTime: null,
+        //     readTime: '2025-02-17 14:48:00',
+        //     warnDes: '',
+        //     frontGateOpenCtrl: null,
+        //     rearGateOpenCtrl: null,
+        //     readData: {
+        //       Section3_BeginPosition: '415.00',
+        //       Section2_EndPosition: '414.00',
+        //       Section4_MaxTempPos: '484.00',
+        //       maxValue: '39.00',
+        //       Section2_BeginPosition: '76.00',
+        //       sign: '0',
+        //       Section2_MaxTempPos: '148.00',
+        //       Section4_EndPosition: '687.00',
+        //       Section3_MaxTemp: '11.00',
+        //       Section2_AlarmTemp: '0.00',
+        //       Section3_AlarmTemp: '0.00',
+        //       Section3_EndPosition: '435.00',
+        //       Section2_MaxTemp: '12.00',
+        //       Section3_MaxTempPos: '415.00',
+        //       Section4_AlarmTemp: '0.00',
+        //       Section4_MaxTemp: '39.00',
+        //       isRun: '-2',
+        //       Section4_BeginPosition: '436.00',
+        //     },
+        //     readDataDes: null,
+        //     summaryHour: [],
+        //     summaryDay: [],
+        //     history: [],
+        //     dayhistory: [],
+        //     totalInfo: null,
+        //     sign: null,
+        //     cameras: [],
+        //     links: [],
+        //     avgParam: {
+        //       avg_gas_value: null,
+        //       min_temperature_value: null,
+        //       min_no_value: null,
+        //       avg_no_value: null,
+        //       max_ch4_value: null,
+        //       min_co2_value: null,
+        //       min_m3_value: null,
+        //       max_o2_value: null,
+        //       avg_va_value: null,
+        //       max_c2h2_value: null,
+        //       min_c2h4_value: null,
+        //       max_no_value: null,
+        //       avg_m3_value: null,
+        //       max_co_value: null,
+        //       min_va_value: null,
+        //       min_ch4_value: null,
+        //       max_temperature_value: null,
+        //       min_gas_value: null,
+        //       device_id: 1754025882387599363,
+        //       min_o2_value: null,
+        //       avg_temperature_value: null,
+        //       max_dusting_value: null,
+        //       min_c2h2_value: null,
+        //       min_dusting_value: null,
+        //       avg_c2h4_value: null,
+        //       max_c2h4_value: null,
+        //       avg_o2_value: null,
+        //       avg_co2_value: null,
+        //       max_gas_value: null,
+        //       max_va_value: null,
+        //       max_co2_value: null,
+        //       avg_co_value: null,
+        //       max_m3_value: null,
+        //       avg_dusting_value: null,
+        //       avg_c2h2_value: null,
+        //       avg_ch4_value: null,
+        //       min_co_value: null,
+        //     },
+        //     other1: null,
+        //     other2: null,
+        //     other3: null,
+        //     remarkInfo: null,
+        //     linkInfo: null,
+        //     addrIndex: null,
+        //     warnLogNotOkCount: 0,
+        //     otherInfo: null,
+        //     orderNum: 0,
+        //     pointNumber: '',
+        //     supportNum: '',
+        //     totalLength: '',
+        //     intervalLength: '',
+        //     fireCause: '',
+        //     endPos: '12煤2#变电所',
+        //     startPos: '31煤中央变电所电缆沟',
+        //     deviceId: 1754025882387599363,
+        //   },
+        //   {
+        //     msgType: null,
+        //     deviceID: '1754025882387599364',
+        //     strname: '31煤中央变电所电缆沟-通道四',
+        //     strinstallpos: '31煤中央变电所电缆沟-通道四',
+        //     fsectarea: 'null',
+        //     stationname: '光纤测温',
+        //     stationtype: 'redis',
+        //     deviceType: 'fiber_normal',
+        //     typeName: '光纤测温',
+        //     netStatus: 1,
+        //     warnFlag: 0,
+        //     warnLevel: 0,
+        //     warnLevel_str: '正常',
+        //     syswarnLevel: null,
+        //     syswarnLevel_str: null,
+        //     syswarnLevel_des: null,
+        //     warnTime: null,
+        //     readTime: '2025-02-17 14:48:00',
+        //     warnDes: '',
+        //     frontGateOpenCtrl: null,
+        //     rearGateOpenCtrl: null,
+        //     readData: {
+        //       Section3_BeginPosition: '414.00',
+        //       Section4_MaxTempPos: '1014.00',
+        //       maxValue: '18.00',
+        //       Section6_MaxTempPos: '1688.00',
+        //       sign: '0',
+        //       Section3_MaxTemp: '15.00',
+        //       Section4_EndPosition: '1014.00',
+        //       Section3_EndPosition: '713.00',
+        //       Section3_AlarmTemp: '0.00',
+        //       Section5_EndPosition: '1365.00',
+        //       Section5_MaxTempPos: '1021.00',
+        //       Section6_BeginPosition: '1366.00',
+        //       Section6_EndPosition: '1768.00',
+        //       Section3_MaxTempPos: '414.00',
+        //       Section6_MaxTemp: '18.00',
+        //       Section4_AlarmTemp: '0.00',
+        //       Section5_BeginPosition: '1015.00',
+        //       Section4_MaxTemp: '15.00',
+        //       Section6_AlarmTemp: '0.00',
+        //       isRun: '-2',
+        //       Section4_BeginPosition: '714.00',
+        //       Section5_MaxTemp: '15.00',
+        //       Section5_AlarmTemp: '0.00',
+        //     },
+        //     readDataDes: null,
+        //     summaryHour: [],
+        //     summaryDay: [],
+        //     history: [],
+        //     dayhistory: [],
+        //     totalInfo: null,
+        //     sign: null,
+        //     cameras: [],
+        //     links: [],
+        //     avgParam: {
+        //       avg_gas_value: null,
+        //       min_temperature_value: null,
+        //       min_no_value: null,
+        //       avg_no_value: null,
+        //       max_ch4_value: null,
+        //       min_co2_value: null,
+        //       min_m3_value: null,
+        //       max_o2_value: null,
+        //       avg_va_value: null,
+        //       max_c2h2_value: null,
+        //       min_c2h4_value: null,
+        //       max_no_value: null,
+        //       avg_m3_value: null,
+        //       max_co_value: null,
+        //       min_va_value: null,
+        //       min_ch4_value: null,
+        //       max_temperature_value: null,
+        //       min_gas_value: null,
+        //       device_id: 1754025882387599364,
+        //       min_o2_value: null,
+        //       avg_temperature_value: null,
+        //       max_dusting_value: null,
+        //       min_c2h2_value: null,
+        //       min_dusting_value: null,
+        //       avg_c2h4_value: null,
+        //       max_c2h4_value: null,
+        //       avg_o2_value: null,
+        //       avg_co2_value: null,
+        //       max_gas_value: null,
+        //       max_va_value: null,
+        //       max_co2_value: null,
+        //       avg_co_value: null,
+        //       max_m3_value: null,
+        //       avg_dusting_value: null,
+        //       avg_c2h2_value: null,
+        //       avg_ch4_value: null,
+        //       min_co_value: null,
+        //     },
+        //     other1: null,
+        //     other2: null,
+        //     other3: null,
+        //     remarkInfo: null,
+        //     linkInfo: null,
+        //     addrIndex: null,
+        //     warnLogNotOkCount: 0,
+        //     otherInfo: null,
+        //     orderNum: 0,
+        //     pointNumber: '',
+        //     supportNum: '',
+        //     totalLength: '',
+        //     intervalLength: '',
+        //     fireCause: '',
+        //     endPos: '立体车库2楼',
+        //     startPos: '31煤中央变电所电缆沟',
+        //     deviceId: 1754025882387599364,
+        //   },
+        // ];
+        deviceList.value = newDataSource as any[];
         activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
+        maxTemp.value = 0;
         newDataSource?.forEach((item: any, index) => {
           if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-            // activeDeviceID.value = item.deviceID;
             posList.length = 0;
             posList1.length = 0;
-            // let counts = Math.ceil((Object.keys(item.readData).length - 2) / 5);
-            let counts = Math.ceil(Object.keys(item.readData).filter((v) => v.indexOf('Section') != -1).length / 5);
-            for (let i = 0; i < counts; i++) {
-              posList.push({
-                Section_MaxTemp: item.readData[`Section${i + 1}_MaxTemp`],
-                Section_MaxTempPos: item.readData[`Section${i + 1}_MaxTempPos`],
-                Section_BeginPosition: item.readData[`Section${i + 1}_BeginPosition`],
-                Section_EndPosition: item.readData[`Section${i + 1}_EndPosition`],
-                Section_AlarmTemp: item.readData[`Section${i + 1}_AlarmTemp`],
-                isWarn:
-                  parseFloat(item.readData[`Section${i + 1}_MaxTemp`]) > parseFloat(item.readData[`Section${i + 1}_AlarmTemp`]) ? '报警' : '未报警',
-              });
+            const indexSet = new Set();
+            for (let i = 0; i < Object.keys(item.readData).length; i++) {
+              if (Object.keys(item.readData)[i].indexOf('Section') != -1) {
+                indexSet.add(Object.keys(item.readData)[i].split('_')[0].slice(7));
+              }
+            }
+            const indexValues = Array.from(indexSet).sort((a, b) => Number(a) - Number(b));
+            for (let i = 0; i < indexValues.length; i++) {
+              const index = indexValues[i];
+              if (item.readData[`Section${index}_BeginPosition`] && item.readData[`Section${index}_EndPosition`]) {
+                posList.push({
+                  position: `测点${index}`,
+                  Section_MaxTemp: item.readData[`Section${index}_MaxTemp`],
+                  Section_MaxTempPos: item.readData[`Section${index}_MaxTempPos`],
+                  Section_BeginPosition: item.readData[`Section${index}_BeginPosition`],
+                  Section_EndPosition: item.readData[`Section${index}_EndPosition`],
+                  Section_AlarmTemp: item.readData[`Section${index}_AlarmTemp`],
+                  isWarn:
+                    parseFloat(item.readData[`Section${index}_MaxTemp`]) > parseFloat(item.readData[`Section${index}_AlarmTemp`]) ? '报警' : '未报警',
+                });
+                posList1.push({
+                  Section_AlarmTemp: `${item.readData[`Section${index}_BeginPosition`]}-${item.readData[`Section${index}_EndPosition`]}m`,
+                  value: item.readData[`Section${index}_MaxTempPos`],
+                });
+                if (parseFloat(item.readData[`Section${index}_MaxTemp`]) > maxTemp.value) {
+                  maxTemp.value = item.readData[`Section${index}_MaxTemp`];
+                }
+              }
             }
-            posList.forEach((el, index) => {
-              posList1.push({ Section_AlarmTemp: index + 1, value: el.Section_AlarmTemp });
-            });
-            let maxValue = posList.map((m) => m.Section_MaxTemp);
-            maxTemp.value = Math.max(...maxValue);
             warnLevels.value = posList.find((v) => v.isWarn == '报警') ? '报警' : '未报警';
-            console.log(posList, 'posList-----------------');
-            console.log(posList1, 'posList1-----------------');
           }
         });
       });

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

@@ -223,7 +223,6 @@ export const playAnimate = async (selectData, duration?) => {
     mainObj = mainXjWindObj;
     // bgGroup.visible = false;
   }
-
   if (selectData && mainObj) {
     if (selectData['Fan1FreqHz'] == undefined || selectData['Fan1FreqHz'] == null || selectData['Fan1FreqHz'] == '') selectData['Fan1FreqHz'] = 50;
     if (selectData['Fan2FreqHz'] == undefined || selectData['Fan2FreqHz'] == null || selectData['Fan2FreqHz'] == '') selectData['Fan2FreqHz'] = 50;
@@ -237,14 +236,32 @@ export const playAnimate = async (selectData, duration?) => {
       // 2. 在页面上，切换动画
       if (selectData.Fan2FreqForwardRun == 1 && selectData.Fan2FreqReverseRun == 0) {
         // 主风机正转
+        if (mainObj['airChu2'] && !mainObj['airChu2'].visible) {
+          mainObj['airJin1'].visible = false;
+          mainObj['airJin2'].visible = false;
+          mainObj['airChu1'].visible = false;
+          mainObj['airChu2'].visible = true;
+        }
         mainObj.startGearAnimation('front', 'open', 'tubPositivePath', selectData.Fan2FreqHz, duration);
         await mainObj.setSmokeDirection('front', 'tubPositivePath');
       } else if (selectData.Fan2FreqReverseRun == 1 && selectData.Fan2FreqForwardRun == 0) {
         // 主风机反转
+        if (mainObj['airJin2'] && !mainObj['airJin2'].visible) {
+          mainObj['airJin1'].visible = false;
+          mainObj['airJin2'].visible = true;
+          mainObj['airChu1'].visible = false;
+          mainObj['airChu2'].visible = false;
+        }
         mainObj.startGearAnimation('front', 'open', 'tubInversePath', selectData.Fan2FreqHz, duration);
         await mainObj.setSmokeDirection('front', 'tubInversePath');
       } else {
         // 默认主风机正转
+        if (mainObj['airChu2'] && !mainObj['airChu2'].visible) {
+          mainObj['airJin1'].visible = false;
+          mainObj['airJin2'].visible = false;
+          mainObj['airChu1'].visible = false;
+          mainObj['airChu2'].visible = true;
+        }
         mainObj.startGearAnimation('front', 'open', 'tubPositivePath', selectData.Fan2FreqHz, duration);
         await mainObj.setSmokeDirection('front', 'tubPositivePath');
       }
@@ -262,13 +279,32 @@ export const playAnimate = async (selectData, duration?) => {
       // 2. 在页面上，切换动画
       if (selectData.Fan1FreqForwardRun == 1 && selectData.Fan1FreqReverseRun == 0) {
         // 主风机正转
+        // 主风机正转
+        if (mainObj['airChu1'] && !mainObj['airChu1'].visible) {
+          mainObj['airJin1'].visible = false;
+          mainObj['airJin2'].visible = false;
+          mainObj['airChu1'].visible = true;
+          mainObj['airChu2'].visible = false;
+        }
         mainObj.startGearAnimation('back', 'open', 'tubPositivePath', selectData.Fan1FreqHz, duration);
         await mainObj.setSmokeDirection('back', 'tubPositivePath');
       } else if (selectData.Fan1FreqReverseRun == 1 && selectData.Fan1FreqForwardRun == 0) {
         // 主风机反转
+        if (mainObj['airJin1'] && !mainObj['airJin1'].visible) {
+          mainObj['airJin1'].visible = true;
+          mainObj['airJin2'].visible = false;
+          mainObj['airChu1'].visible = false;
+          mainObj['airChu2'].visible = false;
+        }
         mainObj.startGearAnimation('back', 'open', 'tubInversePath', selectData.Fan1FreqHz, duration);
         await mainObj.setSmokeDirection('back', 'tubInversePath');
       } else {
+        if (mainObj['airChu1'] && !mainObj['airChu1'].visible) {
+          mainObj['airJin1'].visible = false;
+          mainObj['airJin2'].visible = false;
+          mainObj['airChu1'].visible = true;
+          mainObj['airChu2'].visible = false;
+        }
         mainObj.startGearAnimation('back', 'open', 'tubPositivePath', selectData.Fan1FreqHz, duration);
         await mainObj.setSmokeDirection('back', 'tubPositivePath');
       }
@@ -378,6 +414,14 @@ export const mountedThree = (playerVal1) => {
       await mainXjWindObj.mountedThree();
       model?.animate();
       resolve(null);
+      if (mainWindObj.airJin1) mainWindObj.airJin1.visible = false;
+      if (mainWindObj.airJin2) mainWindObj.airJin2.visible = false;
+      if (mainWindObj.airChu1) mainWindObj.airChu1.visible = false;
+      if (mainWindObj.airChu2) mainWindObj.airChu2.visible = false;
+      if (mainXjWindObj.airJin1) mainXjWindObj.airJin1.visible = false;
+      if (mainXjWindObj.airJin2) mainXjWindObj.airJin2.visible = false;
+      if (mainXjWindObj.airChu1) mainXjWindObj.airChu1.visible = false;
+      if (mainXjWindObj.airChu2) mainXjWindObj.airChu2.visible = false;
     });
     startAnimation();
   });

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

@@ -10,6 +10,10 @@ class mainWindRect {
   group: THREE.Group | null = null; // 主通风机场景
   motorGroup1: THREE.Group | null = null; //电机
   motorGroup2: THREE.Group | null = null; //电机
+  airJin1: THREE.Mesh | null = null; //风向箭头
+  airJin2: THREE.Mesh | null = null; //风向箭头
+  airChu1: THREE.Mesh | null = null; //风向箭头
+  airChu2: THREE.Mesh | null = null; //风向箭头
   gearFront = {
     gear1: null, //扇叶
     gear2: null, //扇叶
@@ -753,11 +757,19 @@ class mainWindRect {
         this.group?.position.set(-0.44, 19.88, 22.37);
         this.initSmokeMass();
         await this.setSmokePosition();
-
+        debugger;
         const ztfjGroup = this.group?.getObjectByName('ztfj') as THREE.Group;
         const fbmGroup = this.group?.getObjectByName('fbm') as THREE.Group;
         const fcGroup = this.group?.getObjectByName('ztfj-fc') as THREE.Group;
-        if (ztfjGroup) ztfjGroup.position.z = ztfjGroup.position.z + 5;
+        if (ztfjGroup) {
+          ztfjGroup.position.z = ztfjGroup.position.z + 5;
+          const airJinGroup = ztfjGroup.getObjectByName('JianTou1_Jin') as THREE.Object3D;
+          const airChuGroup = ztfjGroup.getObjectByName('JianTou2_Chu') as THREE.Object3D;
+          this.airJin1 = airJinGroup.getObjectByName('Jin_1') as THREE.Mesh;
+          this.airJin2 = airJinGroup.getObjectByName('Jin_2') as THREE.Mesh;
+          this.airChu1 = airChuGroup.getObjectByName('Chu_1') as THREE.Mesh;
+          this.airChu2 = airChuGroup.getObjectByName('Chu_2') as THREE.Mesh;
+        }
         if (fbmGroup) fbmGroup.position.z = fbmGroup.position.z + 5;
         if (fcGroup) fcGroup.position.z = fcGroup.position.z + 5;
 

src/views/vent/monitorManager/mainFanMonitor/mainWind.xj.threejs.ts

@@ -10,6 +10,10 @@ class mainXjWindRect {
   group: THREE.Group | null = null; // 主通风机场景
   motorGroup1: THREE.Group | null = null; //电机
   motorGroup2: THREE.Group | null = null; //电机
+  airJin1: THREE.Mesh | null = null; //风向箭头
+  airJin2: THREE.Mesh | null = null; //风向箭头
+  airChu1: THREE.Mesh | null = null; //风向箭头
+  airChu2: THREE.Mesh | null = null; //风向箭头
   gearFront = {
     gear1: null, //扇叶
     gear2: null, //扇叶
@@ -685,8 +689,10 @@ class mainXjWindRect {
       this.model.setGLTFModel('ztfj-xj').then(async (gltf) => {
         const ztfjModal = gltf[0].children[0];
         ztfjModal.name = 'ztfj';
-        ztfjModal.position.set(4.64, 4.11, 1.52);
-        this.group?.add(gltf[0].children[0]);
+        gltf[0].children.forEach((item) => {
+          item.position.set(4.64, 4.11, 1.52);
+        });
+        this.group?.add(gltf[0]);
         // this.group?.position.set(4.77, 3.63, 0.63);
         this.group?.position.set(-0.44, 47.32, 22.37);
         this.initSmokeMass();
@@ -698,6 +704,13 @@ class mainXjWindRect {
         if (mesh && mesh.material) this.oldMaterial = mesh.material as THREE.MeshStandardMaterial;
         await this.initMotor();
         resolve(null);
+        const airJinGroup = gltf[0]?.getObjectByName('JianTou1_Jin') as THREE.Object3D;
+        const airChuGroup = gltf[0]?.getObjectByName('JianTou2_Chu') as THREE.Object3D;
+
+        this.airJin1 = airJinGroup.getObjectByName('pasted__Jin_1') as THREE.Mesh;
+        this.airJin2 = airJinGroup.getObjectByName('pasted__Jin_2') as THREE.Mesh;
+        this.airChu1 = airChuGroup.getObjectByName('pasted__Chu_1') as THREE.Mesh;
+        this.airChu2 = airChuGroup.getObjectByName('pasted__Chu_2') as THREE.Mesh;
       });
     });
   }