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/components/recordChartsByWorkstation.vue | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/views/mdc/components/recordChartsByWorkstation.vue b/src/views/mdc/components/recordChartsByWorkstation.vue
index 6aec7e8..f8cdab3 100644
--- a/src/views/mdc/components/recordChartsByWorkstation.vue
+++ b/src/views/mdc/components/recordChartsByWorkstation.vue
@@ -13,14 +13,14 @@
export default {
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 {
@@ -74,9 +74,20 @@
})
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;
- this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-workstation?current=${this.current}&size=${this.size}`,this.setWork).then(res => {
+ if(this.select.length == 0) return;
+ this.$HTTP.post(`/api/mdc/status-record/status-record-by-workstation?current=${this.current}&size=${this.size}`,this.setWork).then(res => {
if (res.code === 200) {
var yAxisData = [];
var newData = [];
@@ -93,6 +104,8 @@
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,12 +122,18 @@
var option = {
tooltip: {
formatter: function (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: {
--
Gitblit v1.9.3