[Feat 0000]塔山智能注氮页面优化

.env

@@ -1,5 +1,5 @@
 # port
-VITE_PORT = 8062
+VITE_PORT = 3100
 
 #  网站标题
 VITE_GLOB_APP_TITLE = 智能通风管控系统

src/components/vent/BasicMonitoring.vue

@@ -14,8 +14,8 @@
     <div class="center-container">
       <!-- 监测模块 -->
       <template v-if="activeKey == 'monitor'">
-        <slot name="opration" v-if="monitorType !== 'nitrogenMonitor'">
-          <div class="button-wrapper">
+        <slot name="opration">
+          <div class="button-wrapper" v-if="monitorType !== 'nitrogenMonitor'">
             <template v-for="item in mainConfig.operations" :key="item.key">
               <template v-if="hasPermission(item.permission)">
                 <div :class="{ 'button-box': true, 'button-box-disable': item.disabled }" @click="handleOperate(item)">{{ item.label }} </div>
@@ -215,9 +215,9 @@ async function getSysDataSource() {
 // 切换检测数据
 function changeSelectRow(deviceID) {
   optionValue.value = deviceID;
-  if (props.monitorType !== 'nitrogenMonitor') {
-    getDeviceList();
-  }
+  // if (props.monitorType !== 'nitrogenMonitor') {
+  getDeviceList();
+  // }
 }
 
 /** 当前场景所关联设备 */
@@ -270,7 +270,6 @@ async function getMonitor() {
       .catch(() => {
         message.error('获取已绑定设备时发生了错误');
       });
-    console.log(monitorData.value, '123123123123');
   } else if (optionValue.value) {
     const { msgTxt = [] } = await getDevice({ devicetype: 'sys', systemID: optionValue.value }).catch(() => {
       message.error('获取已绑定设备时发生了错误');
@@ -280,7 +279,6 @@ async function getMonitor() {
       _.set(temp, item.type, item.datalist);
     });
     monitorData.value = temp;
-    console.log(monitorData.value, '111111');
   }
 }
 

src/router/routes/index.ts

@@ -38,9 +38,9 @@ export const LoginRoute: AppRouteRecordRaw = {
   path: '/login',
   name: 'Login',
   //新版后台登录，如果想要使用旧版登录放开即可
-  // component: () => import('/@/views/sys/login/Login.vue'),
+  component: () => import('/@/views/sys/login/Login.vue'),
   //数据中心登录
-  component: () => import('/@/views/sys/login/LoginDataCenter.vue'),
+  // component: () => import('/@/views/sys/login/LoginDataCenter.vue'),
   // 内页登录
   // component: () => import('/@/views/sys/login/LoginNeiye.vue'),
   // component: () => import('/@/views/system/loginmini/MiniLogin.vue'),

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

@@ -39,8 +39,8 @@ const monitorData = ref<any[]>([]);
 function refresh() {
   // fetchConfigs(isDataRealTime.value ? 'vent_realtime' : 'vent').then(() => {
   fetchConfigs('nitrogen').then(() => {
-    configs.value = nitrogenConfigs;
-    // updateEnhancedConfigs(configs.value);
+    // configs.value = nitrogenConfigs;
+    updateEnhancedConfigs(configs.value);
     list({ devicetype: 'nitrogen', pagetype: 'normal' }).then(updateData, (res) => {
       if (res && res.msgTxt[0]) {
         const dataList: any[] = [];

src/views/vent/monitorManager/nitrogenMonitor/model-tip.vue

@@ -8,38 +8,38 @@
       <div class="zdj-ll">
         <div class="cq-zdj-item">
           <span class="text-label">累计流量(Nm³)：</span>
-          <span class="text-val">{{ statusData.Fan1ljll }}</span>
+          <span class="text-val">{{ statusData.readData['Fan1ljll'] }}</span>
         </div>
       </div>
       <div class="zdj-ll1">
         <div class="cq-zdj-item">
           <span class="text-label">累计流量(Nm³)：</span>
-          <span class="text-val">{{ statusData.Fan2ljll }}</span>
+          <span class="text-val">{{ statusData.readData['Fan2ljll'] }}</span>
         </div>
       </div>
       <!-- 加热器温度 -->
       <div class="jrq1">
         <div class="cq-zdj-item">
           <span class="text-label">加热器</span>
-          <span class="text-val">{{ statusData.Fan1jrqTemp }}℃</span>
+          <span class="text-val">{{ statusData.readData['Fan1jrqTemp'] }}℃</span>
         </div>
       </div>
       <div class="jrq2">
         <div class="cq-zdj-item">
-          <span class="text-val">{{ statusData.Fan2jrqTemp }}℃</span>
+          <span class="text-val">{{ statusData.readData['Fan2jrqTemp'] }}℃</span>
         </div>
       </div>
       <!-- 滤芯 -->
       <div class="filter">
         <div class="cq-zdj-item">
           <span class="text-label">滤芯1</span>
-          <span class="text-val">{{ statusData.Fan1lxyc }}MPa</span>
+          <span class="text-val">{{ statusData.readData['Fan1lxyc'] }}MPa</span>
         </div>
       </div>
       <div class="filter2">
         <div class="cq-zdj-item">
           <span class="text-label">滤芯2</span>
-          <span class="text-val">{{ statusData.Fan2lxyc }}MPa</span>
+          <span class="text-val">{{ statusData.readData['Fan2lxyc'] }}MPa</span>
         </div>
       </div>
       <!-- 活性炭 -->
@@ -52,36 +52,36 @@
       <!-- 上方浓度  流量  氮气压力  氮气温度 -->
       <div class="nd1">
         <span class="text-label">浓度</span>
-        <span class="text-val">{{ statusData.Fan1dqnd }}%</span>
+        <span class="text-val">{{ statusData.readData['Fan1dqnd'] }}%</span>
       </div>
       <div class="ll1">
         <span class="text-label">流量</span>
-        <span class="text-val">{{ statusData.Fan1ll }}Nm³/h</span>
+        <span class="text-val">{{ statusData.readData['Fan1ll'] }}Nm³/h</span>
       </div>
       <div class="dqyl1">
         <span class="text-label">氮气压力</span>
-        <span class="text-val">{{ statusData.Fan1dqyl }}MPa</span>
+        <span class="text-val">{{ statusData.readData['Fan1dqyl'] }}MPa</span>
       </div>
       <div class="dqwd1">
         <span class="text-label">氮气温度</span>
-        <span class="text-val">{{ statusData.Fan1dqwd }}℃</span>
+        <span class="text-val">{{ statusData.readData['Fan1dqwd'] }}℃</span>
       </div>
       <!-- 底部浓度  流量  氮气压力  氮气温度 -->
       <div class="nd">
         <span class="text-label">浓度</span>
-        <span class="text-val">{{ statusData.Fan2dqnd }}%</span>
+        <span class="text-val">{{ statusData.readData['Fan2dqnd'] }}%</span>
       </div>
       <div class="ll">
         <span class="text-label">流量</span>
-        <span class="text-val">{{ statusData.Fan2ll }}Nm³/h</span>
+        <span class="text-val">{{ statusData.readData['Fan2ll'] }}Nm³/h</span>
       </div>
       <div class="dqyl">
         <span class="text-label">氮气压力</span>
-        <span class="text-val">{{ statusData.Fan2dqyl }}MPa</span>
+        <span class="text-val">{{ statusData.readData['Fan2dqyl'] }}MPa</span>
       </div>
       <div class="dqwd">
         <span class="text-label">氮气温度</span>
-        <span class="text-val">{{ statusData.Fan2dqwd }}℃</span>
+        <span class="text-val">{{ statusData.readData['Fan2dqwd'] }}℃</span>
       </div>
     </div>
   </div>