From 7300ecceffdb676a826dfaa61b34c2d99d79f2d9 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 25 四月 2024 23:05:34 +0800
Subject: [PATCH] 甘特图
---
src/views/mdc/processParam/index.vue | 261 +++++++++++++++++-----------------------------------
1 files changed, 85 insertions(+), 176 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 4f3d450..4b37439 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: Sneed
- * @LastEditTime: 2024-04-25 21:53:21
+ * @LastEditTime: 2024-04-25 23:03:53
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -33,15 +33,17 @@
</el-col>
</el-row>
<TimeLine v-model="timeRange" ref="timeLine"></TimeLine>
- <el-collapse v-model="activeList" accordion>
+ <el-collapse v-model="activeList">
<el-collapse-item :title="item.description" :name="index" v-for="(item, index) in list"
:key="index">
<div>
- <el-button>鏌ョ湅鏁版嵁</el-button>
+ <el-button size="small">鏌ョ湅鏁版嵁</el-button>
</div>
- <scEcharts v-if="item?.dayCharts?.xAxis" style="width:100%" height="300px"
- :option="item?.dayCharts">
+ <scEcharts v-if="item?.dayCharts?.series?.length > 1 && activeList.indexOf(index) > -1"
+ style="width:100%" height="300px" :option="item?.dayCharts">
+
</scEcharts>
+ <el-empty v-else description="鏆傛棤鏁版嵁" />
</el-collapse-item>
</el-collapse>
</el-main>
@@ -59,94 +61,7 @@
import scEcharts from '@/components/scEcharts';
import TimeLine from './TimeLine.vue'
import MYTree from '../MYTree.vue'
-// const rawData = [
-// [100],
-// [320],
-// [220],
-// [150],
-// [820]
-// ]
-// const totalData = [];
-// for (let i = 0; i < rawData[0].length; ++i) {
-// let sum = 0;
-// for (let j = 0; j < rawData.length; ++j) {
-// sum += rawData[j][i];
-// }
-// totalData.push(sum);
-// }
-// const series = [
-// '杩愯',
-// '杩愯',
-// '杩愯',
-// '寰呮満',
-// '杩愯'
-// ].map((name, sid) => {
-// return {
-// name,
-// type: 'bar',
-// stack: 'total',
-// barWidth: '20px',
-// label: {
-// show: true,
-// formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
-// },
-// data: rawData[sid].map((d, did) =>
-// totalData[did] <= 0 ? 0 : d / totalData[did]
-// )
-// };
-// });
-// let data = {
-// "collectItem": "璁惧鐘舵��",
-// "collectRealItem": "DeviceStatus",
-// "data": [
-// {
-// "time": "2024-04-24 10:00:00",
-// "name": "杩愯",
-// "color": "#73D13D",
-// "value": "2"
-// },
-// {
-// "time": "2024-04-24 10:30:00",
-// "name": "杩愯",
-// "color": "#73D13D",
-// "value": "2"
-// },
-// {
-// "time": "2024-04-24 11:00:00",
-// "name": "杩愯",
-// "color": "#73D13D",
-// "value": "2"
-// },
-// {
-// "time": "2024-04-24 11:30:00",
-// "name": "寰呮満",
-// "color": "#FFC53D",
-// "value": "3"
-// },
-// {
-// "time": "2024-04-24 12:00:00",
-// "name": "寰呮満",
-// "color": "#FFC53D",
-// "value": "3"
-// }
-// ]
-// }
-// const series = data.data.map(item => ({
-// name: item.name,
-// label: {
-// show: true,
-// },
-// barWidth: '20px',
-// type: 'bar',
-// stack: 'duration',
-// itemStyle: {
-// color: item.color,
-// borderColor: item.color,
-// },
-// zlevel: -1,
-// data: [item.time]
-// }))
-// console.log('>>>>>>>>????', series)
+
export default {
components: {
TimeLine,
@@ -161,7 +76,6 @@
this.query()
},
timeRange(val) {
- console.log(val, '>>>>>>>???/')
this.queryChart()
}
},
@@ -192,7 +106,6 @@
}
},
created() {
- console.log('---------')
// console.log(series)
},
methods: {
@@ -216,99 +129,95 @@
})
},
queryChart() {
- this.queryChart1()
+ this.list.forEach(item => {
+ this.queryChart1(item)
+ })
},
- queryChart1() {
- this.dayCharts = {}
+ queryChart1(item) {
+ let index = this.list.findIndex(item => item.name === 'DeviceStatus')
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts: {}
+ })
this.$HTTP.post('/api/blade-mdc/process-parameter/chart/dmp-item', {
methodEnum: "HOUR",
startTime: this.timeRange.startTime,
endTime: this.timeRange.endTime,
workstationId: this.treeChecked.toString(),
- workstationName: '461',
+ workstationName: '',
dmpDTO: {
- "collectItem": "璁惧鐘舵��",
- "collectRealItem": "DeviceStatus",
- "legend": null,
- "chartType": "line",
- "id": "1699225758611169281",
- "dmpDeviceId": "591",
- "name": "DeviceStatus",
- "description": "璁惧鐘舵��",
- "dataType": 3,
- "wcsDataType": 1,
- "processParameter": true,
- "data": [],
- "timeRange": [
- "2024-04-25 00:00:00",
- "2024-04-25 02:00:00"
- ]
+ id: this.treeChecked.toString(),
+ dmpDeviced: item.dmpDeviceId,
+ name: item.name,
+ description: item.description,
+ dataType: item.dataType,
+ wcsDataType: item.wcsDataType,
+ processParameter: item.processParameter
}
}).then(res => {
- let data = res.data
- let total = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime)))
- let start = this.timeRange.startTime
- let series = data.data.map((item, i) => {
- let current = Math.abs(moment(start).diff(moment(item.time)))
- console.log(current, total)
- start = item.time
- let name = i === 0 ? '' : data.data[i - 1].name
- let color = !name ? 'transparent' : data.data[i - 1].color
- return {
- name,
- type: 'bar',
- stack: 'total',
- barWidth: '20px',
- data: [current / total * 60],
- label: {
- show: true,
- position: 'center',
- color: '#FFF',
- formatter: params => {
- if (i == 0) return ''
- return `寮�濮嬫椂闂�${moment(data.data[i - 1].time).format('HH:mm')}-${moment(item.time).format('HH:mm')}`
- }
- },
- itemStyle: {
- color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
- borderColor: '#FFF',
- borderWidth: 1
- },
- }
- })
- let arr = [12, 8, 9, 4]
- let splitNumber = arr[Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) / 3600000 - 1]
- let dayCharts = {
- legend: [
- ],
- title: {
- text: '璁惧鐘舵�佺粺璁″浘',
- subtext: '',
+ if (['DeviceStatus', 'ProcessProgram'].includes(item.name)) {
+ this.setDeviceStatusOptions(res.data, item.name)
+ }
+ })
+ },
+ setDeviceStatusOptions(data, name) {
+ let total = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime)))
+ let start = this.timeRange.startTime
+ 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
+ let color = !name ? 'transparent' : data.data[i - 1].color
+ return {
+ name,
+ type: 'bar',
+ stack: 'total',
+ barWidth: '20px',
+ data: [current / total * 60],
+ 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')}`
+ }
},
- yAxis: {
- type: 'category',
- data: ['']
- },
- series,
- xAxis: {
- type: 'value',
- splitNumber,
- axisLabel: {
- formatter: (value, index) => {
- let start = moment(this.timeRange.startTime)
- let ms = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) / splitNumber * index
- // console.log(ms, index, '>>>>>>>>>鍒诲害', Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))))
- return ''
- }
- },
+ itemStyle: {
+ color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
+ borderColor: '#FFF',
+ borderWidth: 1
},
}
- let index = this.list.findIndex(item => item.name === 'DeviceStatus')
- this.list[index] = Object.assign({
- ...this.list[index],
- dayCharts
- })
- console.log('>>>>>>>>>>>>>>.......', series)
+ })
+ let arr = [12, 8, 9, 4]
+ let splitNumber = arr[Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) / 3600000 - 1]
+ let dayCharts = {
+ legend: [
+ ],
+ title: {
+ text: '璁惧鐘舵�佺粺璁″浘',
+ subtext: '',
+ },
+ yAxis: {
+ type: 'category',
+ data: ['']
+ },
+ series,
+ xAxis: {
+ type: 'value',
+ splitNumber,
+ axisLabel: {
+ formatter: (value, index) => {
+ console.log('>>>>>>>', value, index)
+ }
+ },
+ },
+ }
+ let index = this.list.findIndex(item => item.name === name)
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts
})
},
change(e) {
--
Gitblit v1.9.3