基金灾害项目界面布局及数据回显bug修改-提交

src/views/vent/dust/dustAtomizing/index.vue

@@ -233,8 +233,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: space-between;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;
 

src/views/vent/dust/dustHome/index.vue

@@ -23,23 +23,23 @@
           </div>
           <!-- 左中区域 -->
           <div class="left-c">
-            <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '645px' }">
+            <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '746px' }">
               <workJc
-                :heightT="'22%'"
-                :heightB="'78%'"
+                :heightT="'18%'"
+                :heightB="'82%'"
                 :cardData="cardData"
                 :echartData="echartDataWork"
               />
             </DanelBd>
           </div>
           <!-- 左底部区域 -->
-          <div class="left-f">
+          <!-- <div class="left-f">
             <DanelBd
               :moduleName="'GIS重点区域风险监测'"
               :contentStyle="{ contentH: '0px' }"
               commonTitle="switchs"
             />
-          </div>
+          </div> -->
         </div>
       </transition>
 
@@ -59,7 +59,7 @@
           <div class="center-b" v-if="isShow">
             <DanelBd
               :moduleName="'综放工作面粉尘浓度'"
-              :contentStyle="{ contentH: '288px' }"
+              :contentStyle="{ contentH: '309px' }"
               :commonTitle="'selected'"
               :selectList="selectListBd"
               :selectValue="sensorCode"
@@ -75,7 +75,7 @@
         <div class="right-area" v-if="isShow">
           <!-- 右上区域 -->
           <div class="right-t">
-            <DanelBd :moduleName="'智能喷雾降尘装置'" :contentStyle="{ contentH: '305px' }">
+            <DanelBd :moduleName="'智能喷雾降尘装置'" :contentStyle="{ contentH: '306px' }">
               <dustFallDevice
                 :deviceTotal="deviceTotal"
                 :pwTotal="pwTotal"
@@ -89,7 +89,7 @@
           <div class="right-c">
             <DanelBd
               :moduleName="'粉尘关联指标'"
-              :contentStyle="{ contentH: '250px' }"
+              :contentStyle="{ contentH: '280px' }"
               commonTitle="selected"
               :selectList="selectListBd"
               :selectValue="sensorCode"
@@ -102,7 +102,7 @@
           <div class="right-b">
             <DanelBd
               :moduleName="'粉尘静态指标'"
-              :contentStyle="{ contentH: '160px' }"
+              :contentStyle="{ contentH: '170px' }"
               commonTitle="selected"
               :selectList="selectListJt"
               :selectValue="jtzbCode"
@@ -328,13 +328,9 @@
 
   .dustHome {
     position: relative;
-    // width: calc(100% - 20px);
-    // height: calc(100vh - 82px);
     width: 100%;
-    // height: calc(100vh - 70px);
-    height: 875px;
-    // margin-top: 50px;
-
+    height: 928px;
+   
     .moduleArea {
       width: 100%;
       height: 100%;
@@ -421,9 +417,9 @@
           width: 100%;
         }
 
-        .left-f {
-          width: 100%;
-        }
+        // .left-f {
+        //   width: 100%;
+        // }
       }
 
       .center-area {

src/views/vent/dust/dustWarnAnalysis/index.vue

@@ -187,8 +187,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: space-between;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;
 

src/views/vent/fire/compositeWarn/index.vue

@@ -305,8 +305,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: space-between;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;
 

src/views/vent/fire/fireDistributionPoint/index.vue

@@ -101,7 +101,7 @@ async function getHeadingFaceList() {
   if (res.length != 0) {
     sensorList1.length=0
     res.forEach(el => {
-      sensorList1.push({ name: el.name, nd: el.co + '', status: el.wd + '', warn: el.warningMsg, times: el.dateTime })
+      sensorList1.push({ name: el.name, nd: el.co || 0 , status: el.wd || 0 , warn: el.warningMsg, times: el.dateTime })
     })
   }
 }
@@ -151,8 +151,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: space-between;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;
 

src/views/vent/fire/fireGoaf/index.vue

@@ -168,8 +168,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: space-between;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;
 

src/views/vent/fire/fireHome/index.vue

@@ -23,8 +23,8 @@
           </div>
           <!-- 左中区域 -->
           <div class="left-c">
-            <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '430px' }">
-              <workJc :heightT="'30%'" :heightB="'70%'" :echartData="echartDataWork" :cardData="cardData" />
+            <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '525px' }">
+              <workJc :heightT="'25%'" :heightB="'75%'" :echartData="echartDataWork" :cardData="cardData" />
             </DanelBd>
           </div>
           <!-- 左下区域 -->
