From c9ce5e7f9a9ef52c66baf4f8a6e8d9e48b7cb251 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期五, 24 五月 2024 23:59:27 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 6b6a62d..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,11 +42,11 @@
<!-- 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">
- <div class="wimi-empty" style="background-color: rgb(255, 255, 255);" v-show="isshowempty">
+ <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);">
<div class="wimi-empty-img" style="width: 150px; height: 150px;">
<img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
</div>
@@ -54,12 +54,13 @@
<div>鏆傛棤鏁版嵁</div>
</div>
</div>
- <div v-show="!isshowempty">
+ <div v-if="!isshowempty">
<el-button-group>
<el-button @click="changeTabGongwei(item)" :type="btnGongweiListActive == item.id ? 'primary' : ''" v-for="item in btnGongweiList" :key="item.id" size="small">{{item.name }}</el-button>
</el-button-group>
<div class="status">
<div class="status-wrap align-left">
+ <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
<div class="collect-status">閲囬泦鐘舵��</div>
<div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
</div>
@@ -70,12 +71,11 @@
</div>
</div>
</div>
- <!-- collectionstatus 鍙嶉鐘舵��
- date 鏃ユ湡
- workstationInfoList 宸ヤ綅list -->
- <record-charts-by-workstation :collectionstatus="collectionstatus" :date="date" :workstationInfoList="workstationInfoList" v-if="collectionstatus.length != 0"></record-charts-by-workstation>
+ <!-- setWork 鍏ュ弬 -->
+ <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>
</el-tab-pane>
</el-tabs>
</div>
@@ -83,16 +83,17 @@
</template>
<script>
+import saveDialog from './add-station-status'
import moment from 'moment';
import MYTree from './MYTree.vue';
import recordChartsByDate from './components/recordChartsByDate.vue';
import recordChartsByWorkstation from './components/recordChartsByWorkstation.vue';
export default {
components: {
- time: "",
MYTree,
recordChartsByDate,
- recordChartsByWorkstation
+ recordChartsByWorkstation,
+ saveDialog
},
watch: {
treeChecked(select) {
@@ -105,6 +106,9 @@
},
data() {
return {
+ dialog: {
+ save: false
+ },
isshowempty: true,
select: [],
workstationInfoList: [],
@@ -148,7 +152,10 @@
time: [],
treeChecked: [],
achievements: [],
- collectionstatus: []
+ collectionstatus: [],
+ workstationId: "",
+ setWork: {},
+ allwcs: []
}
},
created() {
@@ -159,6 +166,28 @@
this.init();
},
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,
+ workstationName: workstationName
+ }
+ },
+ table_edit(){
+ this.dialog.save = true
+ this.$nextTick(() => {
+ this.$refs.saveDialog.open('edit').setData(this.lastLevelId);
+ })
+ },
tabChange(val) {
if(val == "time") { //鎸夊伐浣嶆煡鐪�
@@ -183,7 +212,22 @@
this.date = item.id;
},
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,
+ workstationName: workstationName
+ }
},
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
@@ -200,6 +244,7 @@
})
this.achievements = achievements;
this.collectionstatus = collectionstatus;
+ this.allwcs = res.data;
}
})
},
@@ -237,6 +282,15 @@
if(this.select.length != 0) { //閫変簡鍊兼樉绀哄伐浣�
this.btnGongweiList = this.select;
this.btnGongweiListActive = this.btnGongweiList[0].id;
+ this.lastLevelId = this.btnGongweiListActive;
+ this.setWork = {
+ endDate: this.time[1],
+ startDate: this.time[0],
+ humanFeedback: true,
+ machineFeedback: true,
+ workstationId: this.select[0].id,
+ workstationName: this.btnGongweiList[0].name
+ }
this.isshowempty = false;
}
}
@@ -298,7 +352,10 @@
z-index: 99;
}
.MYTree {
- height: calc(100% - 200px);
+ height: 600px;
+ }
+ .MYTree-content {
+ height: 100%;
overflow: hidden;
overflow-y: auto;
}
@@ -344,7 +401,7 @@
flex-wrap: wrap;
}
.status-wrap /deep/ .el-checkbox.el-checkbox--large {
- color: #3b8e8e;
+ color: #409eff;
}
.fact-analysis-realtim {
display: flex;
@@ -374,4 +431,14 @@
margin-top: -16px;
line-height: 28px;
}
+ .feed-button {
+ position: absolute;
+ right: 10px;
+ top: -2px;
+ color: #409eff;
+ cursor: pointer;
+ }
+ .aposcope-right /deep/ .el-tabs__content {
+ overflow: visible;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3