From b70dab217e5ebcab6d98196cc2d4b2ffb842c3a1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期日, 08 十月 2023 17:33:34 +0800
Subject: [PATCH] 1、优化车间看板四色灯状态展示以及限制拖拽区域 2、部分页面右侧区域元素位置离顶过高，调整布局 3、增加设备日志页面增加点击表格行数据展示当前行工作曲线功能 4、优化设备日志页面切换时间，工作曲线弹窗中的时间随之切换 5、优化设备日志页面加载后首次点击工作曲线后无法查询到数据问题（同时发送异步请求，先后顺序影响）
---
src/views/mdc/base/modules/deviceLog/WorkHistoryModel.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/WorkHistoryModel.vue b/src/views/mdc/base/modules/deviceLog/WorkHistoryModel.vue
index 107ff49..44f7cef 100644
--- a/src/views/mdc/base/modules/deviceLog/WorkHistoryModel.vue
+++ b/src/views/mdc/base/modules/deviceLog/WorkHistoryModel.vue
@@ -44,9 +44,9 @@
<span v-if="item.status == 23"
:style='{display: "inline-block",width:item.dateProportion, height: "100%", background: "#19FE01",position:"absolute",bottom:"0"}'></span>
</div>
- <div v-if="item.status == 22" style="z-index: 999;"
+ <div style="z-index: 999;"
:style='{display: "inline-block",left:item.left,width:item.dateProportion, height: "100%",position:"absolute"}'
- v-for="item in waring">
+ v-for="item in info.value.waring">
<span
:style='{display: "inline-block",width:"100%", left:0, height: "68%", background: "#FD0008",position:"absolute",bottom:"0"}'></span>
</div>
@@ -136,21 +136,24 @@
// console.log(tmp)
if (tmp) {
if (tmp.normal) {
- for (let i = 0; i < tmp.normal.length; i++) {
- tmp.normal[i].dateProportion = tmp.normal[i].duration / 86400 * 100 + '%'
+ for (let k = 0; k < tmp.normal.length; k++) {
+ tmp.normal[k].dateProportion = tmp.normal[k].duration / 86400 * 100 + '%'
+ // let leftTmp = (moment(tmp.normal[i].startTime, 'YYYY-MM-DD HH:mm:ss').valueOf() - 57600000) / 1000 % 86400
+ // tmp.normal[i].left = leftTmp / 86400 * 100 + '%'
}
} else {
tmp.normal = []
}
- /*if (tmp.waring) {
- for (let i = 0; i < tmp.waring.length; i++) {
- tmp.waring[i].dateProportion = tmp.waring[i].duration / 86400 * 100 + '%'
- let leftTmp = (moment(tmp.waring[i].startTime, 'YYYY-MM-DD HH:mm:ss').valueOf() - 57600000) / 1000 % 86400
- tmp.waring[i].left = leftTmp / 86400 * 100 + '%'
+ if (tmp.waring) {
+ // console.log("娴嬭瘯鍒ゆ柇")
+ for (let j = 0; j < tmp.waring.length; j++) {
+ tmp.waring[j].dateProportion = tmp.waring[j].duration / 86400 * 100 + '%'
+ let leftTmp = (moment(tmp.waring[j].startTime, 'YYYY-MM-DD HH:mm:ss').valueOf() - 57600000) / 1000 % 86400
+ tmp.waring[j].left = leftTmp / 86400 * 100 + '%'
}
} else {
tmp.waring = []
- }*/
+ }
} else {
res.result[i].value = { normal: [], waring: [] }
}
--
Gitblit v1.9.3