From dea3bb3e1f644f5792446dca82044c8b698046fc Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 17 六月 2024 14:21:10 +0800
Subject: [PATCH] 1
---
src/views/mdc/station-live.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 65a95a1..dc233a0 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-15 16:25:52
+ * @LastEditTime: 2024-06-17 14:20:06
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -38,9 +38,9 @@
<div class="collect-info-panel">
<div class="fact-analysis-realtim">
<div class="wimi-empty" style="background-color: rgb(255, 255, 255);" v-if="dmpList.length == 0">
- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
+ <!-- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
<img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
- </div>
+ </div> -->
<div class="empty-description">
<div>鏆傛棤鏁版嵁</div>
</div>
@@ -505,7 +505,6 @@
interval: 1440/6, //姣忛殧澶氬皯鍒嗛挓鏄剧ず涓�涓埢搴�
axisLabel: {
formatter: (value)=> {
- //console.log(value,111)
if(value == 0) {
return "00:00:00";
}else if(value == 240) {
@@ -645,7 +644,6 @@
}
},
getdmp(lastLevelId,machineId) {
- console.log(lastLevelId,machineId)
this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
if(res.code == 200) {
this.dmpList = [];
@@ -677,13 +675,17 @@
})
}else {
if(item.name == 'Alarm') { //鎶ヨ
- var v = JSON.parse(eventData.data[item.name].v);
- item.description = v.code;
- item.codeName = v.msg;
- item.color = "#370C0D";
+ if(eventData.data[item.name]) {
+ var v = JSON.parse(eventData.data[item.name].v);
+ item.description = v.code;
+ item.codeName = v.msg;
+ item.color = "#370C0D";
+ }
}else {
- item.codeName = eventData.data[item.name].v;
- item.color = "#75C0C0";
+ if(eventData.data[item.name]) {
+ item.codeName = eventData.data[item.name].v;
+ item.color = "#75C0C0";
+ }
}
}
});
--
Gitblit v1.9.3