注氮界面及接口修改

src/views/vent/monitorManager/compressor/components/nitrogenHome2.vue

@@ -7,23 +7,20 @@
         <template>
             <div v-for="groupNum in 2" :key="groupNum" class="modal-monitor">
                 <fourBorderBg :class="`kyj${groupNum}`" :id="`nitrogenMonitor${groupNum}`">
-                    <div class="title">{{ monitorData[groupNum - 1]['strname'] }} </div>
+                    <div class="title">{{ monitorData[0]['strname'] }} </div>
 
 
                     <div class="monitor-item">
                         <span class="monitor-title">流量:</span>
                         <span class="monitor-val" v-if="!refresh"><span class="val">{{
-                            monitorData[groupNum - 1]['flow'] ? monitorData[groupNum -
-                            1]['flow'] : '-'
-                        }}</span>
+                            monitorData[0]['flow'] ? monitorData[0]['flow'] : '-'}}</span>
                             <span class="unit">m³/min</span></span>
                     </div>
 
                     <div class="monitor-item">
                         <span class="monitor-title">总流量:</span>
                         <span class="monitor-val" v-if="!refresh"><span class="val">{{
-                            monitorData[groupNum - 1]['total_flow'] ? monitorData[groupNum -
-                            1]['total_flow'] : '-'
+                            monitorData[0]['total_flow'] ? monitorData[0]['total_flow'] : '-'
                         }}</span>
                             <span class="unit">m³</span></span>
                     </div>
@@ -31,8 +28,7 @@
                     <div class="monitor-item">
                         <span class="monitor-title">单次流量:</span>
                         <span class="monitor-val" v-if="!refresh"><span class="val">{{
-                            monitorData[groupNum - 1]['single_flow'] ? monitorData[groupNum -
-                            1]['single_flow'] : '-'
+                            monitorData[0]['single_flow'] ? monitorData[0]['single_flow'] : '-'
                         }}</span>
                             <span class="unit">m³/min</span></span>
                     </div>
@@ -40,8 +36,7 @@
                     <div class="monitor-item">
                         <span class="monitor-title">氧浓度:</span>
                         <span class="monitor-val" v-if="!refresh"><span class="val">{{
-                            monitorData[groupNum - 1]['oxygen_concentration'] ? monitorData[groupNum -
-                            1]['oxygen_concentration'] : '-'
+                            monitorData[0]['oxygen_concentration'] ? monitorData[0]['oxygen_concentration'] : '-'
                         }}</span>
                             <span class="unit">%</span></span>
                     </div>
@@ -59,29 +54,20 @@
                     <div class="top-center">
                         <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 class="button-box" @click="handlerDevice(airCompressorState[0], '备机启动')">备机启动</div>
+                        <div class="button-box" @click="handlerDevice(airCompressorState[0], '备机停止')">备机停止</div>
                     </div>
                     <div class="top-right">
                         <div class="control-type">
-                            <div class="control-title">{{  airCompressorState.length!=0 ? airCompressorState[0]['overhaul_run']=='1' ? '主机：' : airCompressorState[1]['overhaul_run']=='1' ? '备机：' : '运行状态：' : '运行状态：' }}</div>
-                            <a-radio-group v-if="airCompressorState.length!=0 && airCompressorState[0]['overhaul_run']=='1' && airCompressorState[1]['overhaul_run']!='1'" v-model:value="airCompressorState[0]['overhaul_run']">
-                                <a-radio :value="`0`">检修</a-radio>
-                                <a-radio :value="`1`">运行</a-radio>
-                            </a-radio-group>
-                            <a-radio-group v-if="airCompressorState.length!=0 && airCompressorState[1]['overhaul_run']=='1' && airCompressorState[0]['overhaul_run']!='1'" v-model:value="airCompressorState[1]['overhaul_run']">
+                            <div class="control-title">运行状态：</div>
+                            <a-radio-group  v-model:value="monitorData[0]['overhaul_run']">
                                 <a-radio :value="`0`">检修</a-radio>
                                 <a-radio :value="`1`">运行</a-radio>
                             </a-radio-group>
-                           
                         </div>
                         <div class="control-type">
                             <div class="control-title">控制模式：</div>
-                            <a-radio-group v-if="airCompressorState.length!=0 && airCompressorState[0]['remote_local']=='1' && airCompressorState[1]['remote_local']!='1'" v-model:value="airCompressorState[0]['remote_local']">
-                                <a-radio :value="`0`">就地</a-radio>
-                                <a-radio :value="`1`">远程</a-radio>
-                            </a-radio-group>
-                            <a-radio-group v-if="airCompressorState.length!=0 && airCompressorState[1]['remote_local']=='1' && airCompressorState[0]['remote_local']!='1'" v-model:value="airCompressorState[1]['remote_local']">
+                            <a-radio-group  v-model:value="monitorData[0]['remote_local']">
                                 <a-radio :value="`0`">就地</a-radio>
                                 <a-radio :value="`1`">远程</a-radio>
                             </a-radio-group>
