From ddc4e1c3695f36f662259a456237a3e57d3178f8 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 00:19:41 +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 --- .../xm/core/xmTestPlan/rpt/CompsCard.vue | 70 +++++++++++++++---- .../xmTestPlan/rpt/biz/questionAgeDist.vue | 4 ++ .../rpt/biz/questionAskUserSort.vue | 2 +- .../xmTestPlan/rpt/biz/questionAttDist.vue | 6 +- .../xmTestPlan/rpt/biz/questionFuncSort.vue | 2 +- .../rpt/biz/questionHandlerUserSort.vue | 2 +- .../xmTestPlan/rpt/biz/questionMenuSort.vue | 2 +- .../core/xmTestPlan/rpt/biz/questionSort.vue | 6 +- .../rpt/biz/testPlanCaseExecStatusDist.vue | 6 +- .../rpt/biz/testPlanCaseUserDist.vue | 6 +- src/views/xm/core/xmTestPlan/rpt/index.vue | 9 ++- 11 files changed, 91 insertions(+), 24 deletions(-) diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue index f66ce240..98207c62 100644 --- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue +++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue @@ -1,10 +1,10 @@ @@ -62,8 +57,8 @@ import xmTestPlanCaseExecStatusDist from '@/views/xm/core/xmTestPlan/rpt/biz/tes import xmTestPlanCaseUserDist from '@/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist' -import { initDicts,listXmRptConfig, delXmRptConfig, batchDelXmRptConfig,editSomeFieldsXmRptConfig } from '@/api/xm/core/xmRptConfig'; - +import { initDicts,listXmRptConfig, delXmRptConfig,editXmRptConfig,addXmRptConfig,batchDelXmRptConfig,editSomeFieldsXmRptConfig } from '@/api/xm/core/xmRptConfig'; + export default { components: { GridLayout: VueGridLayout.GridLayout, @@ -124,6 +119,9 @@ export default { }, methods: { + initData(){ + this.getXmRptConfig(); + }, getXmRptConfig(){ if(!this.xmTestPlan){ return; @@ -140,16 +138,60 @@ export default { this.compCfgList=JSON.parse(JSON.stringify(this.initCompCfg)) } }, - onCompSelect(comp){ - var compCfg={i:this.compCfgList.length+1, x: 0, y: 12, w: 12, h: 6, compId:comp.compId,name:comp.name,id:comp.compId+seq.sn(),params:{}} + onCompSelect(comp){ + var compCfgListTemp=JSON.parse(JSON.stringify(this.compCfgList)) + compCfgListTemp.sort((i1,i2)=>{ + return i2.i-i1.i + }) + var maxI=(compCfgListTemp.length>0?(compCfgListTemp[0].i+1):1); + compCfgListTemp.sort((i1,i2)=>{ + return i2.y-i1.y + }) + var maxY=(compCfgListTemp.length>0?(compCfgListTemp[0].y+6):0); + var compCfg={i:maxI, x: 0, y: maxY, w: 12, h: 6, compId:comp.compId,name:comp.name,id:comp.compId+seq.sn(),params:{}} this.compCfgList.push(compCfg) + }, + submitXmPrtConfig(callback){ + 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 + }) + xmRptConfig.cfg=JSON.stringify(compCfgList) + addXmRptConfig(xmRptConfig).then(res=>{ + this.xmRptConfig=xmRptConfig; + callback() + }) + }else{ + 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 + }) + xmRptConfig.cfg=JSON.stringify(compCfgList) + editXmRptConfig(xmRptConfig).then(res=>{ + this.xmRptConfig=xmRptConfig; + callback() + }) + } + }, + doDelete(compCfg){ + if(this.rptConfigVisible==false){ + this.$notify({ position:'bottom-left', showClose:true, message: "当前报告为预览模式，不能删除，请切换为配置报告模式", type: 'error' }); + return; + } + var index=this.compCfgList.findIndex(k=>k.id==compCfg.id) + if(index>=0){ + this.compCfgList.splice(index,1) + } } }, mounted() { this.$nextTick(() => { - + this.initData(); this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el) }) }, diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue index 30820b0a..0894f23b 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue @@ -6,6 +6,7 @@ + 删除 关闭 @@ -203,6 +204,9 @@ onIterationSelected(iteration){ this.filters.iteration=iteration }, + doDelete(){ + this.$emit("delete",this.compCfg) + }, onIterationClear(){ this.filters.iteration=null diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue index 32d86b63..4726deee 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 5610db87..62525645 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue @@ -5,6 +5,7 @@ + 删除 关闭 @@ -292,7 +293,10 @@ Object.assign(this.filters,compCfg.params) } } - } + }, + doDelete(){ + this.$emit("delete",this.compCfg) + }, },//end method mounted() { initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason'] ).then(res=>{ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue index 860d3ea0..c6d49ff4 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 58d66f07..e4507093 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 ca7d87ef..5483781b 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 ce471c45..cea13625 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue @@ -5,6 +5,7 @@ + 删除 关闭 @@ -229,7 +230,10 @@ Object.assign(this.filters,compCfg.params) } } - } + }, + doDelete(){ + this.$emit("delete",this.compCfg) + }, },//end method mounted() { initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason'] ).then(res=>{ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue index f07a5c78..a9513eea 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue @@ -5,6 +5,7 @@ + 删除 关闭 @@ -176,7 +177,10 @@ Object.assign(this.filters,compCfg.params) } } - } + }, + doDelete(){ + this.$emit("delete",this.compCfg) + }, },//end method mounted() { initSimpleDicts('all',['testPlanTcode'] ).then(res=>{ diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue index 3695c04c..04049199 100644 --- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue +++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue @@ -5,6 +5,7 @@ + 删除 关闭 @@ -170,7 +171,10 @@ Object.assign(this.filters,compCfg.params) } } - } + }, + doDelete(){ + this.$emit("delete",this.compCfg) + }, },//end method mounted() { initSimpleDicts('all',['testPlanTcode'] ).then(res=>{ diff --git a/src/views/xm/core/xmTestPlan/rpt/index.vue b/src/views/xm/core/xmTestPlan/rpt/index.vue index 9a2df50c..704fb0fd 100644 --- a/src/views/xm/core/xmTestPlan/rpt/index.vue +++ b/src/views/xm/core/xmTestPlan/rpt/index.vue @@ -1,7 +1,7 @@