From dcc4992bd51e9ee4a97099cd3a15085f7e247f23 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 03 十一月 2024 20:21:41 +0800
Subject: [PATCH] update
---
src/views/mdc/processParam/index.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index ca5844f..b795e8c 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: gaoshp
- * @LastEditTime: 2024-10-28 19:51:45
+ * @LastEditTime: 2024-11-03 20:10:01
* @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -37,10 +37,10 @@
</el-row>
<TimeLine v-model="timeRange" ref="timeLine"></TimeLine>
<el-collapse v-model="activeList">
- <el-collapse-item :title="item.deLabel" :name="index" v-for="(item, index) in list"
+ <el-collapse-item :title="item.dpLabel" :name="index" v-for="(item, index) in list"
:key="index">
<div
- v-if="(['DeviceStatus', 'ProcessProgram'].includes(item.name) && item?.dayCharts?.series?.length > 1) || (!['DeviceStatus', 'ProcessProgram'].includes(item.name) && item?.dayCharts?.series?.length > 0) && activeList.indexOf(index) > -1">
+ v-if="(item.paramChartType == 'distribute' && item?.dayCharts?.series?.length > 1) || (item.paramChartType !== 'distribute' && item?.dayCharts?.series?.length > 0) && activeList.indexOf(index) > -1">
<div>
<el-button size="small" @click="viewData(item)">鏌ョ湅鏁版嵁</el-button>
</div>
@@ -184,7 +184,7 @@
this.$HTTP.post('/api/mdc/process-parameter/item?current=1&size=1500', {
endTime: this.timeRange.endTime,
startTime: this.timeRange.startTime,
- item: item.name,
+ item: item.dpName,
methodEnum: "HOUR",
workstationId: this.treeChecked.toString(),
workstationName: ''
@@ -267,10 +267,11 @@
}).then(res => {
// if (['DeviceStatus', 'ProcessProgram'].includes(item.name)) {
if (item.paramChartType === 'distribute') {
- this.setDeviceStatusOptions(res.data, item.name)
+ this.setDeviceStatusOptions(res.data, item.dpName)
} else {
- this.setLineOptions(res.data.data, item.name)
+ this.setLineOptions(res.data.data, item.dpName)
}
+ console.log(this.list, '>>>>>>>>>>//////1')
})
},
setLineOptions(data, myname) {
@@ -307,13 +308,13 @@
},
}
if (yAxisData?.length == 0) {
- let index = this.list.findIndex(item => item.name === myname)
+ let index = this.list.findIndex(item => item.dpName === myname)
this.list[index] = Object.assign({
...this.list[index],
dayCharts: {}
})
} else {
- let index = this.list.findIndex(item => item.name === myname)
+ let index = this.list.findIndex(item => item.dpName === myname)
this.list[index] = Object.assign({
...this.list[index],
dayCharts
@@ -336,9 +337,9 @@
let current = Math.abs(moment(start).diff(moment(item.time)))
start = item.time
let name = i === 0 ? '' : data.data[i - 1].name
- if (myname === 'ProcessProgram') {
- name = item.value
- }
+ // if (myname === 'ProcessProgram') {
+ name = item.value
+ // }
// let color = !name ? 'transparent' : data.data[i - 1].color
return {
name,
@@ -363,7 +364,7 @@
tooltip: {
show: true,
trigger: 'item',
- position: 'top',
+ // position: 'top',
triggerOn: 'click',
formatter: (value, ticket) => {
// console.log('----------1111')
@@ -413,7 +414,7 @@
},
}
console.log(dayCharts, '>>>>>>>???')
- let index = this.list.findIndex(item => item.name === myname)
+ let index = this.list.findIndex(item => item.dpName === myname)
this.list[index] = Object.assign({
...this.list[index],
dayCharts
--
Gitblit v1.9.3