From 1bb212763a5ef9a8481149f7976129b6262be365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 3 Aug 2022 19:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmTestPlan/rpt/CompsCard.vue | 14 ++++++++++++-- .../xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue | 14 ++++++-------- .../xmTestPlan/rpt/biz/questionAskUserSort.vue | 2 +- .../xm/core/xmTestPlan/rpt/biz/questionAttDist.vue | 10 ++++------ .../core/xmTestPlan/rpt/biz/questionFuncSort.vue | 2 +- .../xmTestPlan/rpt/biz/questionHandlerUserSort.vue | 2 +- .../core/xmTestPlan/rpt/biz/questionMenuSort.vue | 2 +- .../xm/core/xmTestPlan/rpt/biz/questionSort.vue | 9 ++++----- .../rpt/biz/testPlanCaseExecStatusDist.vue | 10 ++++------ .../xmTestPlan/rpt/biz/testPlanCaseUserDist.vue | 10 ++++------ 10 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue index 98207c62..78c48a9e 100644 --- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue +++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue @@ -152,11 +152,17 @@ export default { this.compCfgList.push(compCfg) }, submitXmPrtConfig(callback){ + debugger; if(this.xmRptConfig==null){ var xmRptConfig={name:this.xmTestPlan.name,bizId:this.xmTestPlan.id,cfg:[]} var compCfgList=JSON.parse(JSON.stringify(this.compCfgList)) compCfgList.forEach(k=>{ - k.params=this.$refs[k.id].filters + if(this.$refs[k.id] && this.$refs[k.id][0].$refs && this.$refs[k.id][0].$refs[k.id]){ + k.params=this.$refs[k.id][0].$refs[k.id].filters + }else{ + k.params=this.$refs[k.id][0].filters + } + }) xmRptConfig.cfg=JSON.stringify(compCfgList) addXmRptConfig(xmRptConfig).then(res=>{ @@ -167,7 +173,11 @@ export default { var xmRptConfig={id:this.xmRptConfig.id,name:this.xmTestPlan.name,bizId:this.xmTestPlan.id,cfg:[]} var compCfgList=JSON.parse(JSON.stringify(this.compCfgList)) compCfgList.forEach(k=>{ - k.params=this.$refs[k.id].filters + if(this.$refs[k.id] && this.$refs[k.id][0].$refs && this.$refs[k.id][0].$refs[k.id]){ + k.params=this.$refs[k.id][0].$refs[k.id].filters + }else{ + k.params=this.$refs[k.id][0].filters + } }) xmRptConfig.cfg=JSON.stringify(compCfgList) editXmRptConfig(xmRptConfig).then(res=>{ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue index 0894f23b..ff7b8370 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue @@ -108,7 +108,7 @@ } }, - watch: { + watch: { xmQuestionAgeDistsCpd(){ this.drawCharts(); } @@ -212,17 +212,15 @@ this.filters.iteration=null }, initData(){ + debugger; if(this.xmTestPlan){ this.filters.productId=this.xmTestPlan.productId this.filters.projectId=this.xmTestPlan.projectId this.filters.planId=this.xmTestPlan.id - } - if(this.xmRptConfig && this.xmRptConfig.cfg){ - var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id) - if(compCfg && compCfg.params){ - Object.assign(this.filters,compCfg.params) - } - } + } + if(this.compCfg && this.compCfg.params){ + Object.assign(this.filters,this.compCfg.params) + } } },//end method mounted() { diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue index 4726deee..c5009897 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue @@ -1,7 +1,7 @@ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue index 62525645..0d9cf5d6 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue @@ -287,12 +287,10 @@ this.filters.projectId=this.xmTestPlan.projectId this.filters.planId=this.xmTestPlan.id } - if(this.xmRptConfig && this.xmRptConfig.cfg){ - var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id) - if(compCfg && compCfg.params){ - Object.assign(this.filters,compCfg.params) - } - } + + if(this.compCfg && this.compCfg.params){ + Object.assign(this.filters,this.compCfg.params) + } }, doDelete(){ this.$emit("delete",this.compCfg) diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue index c6d49ff4..a15d2e7b 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue @@ -1,7 +1,7 @@ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionHandlerUserSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionHandlerUserSort.vue index e4507093..ee5d84fc 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionHandlerUserSort.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionHandlerUserSort.vue @@ -1,7 +1,7 @@ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionMenuSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionMenuSort.vue index 5483781b..e27b9cf3 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionMenuSort.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionMenuSort.vue @@ -1,7 +1,7 @@ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue index cea13625..610124e8 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue @@ -225,11 +225,10 @@ this.filters.projectId=this.xmTestPlan.projectId this.filters.planId=this.xmTestPlan.id } - if(this.compCfg && this.compCfg.id){ - if(this.compCfg && this.compCfg.params){ - Object.assign(this.filters,compCfg.params) - } - } + + if(this.compCfg && this.compCfg.params){ + Object.assign(this.filters,this.compCfg.params) + } }, doDelete(){ this.$emit("delete",this.compCfg) diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue index a9513eea..ebb4e1cf 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue @@ -171,12 +171,10 @@ this.filters.projectId=this.xmTestPlan.projectId this.filters.planId=this.xmTestPlan.id } - if(this.xmRptConfig && this.xmRptConfig.cfg){ - var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id) - if(compCfg && compCfg.params){ - Object.assign(this.filters,compCfg.params) - } - } + + if(this.compCfg && this.compCfg.params){ + Object.assign(this.filters,this.compCfg.params) + } }, doDelete(){ this.$emit("delete",this.compCfg) diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue index 04049199..a195bca6 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue @@ -165,12 +165,10 @@ this.filters.projectId=this.xmTestPlan.projectId this.filters.planId=this.xmTestPlan.id } - if(this.xmRptConfig && this.xmRptConfig.cfg){ - var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id) - if(compCfg && compCfg.params){ - Object.assign(this.filters,compCfg.params) - } - } + + if(this.compCfg && this.compCfg.params){ + Object.assign(this.filters,this.compCfg.params) + } }, doDelete(){ this.$emit("delete",this.compCfg)