From 6f1ac1da6b6cba5c74f2fb6be82f7e472c4116ee Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 03 六月 2024 22:46:19 +0800
Subject: [PATCH] 班制日历
---
src/views/mdc/status-record.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index c46efb7..e705c18 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-26 18:07:52
+ * @LastEditTime: 2024-05-14 18:41:53
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -42,7 +42,7 @@
<!-- collectionstatus 鍙嶉鐘舵��
date 鏃ユ湡
workstationInfoList 宸ヤ綅list -->
- <record-charts-by-date :collectionstatus="collectionstatus" :date="date" :workstationInfoList="workstationInfoList" v-if="collectionstatus.length != 0"></record-charts-by-date>
+ <record-charts-by-date :achievements="allwcs" :date="date" :workstationInfoList="workstationInfoList" v-if="achievements.length != 0"></record-charts-by-date>
</el-tab-pane>
<el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
<div class="fact-analysis-realtim">
@@ -72,7 +72,7 @@
</div>
</div>
<!-- setWork 鍏ュ弬 -->
- <record-charts-by-workstation :setWork="setWork" :select="select" :collectionstatus="collectionstatus" v-if="!isshowempty"></record-charts-by-workstation>
+ <record-charts-by-workstation :setWork="setWork" :select="select" :achievements="allwcs" v-if="!isshowempty"></record-charts-by-workstation>
</div>
</div>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog>
@@ -154,7 +154,8 @@
achievements: [],
collectionstatus: [],
workstationId: "",
- setWork: {}
+ setWork: {},
+ allwcs: []
}
},
created() {
@@ -166,12 +167,19 @@
},
methods: {
addfeedbackSuccess() {
+ var workstationName = "";
+ this.btnGongweiList.forEach(item=> {
+ if(item.id == this.btnGongweiListActive) {
+ workstationName = item.name;
+ }
+ })
this.setWork = {
endDate: this.time[1],
startDate: this.time[0],
humanFeedback: true,
machineFeedback: true,
- workstationId: this.lastLevelId
+ workstationId: this.lastLevelId,
+ workstationName: workstationName
}
},
table_edit(){
@@ -206,12 +214,19 @@
changeTabGongwei(item) { //鎸夊伐浣嶆煡璇�
this.btnGongweiListActive = item.id;
this.lastLevelId = this.btnGongweiListActive;
+ var workstationName = "";
+ this.btnGongweiList.forEach(item=> {
+ if(item.id == this.btnGongweiListActive) {
+ workstationName = item.name;
+ }
+ })
this.setWork = {
endDate: this.time[1],
startDate: this.time[0],
humanFeedback: true,
machineFeedback: true,
- workstationId: item.id
+ workstationId: item.id,
+ workstationName: workstationName
}
},
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
@@ -229,6 +244,7 @@
})
this.achievements = achievements;
this.collectionstatus = collectionstatus;
+ this.allwcs = res.data;
}
})
},
@@ -272,7 +288,8 @@
startDate: this.time[0],
humanFeedback: true,
machineFeedback: true,
- workstationId: this.select[0].id
+ workstationId: this.select[0].id,
+ workstationName: this.btnGongweiList[0].name
}
this.isshowempty = false;
}
@@ -384,7 +401,7 @@
flex-wrap: wrap;
}
.status-wrap /deep/ .el-checkbox.el-checkbox--large {
- color: #3b8e8e;
+ color: #409eff;
}
.fact-analysis-realtim {
display: flex;
@@ -418,7 +435,7 @@
position: absolute;
right: 10px;
top: -2px;
- color: #3b8e8e;
+ color: #409eff;
cursor: pointer;
}
.aposcope-right /deep/ .el-tabs__content {
--
Gitblit v1.9.3