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 | 610 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 400 insertions(+), 210 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 344ed62..4105da8 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,8 +1,8 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-24 23:41:35
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/processParam/index.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-11-13 20:20:54
+ * @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
<template>
@@ -12,7 +12,7 @@
<el-aside width="300px" style="height: 100%;">
<el-container>
<el-main class="nopadding">
- <el-row style="margin-top: 14px;">
+ <el-row style="margin: 8px;font-size: 14px;">
宸ヤ綅
</el-row>
<MYTree v-model="treeChecked" @loaded="query"></MYTree>
@@ -23,41 +23,69 @@
<el-main v-show="list.length > 0">
<el-row>
<el-col :span="4">
- <el-switch v-model="isShowTable" class="mb-2" active-text="鏁版嵁琛�" inactive-text="缁熻鍥�" />
+ <!-- <el-switch v-model="isShowTable" class="mb-2" active-text="鏁版嵁琛�" inactive-text="缁熻鍥�" /> -->
</el-col>
- <el-col :span="20" style='text-align: right;'>
- <el-date-picker :max-range="3" :clearable="false" value-format="YYYY-MM-DD"
+ <el-col :span="18" style='text-align: right;'>
+ <el-date-picker :max-range="3" :clearable="true" value-format="YYYY-MM-DD"
style="width: 250px" v-model="time" type="daterange" range-separator="-"
start-placeholder="" end-placeholder="" :disabled-date="disabledDate"
@calendar-change="change" />
</el-col>
+ <!-- <el-col :span="2" style='text-align: right;'>
+ <el-button type="primary" @click="exportExcel">瀵煎嚭</el-button>
+ </el-col> -->
</el-row>
<TimeLine v-model="timeRange" ref="timeLine"></TimeLine>
- <el-collapse v-model="activeList" accordion>
- <el-collapse-item :title="item.description" :name="index" v-for="(item, index) in list"
+ <el-collapse v-model="activeList">
+ <el-collapse-item :title="item.dpLabel" :name="index" v-for="(item, index) in list"
:key="index">
- <div>
- <el-button>鏌ョ湅鏁版嵁</el-button>
+ <div
+ 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 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>
- <scEcharts style="width:100%" height="300px" :option="dayCharts">
- </scEcharts>
- <!-- <scTable v-show="isShowTable" ref="table0" row-key="id" border :apiObj="item.apiObj"
- stripe>
- <el-table-column prop="alarmCode" label="鎶ヨ浠ｇ爜" />
- <el-table-column prop="alarmMsg" label="鎶ヨ淇℃伅" />
- <el-table-column prop="count" label="鎶ヨ娆℃暟" />
- </scTable> -->
+ <el-empty v-else description="鏆傛棤鏁版嵁" />
</el-collapse-item>
</el-collapse>
</el-main>
<el-main v-show="list.length == 0">
- <!-- <el-empty description="鏆傛棤鏁版嵁" /> -->
- <scEcharts style="width:100%" height="300px" :option="dayCharts">
- </scEcharts>
+ <el-empty description="鏆傛棤鏁版嵁" />
</el-main>
</el-container>
</el-container>
</el-card>
+ <el-drawer v-model="drawer" direction="rtl">
+ <template #default>
+ <div>
+ <el-table :data="tableData" v-if="drawer" border stripe>
+ <el-table-column prop="time" label="鏃堕棿" />
+ <el-table-column prop="value" :label="drawerName" />
+ </el-table>
+ </div>
+ </template>
+ </el-drawer>
+ <scDialog v-model="visible">
+ <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange">
+ 鍏ㄩ��
+ </el-checkbox>
+ <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+ <el-checkbox v-for="city in list" :key="city.id" :label="city.id" :value="city.id">
+ {{ city.description }}
+ </el-checkbox>
+ </el-checkbox-group>
+ <template #footer>
+ <el-button type="primary" @click="save">纭畾</el-button>
+ </template>
+ </scDialog>
</el-main>
</template>
@@ -66,94 +94,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,
@@ -164,143 +105,392 @@
treeChecked() {
this.query()
},
- time() {
+ time(val) {
+ if (!val?.[0]) return
this.query()
},
timeRange(val) {
- console.log(val, '>>>>>>>???/')
+ this.queryChart()
}
},
data() {
return {
+ legend: [],
+ drawer: false,
+ drawerName: '',
+ tableData: [],
+ tableCol: [
+ ],
isShowTable: false,
list: [],
- activeList: [0],
+ activeList: [0, 1, 2, 3, 4, 5, 6, 7, 8],
timeRange: '',
treeChecked: [],
- timeStart: moment().format('YYYY-MM-DD'),
+ timeStart: '',
time: [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')],
disabledDate: Date => {
+ if (!this.timeStart) return false
let max = moment(this.timeStart, 'YYYY-MM-DD').add(3, 'd').format('YYYY-MM-DD')
let min = moment(this.timeStart, 'YYYY-MM-DD').subtract(3, 'd').format('YYYY-MM-DD')
return !moment(Date).isBetween(min, max);
},
- dayCharts: {
- legend: [
- ],
+ visible: false,
+ checkAll: false,
+ isIndeterminate: false,
+ checkedCities: []
+ }
+ },
+ created() {
+ // console.log(series)
+ this.init()
+ },
+ methods: {
+ handleCheckAllChange(val) {
+ this.checkedCities = val ? this.list.map(v => v.id) : []
+ this.isIndeterminate = false
+ },
+ handleCheckedCitiesChange(value) {
+ console.log(value)
+ this.checkAll = value.length === this.list.length
+ this.isIndeterminate = value.length > 0 && value.length < this.list.length
+ },
+ save() {
+ console.log(this.checkedCities)
+ 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,
+ methodEnum: 'HOUR',
+ workstationId: this.treeChecked.toString(),
+ workstationName: ''
+ }).then(res => {
+ if (res.success) {
+ window.open(res.data.link)
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
+ exportExcel() {
+ this.checkAll = false
+ this.isIndeterminate = false
+ this.checkedCities = []
+ this.visible = true
+ },
+ init() {
+ this.$HTTP.get('/api/smis/global_wcs/wcs-achievements').then(res => {
+ if (res.code === 200) {
+ this.legend = res.data
+ }
+ })
+ },
+ viewData(item) {
+ this.drawerName = item.dpLabel
+
+ this.$HTTP.post('/api/mdc/process-parameter/item?current=1&size=1500', {
+ endTime: this.timeRange.endTime,
+ startTime: this.timeRange.startTime,
+ item: item.dpName,
+ methodEnum: "HOUR",
+ workstationId: this.treeChecked.toString(),
+ workstationName: ''
+ }).then(res => {
+ if (res.code === 200) {
+ if (item.name !== 'DeviceStatus') {
+ 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.drawer = true
+ }
+ })
+ },
+ query() {
+ if (!this.treeChecked.toString()) return
+ this.$refs?.timeLine?.init({
+ dates: this.time,
+ workstationId: this.treeChecked.toString()
+ })
+ this.list = []
+ this.$HTTP.get('/api/mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
+ if (res.code === 200) {
+ this.list = res.data.map(v => {
+ let name = v.isProcessParam ? 'ProcessProgram' : v.dpName
+ return {
+ ...v,
+ name: name,
+ height: v.paramChartType == 'distribute' ? '300px' : '200px'
+ }
+ })
+ this.queryChart()
+ }
+ })
+ },
+ queryChart() {
+ this.list.forEach(item => {
+ this.queryChart1(item)
+ })
+ },
+ queryChart1(item) {
+ let index = this.list.findIndex(item => item.dpName === 'DeviceStatus')
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts: {}
+ })
+ let params = { ...item }
+ try {
+ delete params.name
+ delete params.height
+ } catch (err) { console.error(err) }
+ this.$HTTP.post('/api/mdc/process-parameter/chart/dmp-item', {
+ methodEnum: "HOUR",
+ startTime: this.timeRange.startTime,
+ endTime: this.timeRange.endTime,
+ workstationId: this.treeChecked.toString(),
+ workstationName: '',
+ dpDTO: {
+ id: this.treeChecked.toString(),
+ // name: item.name,
+ ...params
+ // dmpDeviced: item.dmpDeviceId,
+ // description: item.description,
+ // dataType: item.dataType,
+ // wcsDataType: item.wcsDataType,
+ // processParameter: item.processParameter
+ }
+ }).then(res => {
+ // if (['DeviceStatus', 'ProcessProgram'].includes(item.name)) {
+ if (item.paramChartType === 'distribute') {
+ this.setDeviceStatusOptions(res.data, item.dpName)
+ } else {
+ this.setLineOptions(res.data.data, item.dpName)
+ }
+ })
+ },
+ setLineOptions(data, myname) {
+ if (!data) return
+ // console.log(data, myname)
+ let xAxis = data?.map(item => {
+ return item.time
+ })
+ let yAxisData = data?.map(item => {
+ return item.value
+ })
+ let dayCharts = {
+ tooltip: {
+ position: ['50%', '50%']
+ },
+ legend: {},
title: {
- text: '璁惧鐘舵�佺粺璁″浘',
+ text: '',
+ subtext: '',
+ },
+ yAxis: {
+ type: 'value',
+ },
+ series: [
+ {
+ data: yAxisData,
+ type: 'line',
+ step: 'start',
+ }
+ ],
+ xAxis: {
+ type: 'category',
+ data: xAxis
+ },
+ }
+ if (yAxisData?.length == 0) {
+ let index = this.list.findIndex(item => item.dpName === myname)
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts: {},
+ showPie: false
+ })
+ } else {
+ let index = this.list.findIndex(item => item.dpName === myname)
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ 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: 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 ? '' : 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,
+ type: 'bar',
+ stack: 'total',
+ barWidth: '20px',
+ data: [current / total],
+ // 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: item.color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
+ },
+ tooltip: {
+ show: true,
+ 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:ss')}-${moment(item.time).format('HH:mm:ss')}`
+ }
+ },
+ }
+ })
+ 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: {
+ selectedMode: false
+ },
+ title: {
+ text: '',
subtext: '',
},
yAxis: {
type: 'category',
data: ['']
},
+ series,
xAxis: {
type: 'value',
+ interval: 0.05,
+ axisLabel: {
+ formatter: (value, index) => {
+ 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')
+ }
+ },
},
- series
}
- }
- },
- created() {
- console.log('---------')
- console.log(series)
- },
- methods: {
- init() {
- this.$HTTP.get('/api/blade-mdc/process-parameter').then(res => {
- if (res.code === 200) {
- this.legend = res.data
- }
+ let index = this.list.findIndex(item => item.dpName === myname)
+
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts,
+ pieCharts: this.getPieCharts(data.data, myname),
+ showPie: false
})
+ // console.log(this.list, '>>>>>>>>>>>>>>>>>>>>>>111')
},
- query() {
- this.$refs?.timeLine?.init({
- dates: this.time,
- workstationId: this.treeChecked.toString()
- })
- this.$HTTP.get('/api/blade-mdc/process-parameter/param', { workstationId: this.treeChecked.toString() }).then(res => {
- if (res.code === 200) {
- this.list = res.data
- // this.queryChart(res.data[0])
+ 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
+
})
- },
- queryChart(dmpDTO) {
- // 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(),
- // dmpDTO
- // })
- 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:30:00",
- "name": "杩愯",
- "color": "#73D13D",
- "value": "2"
- },
- {
- "time": "2024-04-24 11:40:00",
- "name": "寰呮満",
- "color": "#FFC53D",
- "value": "3"
- },
- {
- "time": "2024-04-24 12:00:00",
- "name": "寰呮満",
- "color": "#FFC53D",
- "value": "3"
- },
- {
- "time": "2024-04-24 12:00:00",
- "name": "杩愯",
- "color": "#73D13D",
- "value": "2"
+ 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,
+ }
+ ],
}
- // {
- // name: '杩愯',
- // type: 'bar',
- // stack: 'duration',
- // itemStyle: {
- // color: '#007acc',
- // borderColor: '#fff',
- // borderWidth: 1
- // },
- // zlevel: -1,
- // data: ['2024-04-24 10:00:00'] // 缁撴潫鏃堕棿
- // }
- // this.dayCharts.series = [...data.data.map(item => ({
- // name: item.name,
- // stack: 'duration',
- // itemStyle: {
- // color: item.color,
- // },
- // zlevel: -1,
- // data: [item.time]
- // }))]
+ return charts
},
change(e) {
this.timeStart = e[0] || moment().format('YYYY-MM-DD')
+ if (e[1]) this.timeStart = ''
}
},
}
--
Gitblit v1.9.3