From b1ac0c149564d4873a8b6ef075029fcaa7c83960 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 21 六月 2024 01:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/processParam/index.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 26e72ba..118f469 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -275,8 +275,7 @@
tooltip: {
position: ['50%', '50%']
},
- legend: [
- ],
+ legend: {},
title: {
text: '',
subtext: '',
@@ -288,7 +287,7 @@
{
data: yAxisData,
type: 'line',
-
+ step: 'start',
}
],
xAxis: {
@@ -314,8 +313,8 @@
setDeviceStatusOptions(data, myname) {
let total = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime)))
let start = this.timeRange.startTime
- let len = data.data.length
- if (moment(data.data[len - 1].time).unix() < moment(this.timeRange.endTime).unix()) {
+ let len = data?.data?.length
+ if (len > 0 && moment(data.data[len - 1].time).unix() < moment(this.timeRange.endTime).unix()) {
let addItem = {
time: this.timeRange.endTime,
value: data.data[len - 1].value
@@ -363,7 +362,7 @@
// return current.format('HH:mm')
// return value
if (i == 0 || current === 0) return ''
- return `${name}:寮�濮嬫椂闂�${moment(data.data[i - 1].time).format('HH:mm')}-${moment(item.time).format('HH:mm')}`
+ return `${name}:鏃舵${moment(data.data[i - 1].time).format('HH:mm')}-${moment(item.time).format('HH:mm')}`
}
},
}
@@ -378,6 +377,9 @@
// return current.format('HH:mm')
// }
},
+ legend: {
+ selectedMode: false
+ },
title: {
text: '',
subtext: '',
--
Gitblit v1.9.3