From fdfb3f18d85839c824bb418c83cb17f103120aa5 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期一, 09 十月 2023 18:09:28 +0800 Subject: [PATCH] 小修改 --- src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue | 71 +++++++++++++++++++---------------- 1 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue index b586a1c..8142dcc 100644 --- a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue +++ b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue @@ -136,7 +136,6 @@ } }, nodePeople(val){ - if (JSON.stringify(val) != '{}') { if (val.equipmentId) { // this.$set(this.queryParam, 'tierName', val.title) @@ -177,40 +176,46 @@ }) }, searchQuery(){ - this.AnalysisList = [] - this.AnalysisBarList = [] - this.AnalysisGauge = [] - this.AnalysisPie = [] - if(this.queryParams.typeTree == "1"){ - this.queryParams.parentId = this.queryParamEquip.parentId - // this.queryParams.equipmentId = this.queryParamEquip.equipmentId - - }else{ - this.queryParams.parentId = this.queryParamEquip.parentId - - // this.queryParams.equipmentId = "" - } - this.AnalysisList = []; - //鑾峰彇鏌ヨ鏉′欢 - this.queryParam.parentId = this.queryParams.parentId; - this.queryParam.equipmentId = this.queryParams.equipmentId; - this.queryParam.typeTree = this.queryParams.typeTree - getAction(this.url.comparativeAnalysis,this.queryParam).then((res) => { - if(res.success){ - this.AnalysisList = res.result - this.AnalysisBarList = res.result.graphics - this.AnalysisGauge = res.result.meters - this.AnalysisPie.push(res.result.pieCharts) + if(this.dates&&this.dates.length>0){ + this.AnalysisList = [] + this.AnalysisBarList = [] + this.AnalysisGauge = [] + this.AnalysisPie = [] + if(this.queryParams.typeTree == "1"){ + this.queryParams.parentId = this.queryParamEquip.parentId + // this.queryParams.equipmentId = this.queryParamEquip.equipmentId }else{ - // this.$message.warning(res.message) - this.$notification.warning({ - message:'娑堟伅', - description:res.message - }); + this.queryParams.parentId = this.queryParamEquip.parentId + // this.queryParams.equipmentId = "" } - }).finally(() => { - this.loading = false - }) + this.AnalysisList = [] + //鑾峰彇鏌ヨ鏉′欢 + this.queryParam.parentId = this.queryParams.parentId; + this.queryParam.equipmentId = this.queryParams.equipmentId; + this.queryParam.typeTree = this.queryParams.typeTree + getAction(this.url.comparativeAnalysis,this.queryParam).then((res) => { + if(res.success){ + this.AnalysisList = res.result + this.AnalysisBarList = res.result.graphics + this.AnalysisGauge = res.result.meters + this.AnalysisPie.push(res.result.pieCharts) + }else{ + // this.$message.warning(res.message) + this.$notification.warning({ + message:'娑堟伅', + description:res.message + }); + } + }).finally(() => { + this.loading = false + }) + }else{ + this.$notification.warning({ + message:'鎻愮ず' , + description:'璇烽�夋嫨鏃堕棿' + }) + } + }, searchReset() { this.AnalysisList = [] -- Gitblit v1.9.3