From 2786e49d866b0908422cf42cc681b8de451c60aa Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 17 五月 2024 18:30:31 +0800
Subject: [PATCH] 1
---
src/views/mdc/station-live.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 70027b6..5256404 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -151,7 +151,7 @@
tooltip: {
trigger: 'item',
//formatter: '{a} <br/>{b} : {c} ({d}%)'
- formatter: '{a} 0鍒嗛挓'
+ formatter: '{a} {c}鍒嗛挓'
},
legend: {
orient: 'vertical',
@@ -410,8 +410,8 @@
},
getlogcart() { //鐝鐘舵�佽褰昪hart
var obj = {
- //date: this.wcsDate,
- date : "2024-05-15",
+ date: this.wcsDate,
+ //date : "2024-05-15",
humanFeedback: true,
workstationId: this.lastLevelId
}
@@ -420,6 +420,16 @@
var yAxisData = [];
var newData = [];
this.records = res.data.reverse();
+ res.data.forEach(item=> {
+ if(item.statusRecordList == null) item.statusRecordList = [];
+ var filterRecordList = [];
+ item.statusRecordList.forEach(item1=> {
+ if(item1.endTime.startsWith(this.wcsDate)) { //鍙繑鍥炲綋鍓嶇粨鏉熸棩鏈熺殑
+ filterRecordList.push(item1)
+ }
+ })
+ item.statusRecordList = filterRecordList;
+ })
res.data.forEach((item,index)=> {
yAxisData.push(item.shiftIndex);
//璁＄畻寮�濮嬫椂闂达紝鏄剧ず鏃堕棿
@@ -442,7 +452,7 @@
var nowTime = moment().format("HH:mm:ss"); //11:37:54
var spaceTime = moment(obj.date + " " + nowTime).diff(moment(obj.date + " 00:00:00"), 'hours'); //绂诲綋澶�00:00:00杩囦簡澶氬皯灏忔椂
- console.log(spaceTime,obj.date + " " + nowTime,234)
+ //console.log(spaceTime,obj.date + " " + nowTime,234)
return;
//璁＄畻鏃堕棿
var startOfDay = moment().startOf('day'); //00:00:00
@@ -495,7 +505,7 @@
interval: 1440/6, //姣忛殧澶氬皯鍒嗛挓鏄剧ず涓�涓埢搴�
axisLabel: {
formatter: (value)=> {
- console.log(value,111)
+ //console.log(value,111)
if(value == 0) {
return "00:00:00";
}else if(value == 240) {
@@ -560,7 +570,7 @@
var wcsOption = JSON.parse(JSON.stringify(this.wcsBeginOption));
if(res.data.length == 0) {
wcsOption.forEach(item=> {
- item.value = 20;
+ item.value = 0;
})
}else {
wcsOption.forEach(item=> {
@@ -638,7 +648,7 @@
this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
if(res.code == 200) {
this.dmpList = res.data;
- console.log(this.dmpList,111)
+ //console.log(this.dmpList,111)
}
})
},
--
Gitblit v1.9.3