From db06bf2b2956472ecbd745f861a7713bd76f3bec Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 14 五月 2024 20:46:39 +0800
Subject: [PATCH] update
---
src/views/mdc/alarm-statistics.vue | 16 ++++++++++------
src/views/mdc/components/ShiftAlarm.vue | 5 +++--
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/alarm-statistics.vue b/src/views/mdc/alarm-statistics.vue
index 6d41bbd..e37006a 100644
--- a/src/views/mdc/alarm-statistics.vue
+++ b/src/views/mdc/alarm-statistics.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-21 18:58:16
+ * @LastEditTime: 2024-05-14 20:40:54
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/alarm-statistics.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -26,7 +26,7 @@
</el-main>
<el-footer>
<el-button @click="query()">鏌ヨ</el-button>
- <el-button>瀵煎嚭</el-button>
+ <!-- <el-button>瀵煎嚭</el-button> -->
</el-footer>
</el-container>
</el-aside>
@@ -101,12 +101,16 @@
},
methods: {
query(firstWorkKey) {
+ console.log('------')
let workstationId = firstWorkKey ? [firstWorkKey] : [...this.treeChecked]
- this.$refs[this.activeName].init({
- endDate: this.time[1],
- startDate: this.time[0],
- workstationId
+ this.$nextTick(() => {
+ this.$refs[this.activeName].init({
+ endDate: this.time[1],
+ startDate: this.time[0],
+ workstationId
+ })
})
+
}
}
}
diff --git a/src/views/mdc/components/ShiftAlarm.vue b/src/views/mdc/components/ShiftAlarm.vue
index b8f7cc2..1864fb1 100644
--- a/src/views/mdc/components/ShiftAlarm.vue
+++ b/src/views/mdc/components/ShiftAlarm.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-23 19:45:00
+ * @LastEditTime: 2024-05-14 20:42:32
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/ShiftAlarm.vue
-->
<template>
@@ -89,9 +89,10 @@
},
methods: {
init(params) {
+ this.btnListActive = ''
+ console.log('++++++')
this.params = {
...this.params,
- ...params,
workstationId: params.workstationId.toString()
}
this.getTime({
--
Gitblit v1.9.3