From 1ffc011a5713edddac38323e732abc195108ca84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 4 Apr 2022 02:46:32 +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/rpt/product/productWorkItemDayList.vue | 65 +++++++++----------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue
index b4892310..7bb37d07 100644
--- a/src/views/xm/rpt/product/productWorkItemDayList.vue
+++ b/src/views/xm/rpt/product/productWorkItemDayList.vue
@@ -24,43 +24,16 @@
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
-		    ]), 
-            datesCpd(){
-				if(this.xmProductStateHiss.length==0){
-					return []
-				}else{ 
-					return this.xmProductStateHiss.map(i=>i.bizDate)
-				}
-			},
-			
-			menuNumCpd(){
-				if(this.xmProductStateHiss.length==0){
-					return []
-				}else{ 
-					return this.xmProductStateHiss.map(i=>i.menuCnt)
-				}
-			},
-			bugNumCpd(){
-				if(this.xmProductStateHiss.length==0){
-					return []
-				}else{ 
-					return this.xmProductStateHiss.map(i=>i.bugCnt)
-				}
-			},
-			
-			taskNumCpd(){
-				if(this.xmProductStateHiss.length==0){
-					return []
-				}else{ 
-					return this.xmProductStateHiss.map(i=>i.taskCnt)
-				}
-			},
+		    ]),  
 			dataSetCpd(){
 				return [
-					['日期',...this.datesCpd],
-					['故事数',...this.menuNumCpd],
-					['缺陷数',...this.bugNumCpd],
-					['任务数',...this.taskNumCpd]
+					['日期',...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.finishTaskCnt)],
+					['已关任务',...this.xmProductStateHiss.map(i=>i.finishTaskCnt)],
+					['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)],
+					['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)]
 				]
 			}
 			
@@ -157,19 +130,39 @@
 					yAxis: { gridIndex: 0 },
     				grid: { top: '55%' },
 					series: [
-						{ 
+						{ 	name:'未关故事',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true, 
+        					emphasis: { focus: 'series' }, 
+						},
+						{ 	name:'已关故事',
 							type: 'line',
         					seriesLayoutBy: 'row',
 							smooth:true, 
         					emphasis: { focus: 'series' }, 
 						},
 						{ 
+							name:'未关任务',
 							type: 'line',
         					seriesLayoutBy: 'row',
 							smooth:true,
         					emphasis: { focus: 'series' }, 
 						},
 						{ 
+							name:'已关任务',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true,
+        					emphasis: { focus: 'series' }, 
+						},
+						{ 	name:'未关缺陷',
+							type: 'line',
+        					seriesLayoutBy: 'row',
+							smooth:true,
+        					emphasis: { focus: 'series' },  
+						},
+						{ 	name:'已关缺陷',
 							type: 'line',
         					seriesLayoutBy: 'row',
 							smooth:true,