Преглед на файлове

路宁注氮修改-提交

lxh преди 1 година
родител
ревизия
f0608fa0d9
променени са 1 файла, в които са добавени 6 реда и са изтрити 31 реда
  1. 6 31
      src/views/vent/monitorManager/compressor/components/nitrogenHome_ln.vue

+ 6 - 31
src/views/vent/monitorManager/compressor/components/nitrogenHome_ln.vue

@@ -13,27 +13,6 @@
             monitorData[groupNum][preMonitor.code] : '-' }}</span><span class="unit">{{
             preMonitor.unit }}</span></span>
                     </div>
-                    <!-- <div v-else class="signal-item">
-                        <div class="signal" v-for="(signal, childIndex) in preMonitor.child" :key="childIndex">
-                            <span class="monitor-title">{{ signal.title }}</span>
-                            <span style="display: inline-block; width: 30px; text-align: center"
-                                v-if="signal.isFault == -2">{{
-            monitorData[signal.code + groupNum] == '0' ? '就地' : monitorData[signal.code + groupNum]
-                == '1' ? '远程' : '-'
-        }}</span>
-                            <span style="display: inline-block; width: 30px; text-align: center"
-                                v-else-if="signal.isFault == -1">{{
-            monitorData[signal.code + groupNum] == '1' ? '加载' : monitorData[signal.code + groupNum]
-                == '0' ? '卸载' : '-'
-        }}</span>
-                            <span v-else :class="{
-                'signal-round': true,
-                'signal-round-run': !signal.isFault && monitorData[signal.code + groupNum] == '1',
-                'signal-round-warning': signal.isFault && monitorData[signal.code + groupNum] == '1',
-                'signal-round-gry': monitorData[signal.code + groupNum] != '1',
-            }"></span>
-                        </div>
-                    </div> -->
                 </template>
             </fourBorderBg>
         </div>
@@ -87,7 +66,7 @@
         }}</div>
                                 <div v-else :class="{
                 'signal-round': true,
-                'signal-round-warning': monitorData[0][preFan.code] == '1',
+                'signal-round-warning':monitorData[0][preFan.code] == '1',
                 'signal-round-gry': monitorData[0][preFan.code] != '1',
             }"></div>
                                 <div class="unit">{{ preFan.unit !== 'signal' ? `(${preFan.unit})` : '' }}</div>
@@ -153,7 +132,6 @@ import { formatNum } from '/@/utils/ventutil';
 import { useCamera } from '/@/hooks/system/useCamera';
 import { message } from 'ant-design-vue';
 import lodash from 'lodash';
-// import ceshi from '../ceshi.json'
 const globalConfig = inject('globalConfig');
 
 const props = defineProps({
@@ -246,13 +224,11 @@ async function getDataSource(systemID) {
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     if (res) {
         const result = res;
-        // let result = ceshi.result
         if (!result || result.msgTxt.length < 1) return;
         result.msgTxt.forEach((item) => {
-            if (item.type && item.type.startsWith('sys')) {
+            if (item.type && item.type.startsWith('nitrogen')) {
                 airCompressorState.length = 0;
                 // let netStatus = 0;
-                // monitorData.value = Object.assign(item['datalist'][0], item['datalist'][0]['readData']);
                 monitorData.length = 0
                 item.datalist.forEach(el => {
                     if (el.deviceType == 'nitrogen_auto') {
@@ -261,16 +237,15 @@ async function getDataSource(systemID) {
                         monitorData.push({ ...el, ...el.readData })
                     }
                 })
-                statusKyj.value = monitorData[1]['operation_shutdown']
-                statusZdj.value = monitorData[0]['remote_local']
+                statusKyj.value = monitorData[1] ? monitorData[1]['operation_shutdown'] : ''
+                statusZdj.value = monitorData[0] ? monitorData[0]['remote_local'] : ''
                 monitorDataGroupNum.value = monitorData.length - 1
-                console.log(monitorData, ' monitorData--------')
                 // if (monitorData['netStatus'] == 1) {
                 //     netStatus = 1;
                 // }
                 airCompressorState.push({
-                    id: monitorData[1]['deviceID'],
-                    deviceType: monitorData[1]['deviceType'],
+                    id: monitorData[1] ? monitorData[1]['deviceID'] : '',
+                    deviceType: monitorData[1] ? monitorData[1]['deviceType'] : '',
                 });
                 const airCompressor = { readTime: monitorData[0]['readTime'].substring(11) };
                 const dataArr = lodash.cloneDeep(echartData.value);