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 | 92 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 35 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 764c3b7..118f469 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -198,14 +198,20 @@
}).then(res => {
if (res.code === 200) {
if (item.name !== 'DeviceStatus') {
- this.tableData = res.data.records
+ this.tableData = res.data.records.map(v => {
+ return {
+ ...v,
+ }
+ })
+ } else {
+ this.tableData = res.data.records.map(item => {
+ return {
+ ...item,
+ value: this.legend.find(v => v.code === item.value)?.name
+ }
+ })
}
- this.tableData = res.data.records.map(item => {
- return {
- ...item,
- value: this.legend.find(v => v.code === item.value)?.name
- }
- })
+
this.drawer = true
}
})
@@ -258,7 +264,7 @@
},
setLineOptions(data, myname) {
if (!data) return
- console.log(data, myname)
+ // console.log(data, myname)
let xAxis = data?.map(item => {
return item.time
})
@@ -269,8 +275,7 @@
tooltip: {
position: ['50%', '50%']
},
- legend: [
- ],
+ legend: {},
title: {
text: '',
subtext: '',
@@ -282,7 +287,7 @@
{
data: yAxisData,
type: 'line',
-
+ step: 'start',
}
],
xAxis: {
@@ -297,7 +302,6 @@
dayCharts: {}
})
} else {
- console.log(myname, '>>>>>>???????????>>>>>>', yAxisData)
let index = this.list.findIndex(item => item.name === myname)
this.list[index] = Object.assign({
...this.list[index],
@@ -309,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
@@ -331,34 +335,51 @@
stack: 'total',
barWidth: '20px',
data: [current / total],
- label: {
+ // label: {
+ // show: true,
+ // position: 'insideLeft',
+ // color: '#FFF',
+ // formatter: params => {
+ // if (i == 0 || current === 0) return ''
+ // return `${name}:寮�濮嬫椂闂�${moment(data.data[i - 1].time).format('HH:mm')}-${moment(item.time).format('HH:mm')}`
+ // }
+ // },
+ // itemStyle: {
+ // // color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
+ // borderColor: '#FFF',
+ // borderWidth: 1
+ // },
+ tooltip: {
show: true,
- position: 'insideLeft',
- color: '#FFF',
- formatter: params => {
+ trigger: 'item',
+ position: 'top',
+ triggerOn: 'click',
+ formatter: (value, ticket) => {
+ // console.log('----------1111')
+ // let add = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) * value
+ // let current = moment(this.timeRange.startTime).add(add, 'ms')
+ // console.log('--11111111------------', current)
+ // 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')}`
}
- },
- itemStyle: {
- // color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
- borderColor: '#FFF',
- borderWidth: 1
},
}
})
let dayCharts = {
- // tooltip: {
- // position: ['50%', '50%'],
- // formatter: (value, ticket) => {
- // console.log('>>>>>>>>>>>>____________', value, ticket)
- // let add = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) * value
- // let current = moment(this.timeRange.startTime).add(add, 'ms')
- // return current.format('HH:mm')
- // }
- // },
- legend: [
- ],
+ tooltip: {
+ position: ['50%', '50%'],
+ // formatter: (value, ticket) => {
+ // // console.log('>>>>>>>>>>>>____________', value, ticket)
+ // let add = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) * value
+ // let current = moment(this.timeRange.startTime).add(add, 'ms')
+ // return current.format('HH:mm')
+ // }
+ },
+ legend: {
+ selectedMode: false
+ },
title: {
text: '',
subtext: '',
@@ -380,6 +401,7 @@
},
},
}
+ console.log(dayCharts, '>>>>>>>???')
let index = this.list.findIndex(item => item.name === myname)
this.list[index] = Object.assign({
...this.list[index],
--
Gitblit v1.9.3