Browse Source

优化数据

hongrunxia 1 year ago
parent
commit
efe82c69cc

+ 2 - 2
public/js/config.js

@@ -4,8 +4,8 @@ const VUE_APP_URL = {
   webRtcUrl: '//192.168.183.216:8000' // rtsp服务器IP地址
 }
 const History_Type = {
-  type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口,vent是走的咱们的,目前神东的项目都用remote, 其他矿用vent)
-  // type: 'vent', // remote、vent
+  // type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口,vent是走的咱们的,目前神东的项目都用remote, 其他矿用vent)
+  type: 'vent', // remote、vent
   deviceType: []
 }
 

+ 1 - 1
src/views/vent/monitorManager/comment/GroupMonitorTable.vue

@@ -102,7 +102,7 @@
         }
       },
     };
-     const indexColumn = {
+    const indexColumn = {
       title: '序号',
       dataIndex: 'key',
       width: 120,

+ 2 - 2
src/views/vent/monitorManager/deviceMonitor/components/network/index.vue

@@ -125,7 +125,7 @@
           <div class="to-small" @click="toHome"></div>
           <div class="bottom-left bottom-lr-box">
             <div class="network-top">
-                <div class="network-top-left">
+                <!-- <div class="network-top-left">
                   <div>
                     准确率:
                     <span class="accuracy-rate">95%</span>
@@ -134,7 +134,7 @@
                     迭代误差:
                     <span class="error-rate">0.0941%</span>
                   </div>
-                </div>
+                </div> -->
                 <!-- <div class="network-top-right">
                   本次解算时间:
                   <span class="time">{{ pageData.currentTime }}</span>

+ 10 - 8
src/views/vent/monitorManager/nitrogen/components/nitrogenHome.vue

@@ -9,16 +9,16 @@
             <div class="monitor-item">
               <span class="monitor-title">机头温度:</span>
               <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_HeadTemp`] ?
-                monitorData[`PRE${groupNum}_CPR_HeadTemp`] : '-' }}</span><span class="unit"></span></span>
+                formatNum(monitorData[`PRE${groupNum}_CPR_HeadTemp`]) : '-' }}</span><span class="unit"></span></span>
             </div>
             <div class="monitor-item">
               <span class="monitor-title">冷却温度:</span>
               <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_CoolantTemp`] ?
-                monitorData[`PRE${groupNum}_CPR_CoolantTemp`] : '-' }}</span><span class="unit">℃</span></span>
+                formatNum(monitorData[`PRE${groupNum}_CPR_CoolantTemp`]) : '-' }}</span><span class="unit">℃</span></span>
             </div>
             <div class="monitor-item">
               <span class="monitor-title">排气温度:</span>
-              <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] ? monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] : '-' }}</span><span class="unit">℃</span></span>
+              <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] ? formatNum(monitorData[`PRE${groupNum}_CPR_ExhaustTemp`]) : '-' }}</span><span class="unit">℃</span></span>
             </div>
             <div class="signal-item">
               <div class="signal"><span class="monitor-title">运行信号</span><span
@@ -34,7 +34,7 @@
             <div class="monitor-item">
               <span class="monitor-title">气囊温度:</span>
               <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_VLS_Temp`] ?
-                monitorData[`PRE${groupNum}_VLS_Temp`] : '-' }}</span><span class="unit">℃</span></span>
+                formatNum(monitorData[`PRE${groupNum}_VLS_Temp`]) : '-' }}</span><span class="unit">℃</span></span>
             </div>
             <!-- <div class="monitor-item">
               <span class="monitor-title">气囊压力<span class="unit"></span>:</span>
@@ -56,8 +56,8 @@
       </div> -->
       <div class="total-data">
         <div class="vent-flex-row">
-          <div class="item">总流量(m³/min):<span class="val">{{ monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] ? monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] : '-' }}</span></div>
-          <div class="item">总压力(bar):<span class="val">{{ monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] ? monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] : '-' }}</span></div>
+          <div class="item">总流量(m³/min):<span class="val">{{ monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] ? formatNum(monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`]) : '-' }}</span></div>
+          <div class="item">总压力(bar):<span class="val">{{ monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] ? formatNum(monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`]): '-' }}</span></div>
         </div>
         <div class="" style="margin-left: 30px; margin-top: 10px;">
           <div style="color: red;">总流量异常</div>
@@ -81,12 +81,12 @@
                         <div class="item-col">
                           <span class="state-title">{{ Object.values(data)[0] }} :</span>
                           <span class="state-val">{{ (monitorData[Object.keys(data)[0].replace('PRE', 'PRE'+ groupNum)])
-                            >= 0 ? Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)]) : '-' }}</span>
+                            >= 0 ? formatNum(Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)])) : '-' }}</span>
                         </div>
                         <div class="item-col">
                           <span class="state-title">{{ Object.values(data)[1] }} :</span>
                           <span class="state-val">{{ (monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)])
-                            >= 0 ? Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)]) : '-' }}</span>
+                            >= 0 ? formatNum(Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)])) : '-' }}</span>
                         </div>
                       </div>
                     </template>
@@ -169,6 +169,8 @@ import { mountedThree, destroy, setModelType, clearCssText } from '../nitrogen.t
 import { list } from '../nitrogen.api'
 import ventBox1 from '/@/components/vent/ventBox1.vue'
 import { monitorDataGroupNum1, monitorDataGroupNum2, monitorDataGroupNum3, airCompressorState, showMonitorData, monitorData } from '../nitrogen.data'
+import { formatNum } from '/@/utils/ventutil'
+
 
 const loading = ref(true)
 const monitorDataGroupNum = ref(4)

+ 10 - 9
src/views/vent/monitorManager/nitrogen/components/nitrogenHome1.vue

@@ -57,16 +57,16 @@
               <div class="monitor-item">
                 <span class="monitor-title">机头温度:</span>
                 <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_HeadTemp`] ?
-                  monitorData[`PRE${groupNum}_CPR_HeadTemp`] : '-' }}</span><span class="unit"></span></span>
+                  formatNum(monitorData[`PRE${groupNum}_CPR_HeadTemp`]) : '-' }}</span><span class="unit"></span></span>
               </div>
               <div class="monitor-item">
                 <span class="monitor-title">冷却温度:</span>
                 <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_CoolantTemp`] ?
-                  monitorData[`PRE${groupNum}_CPR_CoolantTemp`] : '-' }}</span><span class="unit">℃</span></span>
+                  formatNum(monitorData[`PRE${groupNum}_CPR_CoolantTemp`]) : '-' }}</span><span class="unit">℃</span></span>
               </div>
               <div class="monitor-item">
                 <span class="monitor-title">排气温度:</span>
-                <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] ? monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] : '-' }}</span><span class="unit">℃</span></span>
+                <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_CPR_ExhaustTemp`] ? formatNum(monitorData[`PRE${groupNum}_CPR_ExhaustTemp`]) : '-' }}</span><span class="unit">℃</span></span>
               </div>
               <div class="signal-item">
                 <div class="signal"><span class="monitor-title">运行信号</span><span
