[Fix 0000] 大柳塔与活鸡兔压风管控系统监测字段修改

src/router/routes/basic.ts

@@ -88,7 +88,7 @@ export const QIANKUN_ROUTE: AppRouteRecordRaw = {
     },
     {
       path: '/micro-vent-3dModal/modelchannel/model3D/home',
-      name: 'micro-vent-3dModal-modelchannel-model3D',
+      name: 'micro-vent-3dModal-modelchannel-model3D-home',
       component: () => import('/@/views/vent/home/colliery/index.vue'),
       meta: {
         title: '通防综合管控',

src/views/vent/monitorManager/deviceMonitor/components/device/modal/atomizing.modal.vue

@@ -23,6 +23,17 @@
               <span class="title">应用场景：</span>
               <span class="value">{{ atomizingMonitor['areaName'] ? atomizingMonitor['areaName'] : '-' }}</span>
             </div> -->
+            <div class="base-item">
+              <span class="title">主机位置：</span>
+              <span class="value"
+                >{{
+                  atomizingMonitor['holderLocation'] !== undefined && atomizingMonitor['holderLocation'] !== null
+                    ? atomizingMonitor['holderLocation']
+                    : '-'
+                }}
+                ℃</span
+              >
+            </div>
             <div class="base-item flex">
               <span class="title">工作模式：</span>
               <!-- <span class="value">{{ atomizingMonitor['workMode'] ? atomizingMonitor['workMode'] : '-' }}</span> -->
@@ -42,23 +53,6 @@
               </div>
             </div>
             <div class="base-item flex">
-              <span class="title">喷雾状态：</span>
-              <div class="flex">
-                <div class="pr-10px"
-                  ><span class="signal-round signal-round-gry" :class="{ 'signal-round-run': atomizingMonitor['waterStatus'] === 'FF00' }"></span
-                  ><span class="pl-10px">开启</span></div
-                >
-                <div class="pr-10px"
-                  ><span class="signal-round signal-round-gry" :class="{ 'signal-round-run': atomizingMonitor['waterStatus'] === '0000' }"></span
-                  ><span class="pl-10px">关闭</span></div
-                >
-                <div class="pr-10px"
-                  ><span class="signal-round signal-round-gry" :class="{ 'signal-round-run': atomizingMonitor['waterStatus'] === '0001' }"></span
-                  ><span class="pl-10px">停止</span></div
-                >
-              </div>
-            </div>
-            <div class="base-item flex">
               <span class="title">排污状态：</span>
               <div class="flex">
                 <div class="pr-10px"
@@ -88,17 +82,24 @@
                 >
               </div>
             </div>
-            <div class="base-item">
-              <span class="title">主机位置：</span>
-              <span class="value"
-                >{{
-                  atomizingMonitor['holderLocation'] !== undefined && atomizingMonitor['holderLocation'] !== null
-                    ? atomizingMonitor['holderLocation']
-                    : '-'
-                }}
-                ℃</span
-              >
+            <div class="base-item flex">
+              <span class="title">喷雾状态：</span>
+              <div class="flex">
+                <div class="pr-10px"
+                  ><span class="signal-round signal-round-gry" :class="{ 'signal-round-run': atomizingMonitor['waterStatus'] === 'FF00' }"></span
+                  ><span class="pl-10px">开启</span></div
+                >
+                <div class="pr-10px"
+                  ><span class="signal-round signal-round-gry" :class="{ 'signal-round-run': atomizingMonitor['waterStatus'] === '0000' }"></span
+                  ><span class="pl-10px">关闭</span></div
+                >
+                <div class="pr-10px"
+                  ><span class="signal-round signal-round-gry" :class="{ 'signal-round-run': atomizingMonitor['waterStatus'] === '0001' }"></span
+                  ><span class="pl-10px">停止</span></div
+                >
+              </div>
             </div>
+
             <div class="base-item">
               <span class="title">支架主机数量：</span>
               <span class="value">{{ atomizingMonitor['holderCounts'] ? atomizingMonitor['holderCounts'] : '-' }}</span>
@@ -145,7 +146,7 @@
               <div class="item-container">
                 <div class="title">粉尘浓度</div>
                 <div class="value"
-                  ><span class="data">{{ atomizingMonitor['dustConc'] ? atomizingMonitor['dustConc'] : '-' }}</span> <span>mg/m³</span></div
+                  ><span class="data">{{ atomizingMonitor['dust'] ? atomizingMonitor['dust'] : '-' }}</span> <span>mg/m³</span></div
                 >
               </div>
             </div>

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

@@ -504,17 +504,12 @@
       right: 30px;
       // display: flex;
       font-size: 18px;
-      .item-box {
-        width: 600px;
-        flex-wrap: wrap;
-        .item {
-          // width: 250px;
-          margin-left: 30px;
-          .val {
-            display: inline-box;
-            width: 150px;
-            color: #00d8ff;
-          }
+      .item {
+        margin-left: 20px;
+        .val {
+          display: inline-box;
+          width: 150px;
+          color: #00d8ff;
         }
       }
     }

src/views/vent/monitorManager/nitrogen/nitrogen.dataDlt.ts

@@ -8,8 +8,8 @@ export const preMonitorList = [
     child: [],
   },
   {
-    title: `冷却温度`,
-    code: `PRE_CPR_ExhaustTemp`,
+    title: `冷却剂温度`,
+    code: `PRE_CPR_CoolantTemp`,
     unit: '℃',
     child: [],
   },
@@ -24,7 +24,7 @@ export const preMonitorList = [
     child: [
       {
         title: `运行信号`,
-        code: `PRE_Status`,
+        code: `PRE_MOT_RunReturn`,
       },
       {
         title: `故障信号`,
@@ -71,12 +71,12 @@ export const preFanMonitorData = [
 ];
 export const totalData = [
   {
-    title: '总流量',
+    title: '出风流量',
     code: 'TotalInPipeFlow',
-    unit: 'bar',
+    unit: 'm³/h',
   },
   {
-    title: '总压力',
+    title: '总管压力',
     code: 'TotalOutPipePre1',
     unit: 'bar',
   },

src/views/vent/monitorManager/nitrogen/nitrogen.dataHjt.ts

@@ -9,8 +9,8 @@ export const preMonitorList = [
     child: [],
   },
   {
-    title: `冷却温度`,
-    code: `PRE_CPR_ExhaustTemp`,
+    title: `冷却剂温度`,
+    code: `PRE_CPR_CoolantTemp`,
     unit: '℃',
     child: [],
   },
@@ -24,8 +24,8 @@ export const preMonitorList = [
     code: 'signal',
     child: [
       {
-        title: `运行信号`,
-        code: `PRE_MOT_Running`,
+        title: `运行状态`,
+        code: `PRE_Status`,
       },
       {
         title: `故障信号`,
@@ -35,12 +35,12 @@ export const preMonitorList = [
   },
 ];
 export const cqgMonitorList = [
-  {
-    title: `气囊温度`,
-    code: `PRE_VLS_Temp`,
-    unit: '℃',
-    child: [],
-  },
+  // {
+  //   title: `气囊温度`,
+  //   code: `PRE_VLS_Temp`,
+  //   unit: '℃',
+  //   child: [],
+  // },
 ];
 
 export const preFanMonitorData = [
@@ -73,13 +73,13 @@ export const preFanMonitorData = [
 
 export const totalData = [
   {
-    title: '总流量',
+    title: '出风流量',
     code: 'TotalInPipeFlow',
-    unit: 'bar',
+    unit: 'm³/h',
   },
   {
-    title: '总压力',
-    code: 'TotalOutPipePre1',
+    title: '出风压力',
+    code: 'TotalOutPipePre',
     unit: 'bar',
   },
 ];