From 18852cbde460274f3b204fd3ce57a6e5e87cc49b Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 10 十月 2024 10:18:09 +0800
Subject: [PATCH] 1
---
src/views/home/widgets/components/mdcRunning.vue | 3 +--
src/utils/tool.js | 2 +-
src/views/mdc/station-live.vue | 6 ++++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/utils/tool.js b/src/utils/tool.js
index f16c025..6ffb140 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -2,7 +2,7 @@
* @Descripttion: 宸ュ叿闆�
* @version: 1.2
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-08 18:04:17
+ * @LastEditTime: 2024-10-10 10:17:47
*/
import CryptoJS from 'crypto-js';
diff --git a/src/views/home/widgets/components/mdcRunning.vue b/src/views/home/widgets/components/mdcRunning.vue
index 563cb25..609e177 100644
--- a/src/views/home/widgets/components/mdcRunning.vue
+++ b/src/views/home/widgets/components/mdcRunning.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-16 15:22:46
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-09-19 10:23:52
+ * @LastEditTime: 2024-10-10 10:08:58
* @FilePath: /CPSnew/smart-web/src/views/home/widgets/components/mdcDeviceStatus.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -234,7 +234,6 @@
if(res.data.categories.length == 0) return;
this.option.yAxis.data = res.data.categories;
this.option.series[0].data = res.data.series[0].data;
- console.log(this.option.series.data,res.data.series[0].data,2)
var myChart = echarts.init(recordDom);
myChart.setOption(this.option);
}
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index b262ed2..967374d 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-10-08 18:03:09
+ * @LastEditTime: 2024-10-10 10:17:22
* @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
-->
@@ -46,7 +46,7 @@
</div>
</div>
<div class="fact-analysis-card" v-for="item in dmpList" v-if="dmpList.length != 0">
- <div class="card-name" :style="{'background-color': item.color}">{{item.dplabel}}</div>
+ <div class="card-name" :style="{'background-color': item.color}">{{item.dpLabel}}</div>
<div :class="{'card-value': true,'card-value-bg1':item.name != 'Alarm','card-value-bg2':item.name == 'Alarm'}">{{item.codeName}}</div>
</div>
</div>
@@ -690,6 +690,8 @@
}else {
if(eventData.data[item.dpName]) {
item.codeName = eventData.data[item.dpName].v;
+ }else {
+ item.codeName = "";
}
}
that.allwcs.forEach((item1)=> {
--
Gitblit v1.9.3