@@ -101,13 +87,13 @@
                         <div class="device-title">{{ device.title }}</div>
                         <div v-for="(detailItem, index) in device.dataList" :key="detailItem.code" class="device-val">
                             <span v-if="index == 0"
-                                :style="{ color: monitorData[detailItem.code] != '1' ? '#BFBFBF' : '#10BC79' }">{{
-                                    monitorData[detailItem.code] == '0' ? '正常' : monitorData[detailItem.code] == '1' ? '故障' :
+                                :style="{ color: monitorData[0][detailItem.code] != '1' ? '#BFBFBF' : '#10BC79' }">{{
+                                    monitorData[0][detailItem.code] == '0' ? '正常' : monitorData[0][detailItem.code] == '1' ? '故障' :
                                     '-'
                                 }}</span>
                             <span v-if="index == 1"
-                                :style="{ color: monitorData[detailItem.code] != '1' ? '#BFBFBF' : '#10BC79' }">{{
-                                    monitorData[detailItem.code] == '0' ? '正常' : monitorData[detailItem.code] == '1' ? '故障' :
+                                :style="{ color: monitorData[0][detailItem.code] != '1' ? '#BFBFBF' : '#10BC79' }">{{
+                                    monitorData[0][detailItem.code] == '0' ? '正常' : monitorData[0][detailItem.code] == '1' ? '故障' :
                                     '-'
                                 }}</span>
                         </div>
@@ -119,7 +105,9 @@
                     <div class="item item-l" v-for="(groupNum, ind) in monitorDataGroupNum" :key="groupNum">
                         <ventBox1>
                             <template #title>
-                                <div>{{ monitorData[groupNum - 1]['strname'] }}</div>
+                                <!-- <div>{{ monitorData[groupNum - 1]['strname'] }}</div>   -->
+                                <div v-if="ind==0">{{ `${monitorData[0]['strname']}-主`  }}</div>
+                                <div v-else>{{ `${monitorData[0]['strname']}-备`  }}</div>
                             </template>
                             <template #container>
                                 <div class="monitor-box">
@@ -132,19 +120,17 @@
                                             <div class="item-col">
                                                 <span class="state-title1">{{ Object.values(data)[0] }} :</span>
                                                 <span class="state-val1" v-if="index == 0">{{
-                                                    (monitorData.length > 0 && monitorData[groupNum -
-                                                        1][Object.keys(data)[0]])
+                                                    (monitorData.length > 0 && monitorData[0][Object.keys(data)[0]])
                                                     >= 0
-                                                    ? monitorData[groupNum - 1][Object.keys(data)[0]] ?
-                                                        parseFloat(monitorData[groupNum -
-                                                            1][Object.keys(data)[0]]).toFixed(2) : '-'
+                                                    ? monitorData[0][Object.keys(data)[0]] ?
+                                                        parseFloat(monitorData[0][Object.keys(data)[0]]).toFixed(2) : '-'
                                                     : '-'
                                                 }}</span>
 
                                                 <span class="state-val" v-else>
-                                                    <span v-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '0'"
+                                                    <span v-if="monitorData[0][Object.keys(data)[0]] == '0'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
-                                                    <span v-else-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '1'"
+                                                    <span v-else-if="monitorData[0][Object.keys(data)[0]] == '1'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                     <span v-else
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
@@ -154,9 +140,9 @@
                                             <div class="item-col" v-if="Object.keys(data)[1]">
                                                 <span class="state-title1">{{ Object.values(data)[1] }} :</span>
                                                 <span class="state-val1">
-                                                    <span v-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '0'"
+                                                    <span v-if="monitorData[0][Object.keys(data)[1]] == '0'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
-                                                    <span v-else-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '1'"
+                                                    <span v-else-if="monitorData[0][Object.keys(data)[1]] == '1'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                     <span v-else
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
@@ -171,19 +157,17 @@
                                             <div class="item-col">
                                                 <span class="state-title1">{{ Object.values(data)[0] }} :</span>
                                                 <span class="state-val1" v-if="index == 0">{{
-                                                    (monitorData.length > 0 && monitorData[groupNum -
-                                                        1][Object.keys(data)[0]])
+                                                    (monitorData.length > 0 && monitorData[0][Object.keys(data)[0]])
                                                     >= 0
-                                                    ? monitorData[groupNum - 1][Object.keys(data)[0]] ?
-                                                        parseFloat(monitorData[groupNum -
-                                                            1][Object.keys(data)[0]]).toFixed(2) : '-'
+                                                    ? monitorData[0][Object.keys(data)[0]] ?
+                                                        parseFloat(monitorData[0][Object.keys(data)[0]]).toFixed(2) : '-'
                                                     : '-'
                                                 }}</span>
 
                                                 <span class="state-val" v-else>
-                                                    <span v-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '0'"
+                                                    <span v-if="monitorData[0][Object.keys(data)[0]] == '0'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
-                                                    <span v-else-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '1'"
+                                                    <span v-else-if="monitorData[0][Object.keys(data)[0]] == '1'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                     <span v-else
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
@@ -193,9 +177,9 @@
                                             <div class="item-col" v-if="Object.keys(data)[1]">
                                                 <span class="state-title1">{{ Object.values(data)[1] }} :</span>
                                                 <span class="state-val1">
-                                                    <span v-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '0'"
+                                                    <span v-if="monitorData[0][Object.keys(data)[1]] == '0'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
-                                                    <span v-else-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '1'"
+                                                    <span v-else-if="monitorData[0][Object.keys(data)[1]] == '1'"
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                     <span v-else
                                                         style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
@@ -217,33 +201,30 @@
                                                 <div class="item-col">
                                                     <span class="state-title1">{{ Object.values(data)[0] }} :</span>
                                                     <span class="state-val1" v-if="index == 0">{{
-                                                        (monitorData.length > 0 && monitorData[groupNum -
-                                                            1][Object.keys(data)[0]])
+                                                        (monitorData.length > 0 && monitorData[0][Object.keys(data)[0]])
                                                         >= 0
-                                                        ? monitorData[groupNum - 1][Object.keys(data)[0]] ?
-                                                            parseFloat(monitorData[groupNum -
-                                                                1][Object.keys(data)[0]]).toFixed(2) : '-'
+                                                        ? monitorData[0][Object.keys(data)[0]] ?
+                                                            parseFloat(monitorData[0][Object.keys(data)[0]]).toFixed(2) : '-'
                                                         : '-'
                                                     }}</span>
 
                                                     <span class="state-val" v-else>
-                                                        <span v-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '0'"
+                                                        <span v-if="monitorData[0][Object.keys(data)[0]] == '0'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
                                                         <span
-                                                            v-else-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '1'"
+                                                            v-else-if="monitorData[0][Object.keys(data)[0]] == '1'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                         <span v-else
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
-
                                                     </span>
                                                 </div>
                                                 <div class="item-col" v-if="Object.keys(data)[1]">
                                                     <span class="state-title1">{{ Object.values(data)[1] }} :</span>
                                                     <span class="state-val1">
-                                                        <span v-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '0'"
+                                                        <span v-if="monitorData[0][Object.keys(data)[1]] == '0'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
                                                         <span
-                                                            v-else-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '1'"
+                                                            v-else-if="monitorData[0][Object.keys(data)[1]] == '1'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                         <span v-else
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
@@ -257,20 +238,18 @@
                                                 <div class="item-col">
                                                     <span class="state-title1">{{ Object.values(data)[0] }} :</span>
                                                     <span class="state-val1" v-if="index == 0">{{
-                                                        (monitorData.length > 0 && monitorData[groupNum -
-                                                            1][Object.keys(data)[0]])
+                                                        (monitorData.length > 0 && monitorData[0][Object.keys(data)[0]])
                                                         >= 0
-                                                        ? monitorData[groupNum - 1][Object.keys(data)[0]] ?
-                                                            parseFloat(monitorData[groupNum -
-                                                                1][Object.keys(data)[0]]).toFixed(2) : '-'
+                                                        ? monitorData[0][Object.keys(data)[0]] ?
+                                                            parseFloat(monitorData[0][Object.keys(data)[0]]).toFixed(2) : '-'
                                                         : '-'
                                                     }}</span>
 
                                                     <span class="state-val" v-else>
-                                                        <span v-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '0'"
+                                                        <span v-if="monitorData[0][Object.keys(data)[0]] == '0'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
                                                         <span
-                                                            v-else-if="monitorData[groupNum - 1][Object.keys(data)[0]] == '1'"
+                                                            v-else-if="monitorData[0][Object.keys(data)[0]] == '1'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                         <span v-else
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
@@ -280,10 +259,10 @@
                                                 <div class="item-col" v-if="Object.keys(data)[1]">
                                                     <span class="state-title1">{{ Object.values(data)[1] }} :</span>
                                                     <span class="state-val1">
-                                                        <span v-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '0'"
+                                                        <span v-if="monitorData[0][Object.keys(data)[1]] == '0'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: blue;"></span>
                                                         <span
-                                                            v-else-if="monitorData[groupNum - 1][Object.keys(data)[1]] == '1'"
+                                                            v-else-if="monitorData[0][Object.keys(data)[1]] == '1'"
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: greenyellow;"></span>
                                                         <span v-else
                                                             style="display: inline-block; width: 10px;height: 10px;border-radius: 50%;background-color: #ccc;"></span>
@@ -887,8 +866,6 @@ async function getDataSource(systemID) {
                         m_stop: readData.m_stop ,
                         b_start: readData.b_start ,
                         b_stop: readData.b_stop ,
-                        overhaul_run:readData.overhaul_run ,
-                        remote_local:readData.remote_local 
                     });
                     return Object.assign(data, readData);
                 });
@@ -910,7 +887,8 @@ async function getDataSource(systemID) {
 
             }
         });
-        monitorDataGroupNum.value = monitorData.value.length;
+        // monitorDataGroupNum.value = monitorData.value.length;
+        monitorDataGroupNum.value = 2;
         refresh.value = true
         nextTick(() => {
             refresh.value = false