Browse Source

宝德注氮机控制修改-提交

lxh 9 months ago
parent
commit
91b0156a53

+ 11 - 19
src/views/vent/monitorManager/compressor/components/nitrogenHome_bd.vue

@@ -51,8 +51,8 @@
                     <div class="top-left">
                         <div class="button-box" @click="handlerDevice(airCompressorState[0], '主机启动')">主机启动</div>
                         <div class="button-box" @click="handlerDevice(airCompressorState[0], '主机停止')">主机停止</div>
-                        <div class="button-box" @click="handlerDevice(airCompressorState[0], '备机启动')">备机启动</div>
-                        <div class="button-box" @click="handlerDevice(airCompressorState[0], '备机停止')">备机停止</div>
+                        <div class="button-box" @click="handlerDevice(airCompressorState[1], '备机启动')">备机启动</div>
+                        <div class="button-box" @click="handlerDevice(airCompressorState[1], '备机停止')">备机停止</div>
                     </div>
                     <div class="top-center">
                         <div class="top-c-label">通信状态:</div>
@@ -811,6 +811,7 @@ async function getDataSource(systemID) {
                     return Object.assign(data, readData);
                 });
                 console.log(monitorData, 'monitorData.value---===')
+                console.log(airCompressorState,'airCompressorState--------')
                 const airCompressor = { readTime: monitorData.value[0]['readTime'].substring(11) }
                 const dataArr = lodash.cloneDeep(echartData.value)
                 //图表数据
@@ -849,25 +850,25 @@ function handlerDevice(data, titles) {
             modalTitle.value = titles;
             modalType.value = '1';
             modalIsShow.value = true;
-            kzParam.data.m_start = '1'
+            kzParam.data.m_start = data.m_start
             break;
         case '备机启动':
             modalTitle.value = titles;
             modalType.value = '2';
             modalIsShow.value = true;
-            kzParam.data.b_start = '1'
+            kzParam.data.b_start = data.b_start
             break;
         case '主机停止':
             modalTitle.value = titles;
             modalType.value = '1';
             modalIsShow.value = true;
-            kzParam.data.m_stop = '1'
+            kzParam.data.m_stop = data.m_stop
             break;
         case '备机停止':
             modalTitle.value = titles;
             modalType.value = '2';
             modalIsShow.value = true;
-            kzParam.data.b_stop = '1'
+            kzParam.data.b_stop = data.b_stop
             break;
 
     }
@@ -875,11 +876,6 @@ function handlerDevice(data, titles) {
 }
 function handleOK(passWord, handlerState) {
     console.log(kzParam, 'kz----------');
-    // if (passWord !== '123456') {
-    //   message.warning('密码不正确,请重新输入');
-    //   return;
-    // }
-
     let data = {};
     switch (kzParam.isFw) {
         case '主机启动':
@@ -887,7 +883,7 @@ function handleOK(passWord, handlerState) {
                 deviceid: kzParam.data.id,
                 devicetype: kzParam.data.deviceType,
                 password: passWord,
-                m_start: kzParam.data.m_start,
+                m_start: kzParam.data.m_start || '',
             };
             break;
         case '备机启动':
@@ -895,7 +891,7 @@ function handleOK(passWord, handlerState) {
                 deviceid: kzParam.data.id,
                 devicetype: kzParam.data.deviceType,
                 password: passWord,
-                b_start: kzParam.data.b_start,
+                b_start: kzParam.data.b_start || '',
             };
             break;
         case '主机停止':
@@ -903,7 +899,7 @@ function handleOK(passWord, handlerState) {
                 deviceid: kzParam.data.id,
                 devicetype: kzParam.data.deviceType,
                 password: passWord,
-                m_stop: kzParam.data.m_stop,
+                m_stop: kzParam.data.m_stop || '',
             };
             break;
         case '备机停止':
@@ -911,14 +907,10 @@ function handleOK(passWord, handlerState) {
                 deviceid: kzParam.data.id,
                 devicetype: kzParam.data.deviceType,
                 password: passWord,
-                b_stop: kzParam.data.b_stop,
+                b_stop: kzParam.data.b_stop || '',
             };
             break;
-
-
     }
-
-
     deviceControlApi(data).then((res) => {
         // 模拟时开启
         if (res.success) {

+ 1 - 1
src/views/vent/monitorManager/compressor/nitrogen.data.ts

@@ -236,7 +236,7 @@ export function getMonitorComponent() {
       return nitrogenHome;
     default:
       // nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_blt.vue'));
-      nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_ln.vue'));
+      nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bd.vue'));
       // nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_blt.vue'));
       return nitrogenHome;
   }