From 08b7fb912997ec9709bf7931071397a72d4c5dae Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 17 六月 2024 22:36:38 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 46 +++++++++++++++++++++++-----------------------
src/utils/tool.js | 2 +-
src/views/mdc/station-live.vue | 4 ++--
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/utils/tool.js b/src/utils/tool.js
index d14c470..85cda09 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -2,7 +2,7 @@
* @Descripttion: 宸ュ叿闆�
* @version: 1.2
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-17 13:03:38
+ * @LastEditTime: 2024-06-17 18:21:44
*/
import CryptoJS from 'crypto-js';
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index bd67df9..b60879c 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 16:57:30
+ * @LastEditTime: 2024-06-17 22:29:43
* @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
-->
@@ -665,7 +665,7 @@
if(eventData.data[item.name]) {
item.code = eventData.data[item.name].v;
}
- that.allwcs.forEach(item1=> {
+ that.allwcs.forEach((item1)=> {
if(item.code == item1.code) {
item.codeName = item1.name; //绗簩姝ユ妸v鐨刢ode鍜岃繍琛屽搴�
if(item.code == "2") {
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 0ae953e..0ed2d5d 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-06-17 22:33:57
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -305,33 +305,33 @@
},
query() {
+ alert(3)
this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'}).then(()=> {
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();
+ })
+ //鎸夊伐浣嶆煡鐪�
+ alert(6)
+ if(this.btnGongweiList.length != 0) { //鏈夐�夊伐浣嶆墠鑳藉睍绀哄伐浣�
+ alert(123)
+ this.isshowempty = false;
+ 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();
+ })
}
});
}
--
Gitblit v1.9.3