From fd7586c8d91473d2850af1e48b12f1a289e6b8d1 Mon Sep 17 00:00:00 2001 From: gaoshp <291585735@qq.com> Date: 星期四, 13 六月 2024 00:10:43 +0800 Subject: [PATCH] 新增文件 --- src/views/mdc/components/recordChartsByWorkstation.vue | 63 ++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/views/mdc/components/recordChartsByWorkstation.vue b/src/views/mdc/components/recordChartsByWorkstation.vue index 12753cc..2413dfa 100644 --- a/src/views/mdc/components/recordChartsByWorkstation.vue +++ b/src/views/mdc/components/recordChartsByWorkstation.vue @@ -1,6 +1,6 @@ <template> <div id="recordworkParse"> - <div id="recordwork" style="height:500px;"></div> + <div id="recordwork" style="height:400px;"></div> <div class="paginationwork"> <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/> </div> @@ -11,16 +11,16 @@ import moment from 'moment'; import * as echarts from 'echarts'; export default { - props: ['setWork','collectionstatus',"select"], + props: ['setWork','achievements',"select"], watch: { - setWork(val) { - this.current = "1"; - this.getCharts(); - }, - select(val) { - this.current = "1"; - this.getCharts(); - } + // setWork(val) { + // this.current = "1"; + // this.getCharts(); + // }, + // select(val) { + // this.current = "1"; + // this.getCharts(); + // } }, data() { return { @@ -67,15 +67,26 @@ }, getColor(name) { var color = ''; - this.collectionstatus.forEach(item=> { - if(item.name == name) { + this.achievements.forEach(item=> { + if(item.code == name) { color = item.color; } }) return color; }, + getStatus(name) { + var stauts = {}; + this.achievements.forEach(item=> { + if(item.code == name) { + stauts.name= item.name; + stauts.type= item.type; + } + }) + return stauts; + }, getCharts() { if(!this.setWork) return; + if(this.select.length == 0) return; this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-workstation?current=${this.current}&size=${this.size}`,this.setWork).then(res => { if (res.code === 200) { var yAxisData = []; @@ -90,9 +101,11 @@ var startTime = moment(item1.startTime).diff(moment(initstart + " 00:00:00"), 'minutes'); var endTime = moment(item1.endTime).diff(moment(initstart + " 00:00:00"), 'minutes'); var diff = moment(item1.endTime).diff(moment(item1.startTime), 'minutes') //寮�濮嬩簡澶氫箙 - var color = this.getColor(item1.wcsDesc); + var color = this.getColor(item1.wcs); item1.value = [index,startTime,endTime,diff]; item1.itemStyle = {"normal": {"color": color}}; + item1.statusName = this.getStatus(item1.wcs).name; + item1.statusType = this.getStatus(item1.wcs).type; item1.code = item.date; item1.name = item.date; item1.id = item.date; @@ -109,19 +122,24 @@ var option = { tooltip: { formatter: function (params) { - console.log(params) - return `<span class="tipdesc">宸ヤ綅</span>${params.data.name}</br> - <span class="tipdesc">鐘舵��</span>${params.data.wcsDesc}</br> - <span class="tipdesc">鎻忚堪</span>${params.data.feedbackDesc}</br> - <span class="tipdesc">鐘舵�佹椂闂�</span>${params.data.startTime} 锝� ${params.data.endTime}</br> - <span class="tipdesc">鍙嶉鏃堕棿</span>${params.data.feedbackTime}</br> - <span class="tipdesc">鍙嶉浜�</span>${params.data.feedUser}</br>`; + if(params.data.statusType == 4) { + var dom = `<span class="tipdesc">宸ヤ綅:</span>${params.data.name}</br> + <span class="tipdesc">鐘舵��:</span>${params.data.wcsDesc}</br> + <span class="tipdesc">鎻忚堪:</span>${params.data.feedbackDesc}</br> + <span class="tipdesc">鐘舵�佹椂闂�:</span>${params.data.startTime} 锝� ${params.data.endTime}</br> + <span class="tipdesc">鍙嶉鏃堕棿:</span>${params.data.feedbackTime}</br> + <span class="tipdesc">鍙嶉浜�:</span>${params.data.feedUser}</br>` + }else { + var dom = `<span class="tipstatus">${params.data.statusName}</span></br> + <span class="tipdesc">鏃舵:</span><span>${params.data.startTime.split(" ")[1]} 锝� ${params.data.endTime.split(" ")[1]}</span></br>` + } + return dom; } }, grid: { top: 10, left: 100, - bottom: 130, + bottom: 30, right: 30 }, xAxis: { @@ -203,8 +221,7 @@ text-align: right; display: flex; justify-content: end; - margin-top: -60px; + margin-top: 20px; position: relative; - z-index: 99; } </style> \ No newline at end of file -- Gitblit v1.9.3