diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue index dc6baf73..c26a4c74 100644 --- a/src/views/xm/rpt/product/productWorkItemDayList.vue +++ b/src/views/xm/rpt/product/productWorkItemDayList.vue @@ -46,10 +46,10 @@ dataSetCpd(){ return [ ['日期',...this.xmProductStateHiss.map(i=>i.bizDate)], - ['未关故事',...this.xmProductStateHiss.map(i=>i.menuCnt-i.menuFinishCnt)], - ['已关故事',...this.xmProductStateHiss.map(i=>i.menuFinishCnt)], - ['未关任务',...this.xmProductStateHiss.map(i=>i.taskCnt-i.taskFinishCnt)], - ['已关任务',...this.xmProductStateHiss.map(i=>i.taskFinishCnt)], + ['未关故事',...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)] ] diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue index 1d8a7217..39dcecea 100644 --- a/src/views/xm/rpt/project/projectWorkItemDayList.vue +++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue @@ -46,10 +46,10 @@ dataSetCpd(){ return [ ['日期',...this.xmProjectStateHiss.map(i=>i.bizDate)], - ['未关故事',...this.xmProjectStateHiss.map(i=>i.menuCnt-i.menuFinishCnt)], - ['已关故事',...this.xmProjectStateHiss.map(i=>i.menuFinishCnt)], - ['未关任务',...this.xmProjectStateHiss.map(i=>i.taskCnt-i.taskFinishCnt)], - ['已关任务',...this.xmProjectStateHiss.map(i=>i.taskFinishCnt)], + ['未关故事',...this.xmProjectStateHiss.map(i=>i.menuCnt-i.menuCloseCnt)], + ['已关故事',...this.xmProjectStateHiss.map(i=>i.menuCloseCnt)], + ['未关任务',...this.xmProjectStateHiss.map(i=>i.taskCnt-i.taskCloseCnt)], + ['已关任务',...this.xmProjectStateHiss.map(i=>i.taskCloseCnt)], ['未关缺陷',...this.xmProjectStateHiss.map(i=>i.bugCnt-i.closedBugs)], ['已关缺陷',...this.xmProjectStateHiss.map(i=>i.closedBugs)] ] diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue index b69675af..a0879202 100644 --- a/src/views/xm/rpt/project/taskDayAccumulate.vue +++ b/src/views/xm/rpt/project/taskDayAccumulate.vue @@ -4,7 +4,7 @@
-
@@ -50,33 +50,33 @@ return this.xmProjectStateHiss.map(i=>i.bizDate) } }, - menuCloseCntCpd(){ + taskCloseCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=>i.menuCloseCnt) + return this.xmProjectStateHiss.map(i=>i.taskCloseCnt) } }, - menuUnstartCntCpd(){ + taskUnstartCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=> i.menuUnstartCnt) + return this.xmProjectStateHiss.map(i=> i.taskUnstartCnt) } }, - menuExecCntCpd(){ + taskExecCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=> i.menuExecCnt) + return this.xmProjectStateHiss.map(i=> i.taskExecCnt) } }, - menuFinishCntCpd(){ + taskFinishCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=>i.menuFinishCnt) + return this.xmProjectStateHiss.map(i=>i.taskFinishCnt) } }, @@ -135,7 +135,7 @@ }, drawCharts() { - this.myChart = this.$echarts.init(document.getElementById("menuDayAccumulate")); + this.myChart = this.$echarts.init(document.getElementById("taskDayAccumulate")); this.myChart.setOption( { title: { @@ -182,7 +182,7 @@ emphasis: { focus: 'series' }, - data: this.menuUnstartCntCpd + data: this.taskUnstartCntCpd }, { name: '执行中', @@ -192,7 +192,7 @@ emphasis: { focus: 'series' }, - data: this.menuExecCntCpd, + data: this.taskExecCntCpd, }, { name: '已完成', @@ -202,7 +202,7 @@ emphasis: { focus: 'series' }, - data: this.menuFinishCntCpd, + data: this.taskFinishCntCpd, }, { name: '已关闭', @@ -217,7 +217,7 @@ show: true, position: 'top' }, - data: this.menuCloseCntCpd, + data: this.taskCloseCntCpd, } ] } diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue index ad62e9b0..77d53d95 100644 --- a/src/views/xm/rpt/project/taskDayTrend.vue +++ b/src/views/xm/rpt/project/taskDayTrend.vue @@ -5,7 +5,7 @@
-
@@ -52,33 +52,33 @@ return this.xmProjectStateHiss.map(i=>i.bizDate) } }, - menuCloseCntCpd(){ + taskCloseCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=>i.menuCloseCnt) + return this.xmProjectStateHiss.map(i=>i.taskCloseCnt) } }, - menuUnstartCntCpd(){ + taskUnstartCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=> i.menuUnstartCnt) + return this.xmProjectStateHiss.map(i=> i.taskUnstartCnt) } }, - menuExecCntCpd(){ + taskExecCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=> i.menuExecCnt) + return this.xmProjectStateHiss.map(i=> i.taskExecCnt) } }, - menuFinishCntCpd(){ + taskFinishCntCpd(){ if(this.xmProjectStateHiss.length==0){ return [] }else{ - return this.xmProjectStateHiss.map(i=>i.menuFinishCnt) + return this.xmProjectStateHiss.map(i=>i.taskFinishCnt) } }, @@ -136,7 +136,7 @@ }, drawCharts() { - this.myChart = this.$echarts.init(document.getElementById("menuDayTrend")); + this.myChart = this.$echarts.init(document.getElementById("taskDayTrend")); this.myChart.setOption( { legend: { @@ -153,7 +153,7 @@ series: [ { name:'待领取', - data: this.menuUnstartCntCpd, + data: this.taskUnstartCntCpd, type: 'line', smooth: true, itemStyle: { @@ -170,7 +170,7 @@ { name:'执行中', - data: this.menuExecCntCpd, + data: this.taskExecCntCpd, type: 'line', smooth: true, itemStyle: { @@ -187,7 +187,7 @@ { name:'已完成', - data: this.menuFinishCntCpd, + data: this.taskFinishCntCpd, type: 'line', smooth: true, itemStyle: { @@ -204,7 +204,7 @@ { name:'已结算', - data: this.menuCloseCntCpd, + data: this.taskCloseCntCpd, type: 'line', smooth: true, itemStyle: { @@ -221,7 +221,7 @@ { name:'已关闭', - data: this.menuCloseCntCpd, + data: this.taskCloseCntCpd, type: 'line', smooth: true, itemStyle: {