From db06bf2b2956472ecbd745f861a7713bd76f3bec Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 14 五月 2024 20:46:39 +0800
Subject: [PATCH] update
---
src/views/mdc/components/recordChartsByDate.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/components/recordChartsByDate.vue b/src/views/mdc/components/recordChartsByDate.vue
index f78a063..5a9d9a2 100644
--- a/src/views/mdc/components/recordChartsByDate.vue
+++ b/src/views/mdc/components/recordChartsByDate.vue
@@ -14,7 +14,7 @@
import * as echarts from 'echarts';
export default {
components: {saveDialog},
- props: ['collectionstatus','date','workstationInfoList'],
+ props: ['achievements','date','workstationInfoList'],
watch: {
date(val) {
this.current = "1";
@@ -75,8 +75,9 @@
},
getColor(name) {
var color = '';
- this.collectionstatus.forEach(item=> {
- if(item.name == name) {
+ console.log(this.achievements,name);
+ this.achievements.forEach(item=> {
+ if(item.code == name) {
color = item.color;
}
})
@@ -103,7 +104,8 @@
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);
+ console.log(color,222)
item1.value = [index,startTime,endTime,diff];
item1.itemStyle = {"normal": {"color": color}};
item1.code = item.workstationInfo.code;
@@ -114,6 +116,7 @@
})
this.total = res.data.total;
//娓叉煋鍥捐〃
+ console.log(yAxisData,newData,111)
this.setCharts(yAxisData,newData);
// 妫�鏌ユ槸鍚﹀瓨鍦╥d涓�'parentNodeDom'鐨凞OM鍏冪礌,鏈夊氨鍏堝垹闄�
var parentNodeDom = document.getElementById('parentNodeDom');
@@ -128,8 +131,7 @@
var option = {
tooltip: {
formatter: function (params) {
- console.log(params)
- return `<span class="tipdesc">宸ヤ綅</span>${params.data.name}</br>
+ 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>
--
Gitblit v1.9.3