hongrunxia 1 سال پیش
والد
کامیت
6c79a957ed

+ 12 - 8
src/views/vent/home/colliery/components/fan-monitor.vue

@@ -8,14 +8,18 @@
       <a-select v-model:value="searchValue" style="width: 180px; margin-right: 10px" :options="fanTypeList"
         aria-placeholder="请选择" @change="changeSelect" />
       <div class="status-yx">
-        <div class="now-name">
-          <i style="margin: 0px 5px 0px 5px">
-            <SvgIcon class="icon" size="14" name="yxfj" />
-          </i>
-          <span style="color: #fff">运行风机</span>
-        </div>
-
-        <div class="now-status">{{ fjStatus }}</div>
+        <template v-if="!isShowGif">
+          <div class="now-name">
+            <i style="margin: 0px 5px 0px 5px">
+              <SvgIcon class="icon" size="14" name="yxfj" />
+            </i>
+            <span style="color: #fff">运行风机</span>
+          </div>
+          <div class="now-status">{{ fjStatus }}</div>
+        </template>
+        <template v-else>
+          <div class="now-status" style="margin-left: 25px;">正在运行</div>
+        </template>
       </div>
     </div>
     <div class="fan-contents">

+ 5 - 5
src/views/vent/home/colliery/components/main-monitor.vue

@@ -60,15 +60,15 @@ function changeSelect(val) {
     objParam = {
       // dataQ: selectData.readData.Fan1m3 || selectData.readData.Fan2m3 || selectData.readData.m3,
       // dataH: Math.abs(Number(selectData.readData.Fan1FanPre || selectData.readData.Fan2FanPre || selectData.readData.DataPa || 0)),
-      dataQ: 8529,
+      dataQ: 10529,
       dataH: 686,
     }
     objParam1 = {
       dataha0: -0.056,
       dataha1: 1.0491, // 3.6491
-      dataha2: 304.4, // 404.4
-      dataha3: 155, // 100
-      dataha4: -1000,
+      dataha2: 204.4, // 404.4
+      dataha3: 175, // 100
+      dataha4: -800,
     }
     setChart(objParam, objParam1);
     getOption();
@@ -121,7 +121,7 @@ function getOption() {
       color: ['#00bb00', '#ffbb00', '#ff0000', '#0000ff'],
       xAxis: [
         {
-          name: '风量\r\n(m³/min)\r\n',
+          name: '风量\r\n(m³/s)\r\n',
           nameTextStyle: {
             color: '#3df6ff',
             fontSize: 12,

+ 0 - 1
src/views/vent/monitorManager/gasPumpMonitor/gasPump.data.ts

@@ -234,4 +234,3 @@ export const modelMonitor = [
 
 
 
-