From e055d2d93b516985fbc2df0f6f5a135f3230cccf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:13:47 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/DeviceBaseInfo.vue | 119 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 93 insertions(+), 26 deletions(-)
diff --git a/src/views/mdc/base/DeviceBaseInfo.vue b/src/views/mdc/base/DeviceBaseInfo.vue
index b697ecf..cded000 100644
--- a/src/views/mdc/base/DeviceBaseInfo.vue
+++ b/src/views/mdc/base/DeviceBaseInfo.vue
@@ -5,31 +5,45 @@
<base-tree @sendSelectBaseTree="changeSelection" @getCurrSelected="changeSelectionNode"></base-tree>
</a-col>
<a-col :md="24-5" :sm="24">
- <div class="equipMessage">
- <table>
- <tr>
- <td>鍏虫満
- <span class="equipShutdown"></span>
- </td>
- <td>{{offNumber}}</td>
- <td>寰呮満
- <span class="standbyNumber"></span>
- </td>
- <td>{{standbyNumber}}</td>
- <td>杩愯
- <span class="equipRun"></span>
- </td>
- <td>{{workNumber}}</td>
- <td>鎶ヨ
- <span class="equipAlarm"></span>
- </td>
- <td>{{warningNumber}}</td>
- <td>鎬绘暟</td>
- <td>{{allNumber}}</td>
- </tr>
- </table>
+ <!--<div class="equipMessage">-->
+ <!--<table>-->
+ <!--<tr>-->
+ <!--<td>鍏虫満-->
+ <!--<span class="equipShutdown"></span>-->
+ <!--</td>-->
+ <!--<td>{{offNumber}}</td>-->
+ <!--<td>寰呮満-->
+ <!--<span class="standbyNumber"></span>-->
+ <!--</td>-->
+ <!--<td>{{standbyNumber}}</td>-->
+ <!--<td>杩愯-->
+ <!--<span class="equipRun"></span>-->
+ <!--</td>-->
+ <!--<td>{{workNumber}}</td>-->
+ <!--<td>鎶ヨ-->
+ <!--<span class="equipAlarm"></span>-->
+ <!--</td>-->
+ <!--<td>{{warningNumber}}</td>-->
+ <!--<td>鎬绘暟</td>-->
+ <!--<td>{{allNumber}}</td>-->
+ <!--</tr>-->
+ <!--</table>-->
+ <!--</div>-->
+ <div class="device-status-info">
+ <a-space v-for="item in deviceStatusList" :key="item.value" class="single-status-info">
+ <template v-if="item.value!=99">
+ <div>{{ item.label }}</div>
+ <div class="status-square" :style="{ backgroundColor: item.color }"></div>
+ <div>{{getDeviceNumberByStatus(item.value) }}</div>
+ </template>
+ <template v-else>
+ <div>{{ item.label }}</div>
+ <div>{{getDeviceNumberByStatus(item.value) }}</div>
+ </template>
+ </a-space>
</div>
+
<div>
<a-tabs default-active-key="1">
<a-tab-pane key="1" tab="甯冨眬鍥�">
@@ -86,7 +100,34 @@
},
param:{},
timer:null,
- timerzhun:null
+ timerzhun:null,
+ deviceStatusList: [
+ {
+ label: '鍏虫満',
+ value: 0,
+ color: '#A8A8A8'
+ },
+ {
+ label: '寰呮満',
+ value: 2,
+ color: '#FFFF00'
+ },
+ {
+ label: '杩愯',
+ value: 3,
+ color: '#00EE00'
+ },
+ {
+ label: '鎶ヨ',
+ value: 22,
+ color: '#FF0000'
+ },
+ {
+ label: '鎬绘暟',
+ value: 99,
+ color: '#fff'
+ }
+ ],// 璁惧鐘舵�佹寚绀虹伅鍒楄〃锛�
}
},
created() {
@@ -197,7 +238,17 @@
description:err.message
});
})
- }
+ },
+
+ /**
+ * 鏍规嵁璁惧鐘舵�佸�艰幏鍙栧搴旇澶囨暟閲�
+ * @param value 璁惧鐘舵�佸��
+ * @returns {number} 璁惧鏁伴噺
+ */
+ getDeviceNumberByStatus(value) {
+ if (value === 99) return this.dataList.length
+ return this.dataList.filter((item) => item.oporation === 1 && value === 2 || item.oporation === value).length
+ },
},
mounted(){
this.equipmentStatistics()
@@ -211,7 +262,7 @@
}
}
</script>
-<style scoped>
+<style scoped lang="less">
@import '~@assets/less/common.less';
.equipMessage {
@@ -251,4 +302,20 @@
.equipMessage table td .equipAlarm {
background-color: #FD0008;
}
+
+ .device-status-info {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+
+ .single-status-info {
+ margin: 10px;
+ .status-square {
+ width: 20px;
+ height: 20px;
+ border: 1px solid #ddd;
+ border-radius: 3px;
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3