Ver código fonte

1. 大柳塔注氮显示数据进行调整

hongrunxia 4 meses atrás
pai
commit
d42b479a7f

+ 1 - 1
src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -401,7 +401,7 @@
         break;
       case 'sbyj':
         // router.push('/device/warn/home');
-        router.push('/monitorChannel/device-monitor/deviceHistory/home');
+        router.push('/device/warn/home');
         break;
     }
   }

+ 1 - 4
src/views/vent/monitorManager/compressor/components/nitrogenHome_dltj.vue

@@ -592,10 +592,7 @@
       // }
       airCompressor[`InputFlux`] =
         monitorData.value['InputFlux'] || Number(monitorData.value['InputFlux1']) + Number(monitorData.value['InputFlux2']);
-      monitorData.value['RunTime31'] = (Number(monitorData.value['RunTime31']) / 24).toFixed(0);
-      monitorData.value['RunTime41'] = (Number(monitorData.value['RunTime41']) / 24).toFixed(0);
-      monitorData.value['RunTime32'] = (Number(monitorData.value['RunTime32']) / 24).toFixed(0);
-      monitorData.value['RunTime42'] = (Number(monitorData.value['RunTime42']) / 24).toFixed(0);
+
       monitorData.value['FluxTotal'] = airCompressor[`InputFlux`];
       //图表数据
       if (dataArr.length <= 5) {

+ 17 - 5
src/views/vent/monitorManager/compressor/nitrogen.data.dlt1.ts

@@ -208,22 +208,34 @@ export const preMonitorList = [
     unit: '℃',
     child: [],
   },
+  // {
+  //   title: `加载时间`,
+  //   code: `LoadTime`,
+  //   unit: 'h',
+  //   child: [],
+  // },
   {
-    title: `加载时间`,
-    code: `LoadTime`,
+    title: `运行时间`,
+    code: `RunTime3`,
     unit: 'h',
     child: [],
   },
   {
     title: `运行时间`,
-    code: `RunTime3`,
-    unit: 'd',
+    code: `RunTime2`,
+    unit: 'min',
+    child: [],
+  },
+  {
+    title: `运行时间`,
+    code: `RunTime1`,
+    unit: 's',
     child: [],
   },
   {
     title: `保养时间`,
     code: `RunTime4`,
-    unit: 'd',
+    unit: 'h',
     child: [],
   },
   {

+ 16 - 8
src/views/vent/monitorManager/windowMonitor/index.vue

@@ -438,11 +438,15 @@
           fengliangR: windowAngleNum,
         };
       }
-      windControl(params).then(() => {
-        if (globalConfig.History_Type == 'remote') {
-          message.success('指令已下发至生产管控平台成功!');
+      windControl(params).then((res) => {
+        if (res.success) {
+          if (globalConfig.History_Type == 'remote') {
+            message.success('指令已下发至生产管控平台成功!');
+          } else {
+            message.success('指令已下发成功!');
+          }
         } else {
-          message.success('指令已下发成功!');
+          message.error(res.message);
         }
       });
     } else {
@@ -459,11 +463,15 @@
       }
 
       deviceControlApi(data)
-        .then(() => {
-          if (globalConfig.History_Type == 'remote') {
-            message.success('指令已下发至生产管控平台成功!');
+        .then((res) => {
+          if (res.success) {
+            if (globalConfig.History_Type == 'remote') {
+              message.success('指令已下发至生产管控平台成功!');
+            } else {
+              message.success('指令已下发成功!');
+            }
           } else {
-            message.success('指令已下发成功!');
+            message.error(res.message);
           }
         })
         .finally(() => {