From 55900c9b6519dbe3d0f02f914a1cb2b2be22a6a9 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 15 五月 2024 09:45:21 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/alarm-statistics.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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
+ })
})
+
}
}
}
--
Gitblit v1.9.3