From 12fb4b8e4fb75347b25f3ba473b930408ed2ec05 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 22 九月 2023 17:49:18 +0800 Subject: [PATCH] 1、优化查询时若无选择日期的提示信息 2、增加部分加载时间较长的数据的加载动画 --- src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue index fd7c515..ec4ca0b 100644 --- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue +++ b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue @@ -236,14 +236,22 @@ this.queryParam.endDate = v2[1] }, searchQuery() { - if (this.queryParam.typeTree == "1") { - this.queryParam.parentId = this.queryParamEquip.parentId - this.queryParam.equipmentId = this.queryParamEquip.equipmentId - } else { - this.queryParam.parentId = this.queryParamPeople.parentId - this.queryParam.equipmentId = "" + if (this.dates&&this.dates.length>0){ + if (this.queryParam.typeTree == "1") { + this.queryParam.parentId = this.queryParamEquip.parentId + this.queryParam.equipmentId = this.queryParamEquip.equipmentId + } else { + this.queryParam.parentId = this.queryParamPeople.parentId + this.queryParam.equipmentId = "" + } + this.loadData1() + } else{ + this.$notification.warning({ + message:'鎻愮ず', + description:'璇烽�夋嫨鏃堕棿' + }) } - this.loadData1() + // this.onClearSelected() }, // searchReset() { -- Gitblit v1.9.3