hanzhengzheng/screenFront
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新微工厂大屏

Browse Source
This commit is contained in:
hzz 2024-05-14 16:47:26 +08:00
parent 665334d756
commit f83a15cfcc
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/MicroExhibition/component/Border.vue
View File

@ -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;

3
src/views/MicroExhibition/component/BottomBorder.vue
View File

@ -36,6 +36,9 @@
</div>
</div>
</div>
<div class="dev-status">
{{t('messages.能耗')}}：{{ i.consumption }}
</div>
<div class="dev-status">
{{t('default.工作时长')}}：{{ i.workTime }}
</div>

6
src/views/MicroExhibition/component/ScrollBoard.vue
View File

@ -26,9 +26,9 @@ function ZdClick(value) {
}
let config = reactive({
header: [
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('default.序号')+'</span>',
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('default.设备名称')+'</span>',
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('default.编号')+'</span>',
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('default.设备名称')+'</span>',
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('messages.能耗')+'</span>',
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('default.状态')+'</span>',
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('default.稼动率')+'</span>',
'<span style="color:#AEEEFAFE;font-size:18px;">'+t('default.工作时长')+'</span>',
@ -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,

6
src/views/MicroExhibition/index.vue
View File

@ -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') {