From a52ce4c9a594e78b5931d487e05d0dd54ac8cd36 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 22:38:28 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release
---
src/views/mdc/alarm-statistics.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/alarm-statistics.vue b/src/views/mdc/alarm-statistics.vue
index 6d41bbd..9ada019 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-06-22 18:50:49
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/alarm-statistics.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -25,8 +25,9 @@
<MYTree v-model="treeChecked" @loaded="query"></MYTree>
</el-main>
<el-footer>
- <el-button @click="query()">鏌ヨ</el-button>
- <el-button>瀵煎嚭</el-button>
+ <el-button type="primary" @click="query()">鏌ヨ</el-button>
+ <!-- <el-button @click="exportExcel">瀵煎嚭</el-button> -->
+ <exportDialog ref="export" @export="exportExcel"></exportDialog>
</el-footer>
</el-container>
</el-aside>
@@ -55,12 +56,13 @@
import MYTree from './MYTree.vue'
import Shift from './components/ShiftAlarm.vue'
import Time from './components/TimeAlarm.vue'
-
+import exportDialog from '@/layout/components/exportDialog.vue'
export default {
components: {
MYTree,
Shift,
- Time
+ Time,
+ exportDialog
},
watch: {
activeName() {
@@ -100,13 +102,36 @@
// })
},
methods: {
+ exportExcel(statisticalMethod) {
+ let { start, end } = this.$refs.export.format(this.time[0], this.time[1], statisticalMethod)
+ this.$HTTP.post(`/api/blade-mdc/alarm/export-alarm`, {
+ startTime: start,
+ endTime: end,
+ enums: statisticalMethod,
+ month: 0,
+ queryTime: '',
+ shiftIndex: 1,
+ week: 0,
+ year: 0,
+ workstationId: this.treeChecked.toString()
+ }).then(res => {
+ if (res.success) {
+ window.open(res.data.link)
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
query(firstWorkKey) {
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