From f29900986f01cf5d39b5755cec674825cef27961 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 19 十一月 2024 19:25:41 +0800
Subject: [PATCH] update
---
src/views/mdc/processParam/index.vue | 135 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 102 insertions(+), 33 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index c71f069..4105da8 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-13 20:20:54
* @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -37,14 +37,20 @@
</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>
+ <el-switch style="margin-left: 8px;" v-model="item.showPie"
+ v-show="item.paramChartType == 'distribute'" active-text="楗煎浘"
+ inactive-text="" />
</div>
- <scEcharts style="width:100%" :height="item.height" :option="item?.dayCharts">
+ <scEcharts v-if="!item.showPie" style="width:100%" :height="item.height"
+ :option="item?.dayCharts">
+ </scEcharts>
+ <scEcharts v-else style="width:100%" height="300px" :option="item?.pieCharts">
</scEcharts>
</div>
<el-empty v-else description="鏆傛棤鏁版嵁" />
@@ -150,7 +156,7 @@
},
save() {
console.log(this.checkedCities)
- this.$HTTP.post(`/api/blade-mdc/process-parameter/excel/export`, {
+ this.$HTTP.post(`/api/mdc/process-parameter/excel/export`, {
collectItem: this.list.filter(v => this.checkedCities.includes(v.id)),
endTime: this.timeRange.endTime,
startTime: this.timeRange.startTime,
@@ -172,7 +178,7 @@
this.visible = true
},
init() {
- this.$HTTP.get('/api/blade-mdc/process-parameter').then(res => {
+ this.$HTTP.get('/api/smis/global_wcs/wcs-achievements').then(res => {
if (res.code === 200) {
this.legend = res.data
}
@@ -181,10 +187,10 @@
viewData(item) {
this.drawerName = item.dpLabel
- this.$HTTP.post('/api/blade-mdc/process-parameter/item?current=1&size=1500', {
+ 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: ''
@@ -211,21 +217,19 @@
},
query() {
if (!this.treeChecked.toString()) return
- console.log(this.treeChecked.toString(), '>>>>>>>>>/')
this.$refs?.timeLine?.init({
dates: this.time,
workstationId: this.treeChecked.toString()
})
this.list = []
- this.$HTTP.get('/api/blade-mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
+ this.$HTTP.get('/api/mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
if (res.code === 200) {
- console.log('jkjkjkjkj', this.list)
this.list = res.data.map(v => {
let name = v.isProcessParam ? 'ProcessProgram' : v.dpName
return {
...v,
name: name,
- height: ['ProcessProgram', 'DeviceStatus'].includes(v.name) ? '100px' : '200px'
+ height: v.paramChartType == 'distribute' ? '300px' : '200px'
}
})
this.queryChart()
@@ -248,7 +252,7 @@
delete params.name
delete params.height
} catch (err) { console.error(err) }
- this.$HTTP.post('/api/blade-mdc/process-parameter/chart/dmp-item', {
+ this.$HTTP.post('/api/mdc/process-parameter/chart/dmp-item', {
methodEnum: "HOUR",
startTime: this.timeRange.startTime,
endTime: this.timeRange.endTime,
@@ -267,9 +271,9 @@
}).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)
}
})
},
@@ -307,38 +311,45 @@
},
}
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: {}
+ dayCharts: {},
+ showPie: false
})
} 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
+ dayCharts,
+ showPie: false
})
}
},
setDeviceStatusOptions(data, myname) {
+ debugger
let total = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime)))
let start = this.timeRange.startTime
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
+ value: myname === 'DeviceStatus' ? data.data[len - 1].name : data.data[len - 1].value,
}
data.data.push(addItem)
}
let series = data.data.map((item, i) => {
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
+ let name = i === 0 ? '' : myname === 'DeviceStatus' ? data.data[i - 1].name : data.data[i - 1].value
+ // if (myname === 'ProcessProgram') {
+ try {
+ name = myname === 'DeviceStatus' ? item.name.slice(-50) : item.value.slice(-50)
+ } catch (err) {
+ name = myname === 'DeviceStatus' ? item.name : item.value
}
+ // }
// let color = !name ? 'transparent' : data.data[i - 1].color
return {
name,
@@ -355,15 +366,13 @@
// return `${name}:寮�濮嬫椂闂�${moment(data.data[i - 1].time).format('HH:mm')}-${moment(item.time).format('HH:mm')}`
// }
// },
- // itemStyle: {
- // // color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
- // borderColor: '#FFF',
- // borderWidth: 1
- // },
+ itemStyle: {
+ color: item.color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
+ },
tooltip: {
show: true,
trigger: 'item',
- position: 'top',
+ // position: 'top',
triggerOn: 'click',
formatter: (value, ticket) => {
// console.log('----------1111')
@@ -373,7 +382,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:ss')}-${moment(item.time).format('HH:mm:ss')}`
}
},
}
@@ -412,12 +421,72 @@
},
},
}
- 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
+ dayCharts,
+ pieCharts: this.getPieCharts(data.data, myname),
+ showPie: false
})
+ // console.log(this.list, '>>>>>>>>>>>>>>>>>>>>>>111')
+ },
+ getPieCharts(data, myname) {
+ let start = this.timeRange.startTime
+ const obj = {
+ }
+ let key = myname === 'DeviceStatus' ? 'name' : 'value'
+ data.forEach(v => {
+ if (obj[v[key]]) {
+ obj[v[key]] += moment(v.time).valueOf() - moment(start).valueOf()
+ } else {
+ obj[v[key]] = moment(v.time).valueOf() - moment(start).valueOf()
+ }
+ start = v.time
+
+ })
+ let result = Object.keys(obj).map(key => {
+ return {
+ value: obj[key] / 1000,
+ name: key,
+ // itemStyle: {
+ // color: item.color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
+ // },
+ }
+ }).map(v => {
+ if (myname === 'DeviceStatus') {
+ return {
+ ...v,
+ itemStyle: {
+ color: this.legend.find(item => item.name === v.name).color
+ }
+ }
+ }
+ return v
+
+ })
+ let charts = {
+ tooltip: {
+ trigger: 'item',
+ formatter: function (params) {
+ let d = moment.duration(params.value, 'seconds')
+ return `${params.name}: ${d.hours()}灏忔椂${d.minutes()}鍒�${d.seconds()}绉抈
+ }
+ },
+ legend: {
+ orient: 'vertical',
+ left: 'left'
+ },
+ series: [
+ {
+ name: '',
+ type: 'pie',
+ radius: '50%',
+ data: result,
+ }
+ ],
+ }
+ return charts
},
change(e) {
this.timeStart = e[0] || moment().format('YYYY-MM-DD')
--
Gitblit v1.9.3