1. 压风机监测页面数据不显示bug修复

2. 风窗修改角度单位

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

@@ -352,7 +352,7 @@
       timer = await setTimeout(
         async () => {
           if (props.deviceId) {
-            await getDataSource(props.deviceId);
+            await getDataSource(props.deviceId, flag);
           }
           if (timer) {
             timer = null;
@@ -364,7 +364,7 @@
     }
   }
 
-  async function getDataSource(systemID) {
+  async function getDataSource(systemID, flag = false) {
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     if (res) {
       const result = res;
@@ -405,7 +405,7 @@
           echartData.value = dataArr;
         }
       });
-      monitorDataGroupNum.value = monitorData.value.length;
+      if (flag) monitorDataGroupNum.value = monitorData.value.length;
       refresh.value = true;
       nextTick(() => {
         refresh.value = false;
@@ -487,6 +487,7 @@
     async (deviceId) => {
       if (deviceId) {
         await getCamera(deviceId, playerRef.value, 'nitrogen');
+        getDataSource(props.deviceId, true);
       }
     }
   );

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

@@ -228,7 +228,7 @@
       timer = await setTimeout(
         async () => {
           if (props.deviceId) {
-            await getDataSource(props.deviceId);
+            await getDataSource(props.deviceId, flag);
           }
           if (timer) {
             timer = null;
@@ -240,7 +240,7 @@
     }
   }
 
-  async function getDataSource(systemID) {
+  async function getDataSource(systemID, flag?) {
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     console.log(res, 'res---------------');
 
@@ -281,7 +281,7 @@
           echartData.value = dataArr;
         }
       });
-      monitorDataGroupNum.value = monitorData.value.length;
+      if (flag) monitorDataGroupNum.value = monitorData.value.length;
       refresh.value = true;
       nextTick(() => {
         refresh.value = false;

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

@@ -63,7 +63,8 @@ export function getMonitorComponent() {
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.bd.vue'));
       break;
     default:
-      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.bd.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));
   }
   const BundleModal = defineAsyncComponent(() => import('./modal/bundle.modal.vue'));
   const FiremonModal = defineAsyncComponent(() => import('./modal/firemon.modal.vue'));

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

@@ -358,7 +358,7 @@
 
   function updateSubstation() {
     if (subStation.value) {
-      initSubStation(subStation.value).then(() => {
+      initSubStation({ substationID: subStation.value }).then(() => {
         message.success('分站同步完成！');
       });
     } else {

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

@@ -78,7 +78,7 @@ class singleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree || selectData.OpenDegree1 ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree || selectData.OpenDegree1 ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -70,7 +70,7 @@ class singleWindowBet {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -59,7 +59,7 @@ class singleWindowXk {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -54,7 +54,7 @@ class singleWindowYjl {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -71,7 +71,7 @@ class doubleWindow {
         y: 97,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -91,7 +91,7 @@ class doubleWindow {
         y: 150,
       },
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -54,7 +54,7 @@ class doubleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -74,7 +74,7 @@ class doubleWindow {
         y: 145,
       },
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -76,7 +76,7 @@ class doubleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -97,7 +97,7 @@ class doubleWindow {
       },
 
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -56,7 +56,7 @@ class doubleWindowYjl {
         y: 97,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -76,7 +76,7 @@ class doubleWindowYjl {
         y: 150,
       },
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -54,7 +54,7 @@ class singleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

src/views/vent/monitorManager/windowMonitorBet/dandaoFcBet.threejs.ts

@@ -54,7 +54,7 @@ class singleWindowBet {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

src/views/vent/monitorManager/windowMonitorBet/dandaoFcBetZh.threejs.ts

@@ -55,7 +55,7 @@ class singleWindowBetZh {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

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

@@ -49,7 +49,7 @@ class doubleWindow {
         y: 97,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',