@@ -35,9 +35,9 @@
             </DanelBd>
           </div>
           <!-- 左底部区域 -->
-          <div class="left-f">
+         <!-- <div class="left-f">
             <DanelBd :moduleName="'GIS重点区域风险监测'" :contentStyle="{ contentH: '0px' }" commonTitle="switchs" />
-          </div>
+          </div> -->
         </div>
       </transition>
 
@@ -51,7 +51,7 @@
         <transition name="fade" mode="out-in">
           <div class="center-b" v-if="isShow">
             <DanelBd :moduleName="'工作面束管监测'" :selectValue="pointCode" :moduleSelect="moduleSelect"
-              :contentStyle="{ contentH: '289px' }" commonTitle="selected" :selectList="selectList"
+              :contentStyle="{ contentH: '309px' }" commonTitle="selected" :selectList="selectList"
               @change-select="changeSelect">
               <fiberBunbleJc :bunbleData="bunbleData" />
             </DanelBd>
@@ -76,14 +76,14 @@
           </div>
           <!-- 右下区域 -->
           <div class="right-b">
-            <DanelBd :moduleName="'变电硐室防灭火监控系统'" :contentStyle="{ contentH: '180px' }" commonTitle="selected"
+            <DanelBd :moduleName="'变电硐室防灭火监控系统'" :contentStyle="{ contentH: '195px' }" commonTitle="selected"
               :selectList="selectListBd" :selectValue="pointCodeBd" @change-select="changeSelect">
               <substationJc :echartDatas="echartDatas" />
             </DanelBd>
           </div>
           <!-- 右底部区域 -->
           <div class="right-f">
-            <DanelBd :moduleName="'安全监控系统'" :contentStyle="{ contentH: '215px' }" commonTitle="selected"
+            <DanelBd :moduleName="'安全监控系统'" :contentStyle="{ contentH: '245px' }" commonTitle="selected"
               :selectList="selectListAq" :selectValue="pointCodeAq" @change-select="changeSelect">
               <safetyJc :safetyHead="safetyHead" :safetyList="safetyList" />
             </DanelBd>
@@ -535,12 +535,8 @@ onUnmounted(() => {
 
 .fireHome {
   position: relative;
-  // width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
   width: 100%;
-  // height: calc(100vh - 70px);
-  height: 875px;
-  // margin-top: 50px;
+  height: 928px;
 
   .moduleArea {
     width: 100%;
@@ -632,9 +628,9 @@ onUnmounted(() => {
         width: 100%;
       }
 
-      .left-f {
-        width: 100%;
-      }
+      // .left-f {
+      //   width: 100%;
+      // }
     }
 
     .center-area {

src/views/vent/fire/fireMonitor/index.vue

@@ -302,8 +302,7 @@ onMounted(() => {
   align-items: center;
   justify-content: space-between;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;
 

src/views/vent/fire/fireZhud/index.vue

@@ -88,8 +88,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;
 

src/views/vent/fire/fireZhuj/index.vue

@@ -17,8 +17,7 @@
   .fireZhuj {
     position: relative;
     width: calc(100% - 20px);
-    // height: calc(100vh - 82px);
-    height: 880px;
+    height: 928px;
     margin: 0 10px;
     background: #282828;
   }

src/views/vent/fire/wokeFace/index.vue

@@ -381,8 +381,7 @@ onMounted(() => {
   align-items: center;
   justify-content: space-between;
   width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 880px;
+  height: 928px;
   margin: 0 10px;
   background: #282828;