From 5a74ff63f47921f97b6c3c35751b24b085a1a78c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 26 一月 2024 10:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
index 12d210a..da98855 100644
--- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
+++ b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
@@ -159,10 +159,10 @@
},
mounted() {
this.drawWrin()
- window.addEventListener('resize',this.handleWindowResize)
+ window.addEventListener('resize', this.handleWindowResize)
},
- beforeDestroy(){
- window.removeEventListener('resize',this.handleWindowResize)
+ beforeDestroy() {
+ window.removeEventListener('resize', this.handleWindowResize)
},
watch: {
Type(valmath) {
@@ -560,10 +560,10 @@
handleExpandChange(expanded, record) {
let _this = this
// 褰撳睍寮�鏃惰嫢璇ヨ鏈灞曞紑杩囨墠浼氳姹傚悗鍙版暟鎹紝灞曞紑杩囩殑鏁版嵁浼氳缂撳瓨鏃犻渶閲嶅璇锋眰
- const param = Object.assign({ alarmCode: record.alarmCode }, this.queryParam)
+ this.queryParam.alarmCode = record.alarmCode
if (expanded && !this.hasRequsetAlarmCodeList.includes(record.alarmCode)) {
this.innerDataLoading = true
- getAction(this.url.equipmentAlarmList, param).then(res => {
+ getAction(this.url.equipmentAlarmList, this.queryParam).then(res => {
if (res.success) {
_this.dataList.forEach(item => {
if (item.alarmCode === record.alarmCode) {
@@ -582,9 +582,9 @@
/**
* 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
*/
- handleWindowResize(){
- if(this.equipmentWarningPie) this.equipmentWarningPie.resize()
- if(this.equipmentWarningLine) this.equipmentWarningLine.resize()
+ handleWindowResize() {
+ if (this.equipmentWarningPie) this.equipmentWarningPie.resize()
+ if (this.equipmentWarningLine) this.equipmentWarningLine.resize()
}
}
}
--
Gitblit v1.9.3