diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue index df431ffc..29e0d717 100644 --- a/src/views/xm/rpt/CompsCard.vue +++ b/src/views/xm/rpt/CompsCard.vue @@ -7,6 +7,8 @@ + 查看历史报告 + 保存报告(可供历史查询) 查看报告 退出报告 制作报告 @@ -206,6 +208,12 @@ export default { } }, + createRptData(){ + if(this.xmRptConfig==null){ + this.$message.error("还没制作报告,请先制作报告") + return; + } + }, undoRptCfg(){ this.xmRptConfig=null; this.isRptCfg=false; diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue index c845e770..3e4fbe3f 100644 --- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue +++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue @@ -72,13 +72,13 @@ ]), dataSetCpd(){ return [ - ['日期',...this.xmProductStateHiss.map(i=>i.bizDate)], - ['未关故事',...this.xmProductStateHiss.map(i=>i.menuCnt-i.menuCloseCnt)], - ['已关故事',...this.xmProductStateHiss.map(i=>i.menuCloseCnt)], - ['未关任务',...this.xmProductStateHiss.map(i=>i.taskCnt-i.taskCloseCnt)], - ['已关任务',...this.xmProductStateHiss.map(i=>i.taskCloseCnt)], - ['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)], - ['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)] + ['日期',...this.rawDatas.map(i=>i.bizDate)], + ['未关故事',...this.rawDatas.map(i=>i.menuCnt-i.menuCloseCnt)], + ['已关故事',...this.rawDatas.map(i=>i.menuCloseCnt)], + ['未关任务',...this.rawDatas.map(i=>i.taskCnt-i.taskCloseCnt)], + ['已关任务',...this.rawDatas.map(i=>i.taskCloseCnt)], + ['未关缺陷',...this.rawDatas.map(i=>i.bugCnt-i.closedBugs)], + ['已关缺陷',...this.rawDatas.map(i=>i.closedBugs)] ] }, @@ -132,7 +132,7 @@ dateRanger:[], maxTableHeight:300, visible:false, - xmProductStateHiss:[], + rawDatas:[], }//end return },//end data @@ -140,7 +140,7 @@ listXmBranchStateHis(){ var params=this.params listXmBranchStateHis(params).then(res=>{ - this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; + this.rawDatas=res.data.tips.isOk?res.data.data:this.rawDatas; }) }, open(){ @@ -208,7 +208,7 @@ if(this.showToolBar && !this.title){ this.title="企业工作项每日趋势图" } - this.xmProductStateHiss=[] + this.rawDatas=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); this.$nextTick(()=>{ @@ -335,13 +335,13 @@ onProductSelected(product){ this.filters.product=product - this.xmProductStateHiss=[]; + this.rawDatas=[]; }, onProductClear(){ this.filters.product=null - this.xmProductStateHiss=[]; + this.rawDatas=[]; }, diff --git a/src/views/xm/rpt/branch/menuDayAccumulate.vue b/src/views/xm/rpt/branch/menuDayAccumulate.vue index a78d95cd..f8bd65f6 100644 --- a/src/views/xm/rpt/branch/menuDayAccumulate.vue +++ b/src/views/xm/rpt/branch/menuDayAccumulate.vue @@ -54,39 +54,39 @@ 'userInfo','roles' ]), datesCpd(){ - if(this.xmProductStateHiss.length==0){ + if(this.rawDatas.length==0){ return [] }else{ - return this.xmProductStateHiss.map(i=>i.bizDate) + return this.rawDatas.map(i=>i.bizDate) } }, menuCloseCntCpd(){ - if(this.xmProductStateHiss.length==0){ + if(this.rawDatas.length==0){ return [] }else{ - return this.xmProductStateHiss.map(i=>i.menuCloseCnt) + return this.rawDatas.map(i=>i.menuCloseCnt) } }, menuUnstartCntCpd(){ - if(this.xmProductStateHiss.length==0){ + if(this.rawDatas.length==0){ return [] }else{ - return this.xmProductStateHiss.map(i=> i.menuUnstartCnt) + return this.rawDatas.map(i=> i.menuUnstartCnt) } }, menuExecCntCpd(){ - if(this.xmProductStateHiss.length==0){ + if(this.rawDatas.length==0){ return [] }else{ - return this.xmProductStateHiss.map(i=> i.menuExecCnt) + return this.rawDatas.map(i=> i.menuExecCnt) } }, menuFinishCntCpd(){ - if(this.xmProductStateHiss.length==0){ + if(this.rawDatas.length==0){ return [] }else{ - return this.xmProductStateHiss.map(i=>i.menuFinishCnt) + return this.rawDatas.map(i=>i.menuFinishCnt) } }, titleCpd(){ @@ -134,7 +134,7 @@ dateRanger:[], maxTableHeight:300, visible:false, - xmProductStateHiss:[], + rawDatas:[], }//end return },//end data @@ -143,7 +143,7 @@ var params={...this.params,orderBy:'biz_date asc'} listXmBranchStateHis(params).then(res=>{ - this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; + this.rawDatas=res.data.tips.isOk?res.data.data:this.rawDatas; }) }, open(){ @@ -182,7 +182,7 @@ if(this.showToolBar && !this.title){ this.title="企业工作项每日趋势图" } - this.xmProductStateHiss=[] + this.rawDatas=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); this.$nextTick(()=>{ @@ -288,22 +288,22 @@ onProductSelected(product){ this.filters.product=product - this.xmProductStateHiss=[]; + this.rawDatas=[]; }, onProductClear(){ this.filters.product=null - this.xmProductStateHiss=[]; + this.rawDatas=[]; }, onIterationSelected(iteration){ this.filters.iteration=iteration - this.xmProductStateHiss=[]; + this.rawDatas=[]; }, onIterationClear(){ this.filters.iteration=null - this.xmProductStateHiss=[]; + this.rawDatas=[]; } },//end method mounted() {