From 99631286fc3bdaa7430633b1f012252fc57478f4 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 09 九月 2024 12:04:44 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 18 +++++++++---------
src/views/mdc/components/recordChartsByDate.vue | 6 +++---
src/views/mdc/station-live.vue | 14 +++++++-------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/views/mdc/components/recordChartsByDate.vue b/src/views/mdc/components/recordChartsByDate.vue
index 420422a..a547eb8 100644
--- a/src/views/mdc/components/recordChartsByDate.vue
+++ b/src/views/mdc/components/recordChartsByDate.vue
@@ -14,7 +14,7 @@
import * as echarts from 'echarts';
export default {
components: {saveDialog},
- props: ['achievements','date','workstationInfoList'],
+ props: ['achievements','date','workstationInfoList','humanFeedback'],
watch: {
},
data() {
@@ -85,11 +85,10 @@
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,
+ humanFeedback: this.humanFeedback,
machineFeedback: true,
workstationInfoList: this.workstationInfoList
}
@@ -101,6 +100,7 @@
res.data.records.reverse();
res.data.records.forEach((item,index)=> {
yAxisData.push(item.workstationInfo.name);
+ if(item.statusRecordList == null) item.statusRecordList = [];
//璁＄畻寮�濮嬫椂闂达紝鏄剧ず鏃堕棿
item.statusRecordList.forEach(item1=> {
var initstart = item1.startTime.split(" ")[0]; //鏍规嵁鏃ユ湡璁＄畻宸��
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index b60879c..be7034a 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-17 22:29:43
+ * @LastEditTime: 2024-09-09 12:04:32
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -70,7 +70,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>
@@ -133,7 +133,7 @@
return {
achievements: [],
collectionstatus: [],
- checked1: "",
+ humanFeedback: "",
alarmtotal: 0,
alarmtableData: [],
wcsDate: "",
@@ -336,7 +336,7 @@
getrecord() { //鐝鐘舵�佽褰晅able
var obj = {
date: this.wcsDate,
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
this.$HTTP.post(`/api/blade-mdc/status-record/shift-index-status-record-table`,obj).then(res=> {
@@ -412,7 +412,7 @@
var obj = {
date: this.wcsDate,
//date : "2024-05-15",
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
this.$HTTP.post(`/api/blade-mdc/status-record/shift-index-status-record-chart`,obj).then(res=> {
@@ -560,7 +560,7 @@
getwscLvalue() {
var obj = {
date: this.wcsDate,
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
this.$HTTP.post(`/api/blade-mdc/status-record/time-distribution`,obj).then(res=> {
@@ -599,7 +599,7 @@
getwcsR() {
var obj = {
date: this.wcsDate,
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
this.$HTTP.post(`/api/blade-mdc/status-record/equipment-efficiency`,obj).then(res=> {
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index dc35996..3ec190c 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-17 22:40:51
+ * @LastEditTime: 2024-09-09 12:00:25
* @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" />
<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: [],
@@ -184,7 +184,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 +206,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
@@ -247,7 +247,7 @@
this.setWork = {
endDate: this.time[1],
startDate: this.time[0],
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
machineFeedback: true,
workstationId: item.id,
workstationName: workstationName
@@ -320,7 +320,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
--
Gitblit v1.9.3