From a2441175073f8b09a7eff29effd7e3e617de2f7d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 06 六月 2024 18:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/components/recordChartsByDate.vue | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/views/mdc/components/recordChartsByDate.vue b/src/views/mdc/components/recordChartsByDate.vue
index 5a9d9a2..420422a 100644
--- a/src/views/mdc/components/recordChartsByDate.vue
+++ b/src/views/mdc/components/recordChartsByDate.vue
@@ -16,14 +16,6 @@
components: {saveDialog},
props: ['achievements','date','workstationInfoList'],
watch: {
- date(val) {
- this.current = "1";
- this.getCharts();
- },
- workstationInfoList(val) {
- this.current = "1";
- this.getCharts();
- }
},
data() {
return {
@@ -75,7 +67,6 @@
},
getColor(name) {
var color = '';
- console.log(this.achievements,name);
this.achievements.forEach(item=> {
if(item.code == name) {
color = item.color;
@@ -83,7 +74,19 @@
})
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() {
+ console.log(this.workstationInfoList.length == 0,this.date == "",this.date,333)
+ if(this.date == "") return;
var obj = {
date: this.date,
humanFeedback: true,
@@ -105,9 +108,10 @@
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.wcs);
- console.log(color,222)
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.workstationInfo.code;
item1.name = item.workstationInfo.name;
item1.id = item.workstationInfo.id;
@@ -116,7 +120,6 @@
})
this.total = res.data.total;
//娓叉煋鍥捐〃
- console.log(yAxisData,newData,111)
this.setCharts(yAxisData,newData);
// 妫�鏌ユ槸鍚﹀瓨鍦╥d涓�'parentNodeDom'鐨凞OM鍏冪礌,鏈夊氨鍏堝垹闄�
var parentNodeDom = document.getElementById('parentNodeDom');
@@ -131,12 +134,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: {
@@ -305,9 +314,10 @@
position: absolute;
cursor: pointer;
}
- #record /deep/ .tipdesc {
+ #record /deep/ .tipstatus {
+ width: 100%;
display: inline-block;
- width: 80px;
+ border-bottom: 1px solid #eee;
}
.pagination {
text-align: right;
--
Gitblit v1.9.3