Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

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

@@ -352,7 +352,7 @@ onUnmounted(() => {
   top: 60px;
   .nitrogen-container {
     width: 100%;
-    height: calc(100%);
+    height: calc(100% - 100px);
     display: flex;
     justify-content: space-between;
     margin-bottom: 100px;
@@ -380,6 +380,7 @@ onUnmounted(() => {
         overflow: hidden;
         z-index: 9999;
         pointer-events: auto;
+        
       }
 
       .item {

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

@@ -534,7 +534,7 @@ onUnmounted(() => {
 
   .nitrogen-container {
     width: 100%;
-    height: calc(100%);
+    height: calc(100% - 100px);
     display: flex;
     justify-content: space-between;
     margin-bottom: 100px;

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

@@ -700,7 +700,7 @@ onUnmounted(() => {
 
     .nitrogen-container {
         width: 100%;
-        height: calc(100%);
+        height: calc(100% - 100px);
         display: flex;
         justify-content: space-between;
         margin-bottom: 100px;

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

@@ -623,14 +623,11 @@
         for (const key in selectData) {
           selectData[key] = ''
         }
-        if(dataSource.value.length > 0 && dataSource.value[selectRowIndex.value] && dataSource.value[selectRowIndex.value]['netStatus'] == 1){
-          Object.assign(selectData, dataSource.value[selectRowIndex.value])
-          addText(selectData);
-          playSmoke(selectData)
-        }else{
+        if(dataSource.value.length > 0 && dataSource.value[selectRowIndex.value]){
           Object.assign(selectData, dataSource.value[selectRowIndex.value])
         }
-
+        playSmoke(selectData)
+        addText(selectData);
         if (timer) {
           timer = null;
         }

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

@@ -435,6 +435,8 @@
       dataSource.value.push(data);
     });
     const data: any = toRaw(dataSource.value[selectRowIndex.value]); //maxarea
+    
+    Object.assign(selectData, data);
     return data;
   };
   // https获取监测数据
@@ -451,9 +453,7 @@
             MonitorDataTable.value.setSelectedRowKeys(dataSource.value[0]['deviceID'])
           }
         }
-        for (const key in selectData) {
-          selectData[key] = ''
-        }
+        
         Object.assign(selectData, deviceBaseList.value, dataSource.value[selectRowIndex.value]);
         if (selectData['Fan1StartStatus'] == 1 && selectData['Fan2StartStatus'] == 0) {
           frontMonitorIsShow.value = true
@@ -508,6 +508,10 @@
     selectRowIndex.value = baseDataIndex;
     const type = 'mainWindRect';
     // const type = baseDataIndex > 0 ? 'fm' : 'fc';
+
+    for (const key in selectData) {
+      selectData[key] = ''
+    }
     nextTick(() => {
       setModelType(type).then(() => {
         loading.value = false;
@@ -526,6 +530,7 @@
         selectDevice('warningMonitorRowIndex', 1)
         selectDevice('dataMonitorRowIndex', 1)
       }
+      Object.assign(selectData, data);
     })
     
     return;

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

@@ -2,9 +2,9 @@
   <div class="nitrogen-box">
     <customHeader >智能压风管控系统</customHeader>
     <!-- 锦界 -->
-    <!-- <nitrogenHome v-if="btnActive == 'nitrogen_page'" /> -->
+    <nitrogenHome v-if="btnActive == 'nitrogen_page'" />
     <!-- 布尔台 -->
-    <nitrogenHome1 v-if="btnActive == 'nitrogen_page'" /> 
+    <!-- <nitrogenHome1 v-if="btnActive == 'nitrogen_page'" />  -->
     <nitrogenEcharts v-if="btnActive == 'yfj_monitor_echarts'"/>
     <nitrogenHistory v-if="btnActive == 'yfj_history'"/>
     <nitrogenHandleHistory v-if="btnActive == 'yfj_handler_history'"/>