优化

src/views/xm/rpt/iteration/IterationWorkItemDayList.vue

@@ -71,12 +71,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -84,6 +78,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+"迭代工作项每日趋势图" 
 				

src/views/xm/rpt/iteration/burnout.vue

@@ -104,12 +104,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -117,6 +111,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+"迭代燃尽图" 
 				

src/views/xm/rpt/iteration/menuDayAccumulate.vue

@@ -97,12 +97,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -110,6 +104,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+'需求每日累积图' 
 				

src/views/xm/rpt/iteration/menuDayTrend.vue

@@ -99,12 +99,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -112,6 +106,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+'需求每日趋势图' 
 				

src/views/xm/rpt/iteration/questionDayAccumulate.vue

@@ -94,12 +94,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -107,6 +101,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+'缺陷每日累积图' 
 				

src/views/xm/rpt/iteration/questionDayTrend.vue

@@ -98,12 +98,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -111,6 +105,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+'缺陷每日趋势图' 
 				

src/views/xm/rpt/product/menuAgeDist.vue

@@ -106,12 +106,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -119,6 +113,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+'需求年龄数量分布' 
 				

src/views/xm/rpt/product/menuAttDist.vue

@@ -102,10 +102,7 @@
 						return data;
 					})
 				}
-			},
-			title(){
-				return this.groupBys.find(i=>i.id==this.groupBy).name+'数量分布'
-			},
+			}, 
 			legendCpd(){
 				var itemId="";
 				if(this.groupBy=='status'){
@@ -131,12 +128,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -144,6 +135,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+'需求属性数量分布' 
 				

src/views/xm/rpt/product/menuDayAccumulate.vue

@@ -88,12 +88,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -101,6 +95,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+"产品需求每日累积图" 
 			},

src/views/xm/rpt/product/menuDayTrend.vue

@@ -91,12 +91,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -104,6 +98,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+"产品需求每日趋势图" 
 			},

src/views/xm/rpt/product/menuSort.vue

@@ -96,12 +96,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -109,6 +103,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+this.groupBys.find(i=>i.id==this.groupBy).name+'用户故事数量排行榜'
 			},
@@ -119,14 +119,6 @@
 					return this.xmMenuSorts.map(i=>i.name)
 				}
 				
-			},
-			title(){
-				if(this.xmIteration && this.xmIteration.id){
-					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'用户故事数量排行榜'
-				}else {
-					return (this.filters.product?'产品【'+this.filters.product.productName+'】':'')+'用户故事数量排行榜'
-				}
-				
 			}, 
 			xmProductCpd(){
 				if(this.xmIteration && this.xmIteration.id){
@@ -156,7 +148,10 @@
 				groupBy:'proposer_id',
 				groupBys:[
 					{id:'proposer_id', name:'提出人'},
+					{id:'product_id', name:'产品'},
+					{id:'iteration_id', name:'迭代'},
 					{id:'mm_userid', name:'负责人'}, 
+					{id:'func_id', name:'模块'}, 
 				],
 				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				load:{ list: false, edit: false, del: false, add: false },//查询中... 

src/views/xm/rpt/product/productWorkItemDayList.vue

@@ -64,12 +64,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -77,6 +71,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+"产品工作项每日分布图" 
 			},

src/views/xm/rpt/product/questionDayAccumulate.vue

@@ -89,12 +89,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -102,6 +96,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+"产品缺陷每日累积图" 
 			},

src/views/xm/rpt/product/questionDayTrend.vue

@@ -92,12 +92,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -105,6 +99,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+"产品缺陷每日趋势图" 
 			},

src/views/xm/rpt/product/questionSort.vue

@@ -121,10 +121,7 @@
 				}else{ 
 					return this.xmQuestionSorts.map(i=>i.value)
 				}
-			},
-			title(){
-				return this.groupBys.find(i=>i.id==this.groupBy).name+'排行榜'
-			},
+			}, 
 			legendCpd(){
 				if(this.xmQuestionSorts.length==0){
 					return []

src/views/xm/rpt/testCase/testCaseSort.vue

@@ -108,12 +108,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -121,6 +115,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return preName+ this.groupBys.find(i=>i.id==this.groupBy).name+'排行榜'
  			}, 

src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue

@@ -106,12 +106,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -119,6 +113,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+'测试用例规划分析'
 			},

src/views/xm/rpt/testPlan/testDayTimesCalc.vue

@@ -101,12 +101,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -114,6 +108,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+ "测试用例每日执行次数统计" 
 			},

src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue

@@ -98,12 +98,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -111,6 +105,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+ '测试用例执行结果数量分布'
 			},

src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue

@@ -122,12 +122,6 @@
 					preName=`测试库【${this.filters.testCasedb.name}】`
 				}else if(this.filters.iteration && this.filters.iteration.id){
 					preName=`迭代【${this.filters.iteration.iterationName}】`
-				}else if(this.filters.project && this.filters.project.id){ 
-					if(this.filters.project.name){
-						preName=`项目【${this.filters.project.name}】`
-					}else{
-						preName=`项目【${this.filters.project.id}】`
-					}
 				}else if(this.filters.product && this.filters.product.id){
 					if(this.filters.product.productName){
 						preName=`产品【${this.filters.product.productName}】`
@@ -135,6 +129,12 @@
 						preName=`产品【${this.filters.product.id}】`
 					}
 					
+				}else if(this.filters.project && this.filters.project.id){ 
+					if(this.filters.project.name){
+						preName=`项目【${this.filters.project.name}】`
+					}else{
+						preName=`项目【${this.filters.project.id}】`
+					}
 				}
 				return  preName+ '测试用例执行结果数量分布'
 			},