From 2b4f4cda0a0031f02f7354fc2c68f056e44e1885 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 12 十二月 2024 13:21:58 +0800
Subject: [PATCH] 车间生产管理中的大屏故障显示完善
---
src/views/dry/bigScreen/BigFault.vue | 3 ++-
src/views/dry/bigScreen/BigEqp.vue | 29 ++++++++++++++++++++++++-----
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index 5a7b020..b681b6b 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -1392,9 +1392,7 @@
width: 1,
},
// [[15,10], [15,11], [10,6], [7.5,12], [5,12], [2.5,5], [2.5,9], [1,7]]
- data: [
-
- ],
+ data: [],
markPoint: {
data: [
{ type: 'max', name: 'Max' },
@@ -1735,6 +1733,7 @@
},
series: [
{
+ name: '骞茬嚗鏁堢巼',
data: ganZaoXiaoLv,
markLine: {
symbol: 'none',
@@ -1750,8 +1749,8 @@
},
},
},
- { data: zhengQiXiaoHao },
- { data: dianNengXiaoHao },
+ // { data: zhengQiXiaoHao },
+ // { data: dianNengXiaoHao },
],
})
}
@@ -2578,4 +2577,24 @@
opacity: 0;
}
}
+
+ .error-div {
+ position: absolute; display: flex; align-items: center;
+ }
+ .error-marker {
+ width: 18px; height: 18px; background: red; border-radius: 50%;
+ }
+ .error-msg {
+ margin-left: 6px;
+ height: 24px;
+ background: gray; border-radius: 5px; font-weight: bold; color: red
+ }
+ .warn-marker {
+ width: 18px; height: 18px; background: orange; border-radius: 50%;
+ }
+ .warn-msg {
+ margin-left: 6px;
+ height: 24px;
+ background: gray; border-radius: 5px; font-weight: bold; color: orange;
+ }
</style>
diff --git a/src/views/dry/bigScreen/BigFault.vue b/src/views/dry/bigScreen/BigFault.vue
index 52fe7ba..50df482 100644
--- a/src/views/dry/bigScreen/BigFault.vue
+++ b/src/views/dry/bigScreen/BigFault.vue
@@ -337,7 +337,7 @@
// result.forEach((item) => {
// eqpCodes.push(item.code)
// })
- queryRealTime()
+
})
.catch((err) => {
//console.log(`output->err`, err)
@@ -482,6 +482,7 @@
option2 && chart2.setOption(option2)
option3 && chart3.setOption(option3)
option4 && chart4.setOption(option4)
+ queryRealTime()
}
var shangliaoFlag = false
--
Gitblit v1.9.3