@@ -82,7 +82,7 @@
               <div class="monitor-item">
                 <span class="monitor-title">气囊温度:</span>
                 <span class="monitor-val"><span class="val">{{ monitorData[`PRE${groupNum}_VLS_Temp`] ?
-                  monitorData[`PRE${groupNum}_VLS_Temp`] : '-' }}</span><span class="unit">℃</span></span>
+                  formatNum(monitorData[`PRE${groupNum}_VLS_Temp`]) : '-' }}</span><span class="unit">℃</span></span>
               </div>
               <!-- <div class="monitor-item">
               <span class="monitor-title">气囊压力<span class="unit"></span>:</span>
@@ -104,8 +104,8 @@
       </div>
       <div class="total-data">
         <div class="vent-flex-row">
-          <div class="item">总流量(m³/min):<span class="val">{{ monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] ? monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] : '-' }}</span></div>
-          <div class="item">总压力(bar):<span class="val">{{ monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] ? monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] : '-' }}</span></div>
+          <div class="item">总流量(m³/min):<span class="val">{{ monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`] ? formatNum(monitorData[`PreSys_TotalOutPipeFlow${monitorDataGroupFlag}`]) : '-' }}</span></div>
+          <div class="item">总压力(bar):<span class="val">{{ monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`] ? formatNum(monitorData[`PreSys_TotalOutPipePre${monitorDataGroupFlag}`]) : '-' }}</span></div>
         </div>
         <div class="" style="margin-left: 30px; margin-top: 10px;">
           <div style="color: red;">总流量异常</div>
@@ -128,13 +128,13 @@
                       <div class="state-item" v-for="(data, index) in showMonitorData" :key="index">
                         <div class="item-col">
                           <span class="state-title">{{ Object.values(data)[0] }} :</span>
-                          <span class="state-val">{{ (monitorData[Object.keys(data)[0].replace('PRE', 'PRE'+ groupNum)])
-                            >= 0 ? Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)]) : '-' }}</span>
+                          <span class="state-val">{{ (monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)])
+                            >= 0 ? formatNum(Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)])) : '-' }}</span>
                         </div>
                         <div class="item-col">
                           <span class="state-title">{{ Object.values(data)[1] }} :</span>
                           <span class="state-val">{{ (monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)])
-                            >= 0 ? Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)]) : '-' }}</span>
+                            >= 0 ? formatNum(Number(monitorData[Object.keys(data)[0].replace('PRE', 'PRE' + groupNum)])) : '-' }}</span>
                         </div>
                       </div>
                     </template>
@@ -217,6 +217,7 @@ import { mountedThree, destroy, setModelType, clearCssText } from '../nitrogen.t
 import { list } from '../nitrogen.api'
 import ventBox1 from '/@/components/vent/ventBox1.vue'
 import { monitorDataGroupNum1, monitorDataGroupNum2, airCompressorState, showMonitorData, monitorData } from '../nitrogen.data'
+import { formatNum } from '/@/utils/ventutil'
 
 const loading = ref(true)
 const monitorDataGroupNum = ref(monitorDataGroupNum1)

+ 2 - 2
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'"/>