From d4a68743827afcdbeb50e134864c9a6edb1288e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 5 Feb 2023 03:01:19 +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/rpt/CompsCard.vue | 49 +++++++++++++++++++++++++++----- src/views/xm/rpt/CompsSet.vue | 5 +++- src/views/xm/rpt/rptDataList.vue | 13 +++------ 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue index 3c350c5f..d33f3bfe 100644 --- a/src/views/xm/rpt/CompsCard.vue +++ b/src/views/xm/rpt/CompsCard.vue @@ -2,13 +2,14 @@
- + + {{ xmRptData && xmRptData.id?xmRptData.rptName:(xmRptConfig&&xmRptConfig.id?xmRptConfig.name: rptConfigParamsCpd.name+'-报告')}} 查看历史报告 - 保存报告(可供历史查询) + 保存报告(可供历史查询) 查看报告 退出报告 制作报告 @@ -34,6 +35,18 @@ + + + + + + + +
+ 取 消 + 确 定 +
+
@@ -125,7 +138,7 @@ export default { }, rptConfigParamsCpd(){ //业务类型1-产品报告，2-迭代报告，3-测试计划报告，4-项目报告，5-企业报告 - var params={bizType:'5',bizId:this.userInfo.branchId,name:''} + var params={bizType:'5',bizId:this.userInfo.branchId,name:this.userInfo.branchName} if(this.category=='企业级'){ params.bizType='5'; params.bizId=this.userInfo.branchId @@ -192,13 +205,15 @@ export default { isRptCfg:false, isRptShow:false, xmRptConfig:null, - xmRptData:null, + xmRptData:{id:'',rptName:'',bizId:'',bizType:'',bizDate:''}, + xmRptDataInit:{id:'',rptName:'',bizId:'',bizType:'',bizDate:''}, compCfgList:[], maxTableHeight:300, // 布局列数 layoutColNum: 12, paramsVisible:true, rptDataListVisible:false, + createRptDataVisible:false, } }, @@ -213,6 +228,15 @@ export default { this.getXmRptConfig(); } + }, + showCreateRptData(){ + if(this.xmRptConfig==null){ + this.$message.error("还没制作报告，请先制作报告") + return; + } + this.xmRptData.rptName=this.xmRptConfig.name + this.createRptDataVisible=true + }, toQueryRptData(){ this.rptDataListVisible=true; @@ -221,8 +245,12 @@ export default { if(this.xmRptConfig==null){ this.$message.error("还没制作报告，请先制作报告") return; - } - var xmRptData={cfgId:this.xmRptConfig.id,rptName:this.xmRptConfig.name,rptData:[]} + } + if(!this.xmRptData.rptName){ + this.$message.error("请输入报告名称") + return; + } + var xmRptData={...this.xmRptData,cfgId:this.xmRptConfig.id,rptData:[]} this.compCfgList.forEach(k=>{ if(this.$refs[k.id] && this.$refs[k.id][0].$refs && this.$refs[k.id][0].$refs[k.id]){ var com=this.$refs[k.id][0].$refs[k.id] @@ -238,7 +266,8 @@ export default { addXmRptData(xmRptData).then(res=>{ var tips = res.data.tips if(tips.isOk){ - this.$message.success("报告保存成功") + this.$message.success("报告保存成功") + this.createRptDataVisible=false }else{ this.$message.error(tips.msg) } @@ -251,6 +280,7 @@ export default { undoRptShow(){ this.isRptShow=false; this.xmRptConfig=null; + this.xmRptData={...this.xmRptDataInit}; }, toRptCfg(){ this.isRptCfg=true; @@ -420,4 +450,9 @@ export default { top:0px; right:20px; } +.rpt-name{ + text-align: center; + font-size: 18px; + font-weight: 600; +} diff --git a/src/views/xm/rpt/CompsSet.vue b/src/views/xm/rpt/CompsSet.vue index c062bd33..c2b84b73 100644 --- a/src/views/xm/rpt/CompsSet.vue +++ b/src/views/xm/rpt/CompsSet.vue @@ -52,7 +52,7 @@ import { mapGetters } from 'vuex' import store from '@/store' export default { - props: ['compIds','category' ], + props: ['compIds','category','showCheckedOnly'], computed: { ...mapGetters(['userInfo']), compsCpd(){ @@ -62,6 +62,9 @@ export default { i.isChecked=this.compIds.some(k=>k==i.compId) }) } + if(this.showCheckedOnly){ + comps=comps.filter(k=>k.isChecked) + } return comps; }, rptListCpd(){ diff --git a/src/views/xm/rpt/rptDataList.vue b/src/views/xm/rpt/rptDataList.vue index bce2d18d..50780783 100644 --- a/src/views/xm/rpt/rptDataList.vue +++ b/src/views/xm/rpt/rptDataList.vue @@ -1,7 +1,7 @@