diff --git a/src/views/MicroExhibition/component/Border.vue b/src/views/MicroExhibition/component/Border.vue
index 9bafdf3..c5cf13d 100644
--- a/src/views/MicroExhibition/component/Border.vue
+++ b/src/views/MicroExhibition/component/Border.vue
@@ -32,7 +32,7 @@ let prop = defineProps({
position: relative;
width: 100%;
height: 100%;
- padding: 10px;
+ padding: 5px;
box-sizing: border-box;
display: flex;
flex-direction: column;
diff --git a/src/views/MicroExhibition/component/BottomBorder.vue b/src/views/MicroExhibition/component/BottomBorder.vue
index 7797acb..c638e5b 100644
--- a/src/views/MicroExhibition/component/BottomBorder.vue
+++ b/src/views/MicroExhibition/component/BottomBorder.vue
@@ -36,6 +36,9 @@
+
+ {{t('messages.能耗')}}:{{ i.consumption }}
+
{{t('default.工作时长')}}:{{ i.workTime }}
diff --git a/src/views/MicroExhibition/component/ScrollBoard.vue b/src/views/MicroExhibition/component/ScrollBoard.vue
index 7bdc6ef..ea9e8e0 100644
--- a/src/views/MicroExhibition/component/ScrollBoard.vue
+++ b/src/views/MicroExhibition/component/ScrollBoard.vue
@@ -26,9 +26,9 @@ function ZdClick(value) {
}
let config = reactive({
header: [
- ''+t('default.序号')+'',
- ''+t('default.设备名称')+'',
''+t('default.编号')+'',
+ ''+t('default.设备名称')+'',
+ ''+t('messages.能耗')+'',
''+t('default.状态')+'',
''+t('default.稼动率')+'',
''+t('default.工作时长')+'',
@@ -37,7 +37,7 @@ let config = reactive({
oddRowBGC: '#000F1D',
evenRowBGC: '#000F1D',
wrap: [false, true, false, false, false],
- columnWidth: [80, 240, 85, 90, 110,145],
+ columnWidth: [78, 220, 125, 78, 104,145],
align: ['center', 'center', 'center', 'center', 'center', 'center'],
rowNum: prop.data.rowNum,
waitTime: 3000,
diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue
index c0abd18..4728b04 100644
--- a/src/views/MicroExhibition/index.vue
+++ b/src/views/MicroExhibition/index.vue
@@ -175,7 +175,7 @@ function getmDevList() {
temp = '0'
}
let devname = thisLang && thisLang != "简体中文" ? item.ename : item.name
- return [i + 1, { devname, label: item.label, id: item.id }, item.num, temp, item.ratio, item.workTime]
+ return [item.num, { devname, label: item.label, id: item.id }, item.consumption+'kW·h', temp, item.ratio, item.workTime]
})
stepList[statusObj[key]].online = online;
stepList[statusObj[key]].total = devObj[key].list.length;
@@ -197,6 +197,7 @@ function getmDevList() {
name: { devname, label: item.label },
num: item.num,
status: temp,
+ consumption: item.consumption+'kW·h',
ratio: item.ratio,
rationum: parseInt(item.ratio.split('%')[0]),
workTime: item.workTime,
@@ -282,7 +283,7 @@ function changestatus(val) {
}
} else {
let dataIndex = devObj[val.step].list.findIndex((item, index) => {
- return item[2] == val.num
+ return item[0] == val.num
})
if (dataIndex !== -1 && devObj[val.step].list[dataIndex][3] != val.status) {
if (devObj[val.step].list[dataIndex][3] != 0 && val.status == '0') {
@@ -304,6 +305,7 @@ function getWebsocket(val) {
if (data.type == 'mDeviceStatus') {
+
changestatus(data.msg)
}
// if (data.type == 'WorkingState') {