From e5cdf3af17609b49138cec3e8fb200752365f651 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 01 十一月 2024 14:58:12 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 0ae953e..30c9383 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-06-05 11:49:48
+ * @LastEditTime: 2024-09-19 10:11:58
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -40,7 +40,7 @@
<div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
</div>
<div class="status-wrap">
- <el-checkbox v-model="checked1" label="浜哄伐鍙嶉鐘舵��" size="large" />
+ <el-checkbox v-model="humanFeedback" label="浜哄伐鍙嶉鐘舵��" size="large" @change="humanFeedbackChange" />
<div class="status-con">
<div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
</div>
@@ -49,7 +49,7 @@
<!-- collectionstatus 鍙嶉鐘舵��
date 鏃ユ湡
workstationInfoList 宸ヤ綅list -->
- <record-charts-by-date :achievements="allwcs" :date="date" :workstationInfoList="workstationInfoList" v-if="date != ''" ref="chart01"></record-charts-by-date>
+ <record-charts-by-date :achievements="allwcs" :date="date" :workstationInfoList="workstationInfoList" v-if="date != ''" ref="chart01" :humanFeedback="humanFeedback"></record-charts-by-date>
</el-tab-pane>
<el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
<div class="fact-analysis-realtim">
@@ -69,7 +69,7 @@
<div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
</div>
<div class="status-wrap">
- <el-checkbox v-model="checked1" label="浜哄伐鍙嶉鐘舵��" size="large" />
+ <el-checkbox v-model="humanFeedback" label="浜哄伐鍙嶉鐘舵��" size="large" />
<div class="status-con">
<div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
</div>
@@ -121,7 +121,7 @@
select: [],
workstationInfoList: [],
date: "",
- checked1: true,
+ humanFeedback: true,
btnListActive: '',
btnGongweiListActive: "",
btnList: [],
@@ -174,6 +174,9 @@
this.init();
},
methods: {
+ humanFeedbackChange(falg) {
+ this.$refs.chart01.getCharts();
+ },
addfeedbackSuccess() {
var workstationName = "";
this.btnGongweiList.forEach(item=> {
@@ -184,7 +187,7 @@
this.setWork = {
endDate: this.time[1],
startDate: this.time[0],
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
machineFeedback: true,
workstationId: this.lastLevelId,
workstationName: workstationName
@@ -206,7 +209,7 @@
this.setWork = { //宸ヤ綅
endDate: this.time[1],
startDate: this.time[0],
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
machineFeedback: true,
workstationId: this.select[0].id,
workstationName: this.btnGongweiList[0].name
@@ -222,7 +225,7 @@
startTime: this.time[0],
workstationInfoList: this.workstationInfoList
}
- this.$HTTP.post(`/api/blade-mdc/status-record/excel/export`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/excel/export`,obj).then(res=> {
if(res.code == 200) {
window.open(res.data.link);
}
@@ -247,7 +250,7 @@
this.setWork = {
endDate: this.time[1],
startDate: this.time[0],
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
machineFeedback: true,
workstationId: item.id,
workstationName: workstationName
@@ -257,7 +260,7 @@
})
},
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
- this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
+ this.$HTTP.get(`/api/smis/global_wcs/wcs-achievements`).then(res=> {
if(res.code == 200) {
var achievements = [];//閲囬泦鐘舵��
var collectionstatus = []; //浜哄伐鍙嶉鐘舵��
@@ -277,7 +280,7 @@
},
getTime(data) {
return new Promise(resolve=> {
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {...data}).then(res => {
+ this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {...data}).then(res => {
if (res.code === 200) {
var today = moment().format('YYYY-MM-DD');
var yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD');
@@ -309,29 +312,26 @@
this.workstationInfoList = this.select;
this.btnGongweiList = this.select; //宸ヤ綅
this.date = this.btnList[0].id;
- if(this.activeName == "shift") {
- this.$nextTick(()=> {
- this.$refs.chart01.getCharts();
- })
- }else {
- if(this.btnGongweiList.length != 0) { //鏈夐�夊伐浣嶆墠鑳藉睍绀哄伐浣�
- this.isshowempty = false;
- console.log(this.btnGongweiList,122)
- 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.workSelect = this.select;
- this.$nextTick(()=> {
- this.$refs.chart02.getCharts();
- })
+ this.$nextTick(()=> { //鎸夋棩鏈熸煡鐪�
+ this.$refs.chart01.getCharts();
+ })
+ //鎸夊伐浣嶆煡鐪�
+ if(this.btnGongweiList.length != 0) { //鏈夐�夊伐浣嶆墠鑳藉睍绀哄伐浣�
+ this.isshowempty = false;
+ this.btnGongweiListActive = this.btnGongweiList[0].id; //宸ヤ綅
+ this.lastLevelId = this.btnGongweiListActive;
+ this.setWork = { //宸ヤ綅
+ endDate: this.time[1],
+ startDate: this.time[0],
+ humanFeedback: this.humanFeedback,
+ machineFeedback: true,
+ workstationId: this.select[0].id,
+ workstationName: this.btnGongweiList[0].name
}
+ this.workSelect = this.select;
+ this.$nextTick(()=> {
+ this.$refs.chart02.getCharts();
+ })
}
});
}
--
Gitblit v1.9.3