优化

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

@@ -68,13 +68,13 @@
 		components: {   
 			XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect,
 		},
-        props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'],
+        props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
 		    ]), 
 			xmTestCaseToPlanCalcListCpd(){
-				if(this.xmTestCaseToPlanCalcList.length==0){
+				if(!this.xmTestCaseToPlanCalcList || this.xmTestCaseToPlanCalcList.length==0){
 					return []
 				}else{   
 					var names=this.legendCpd;
@@ -122,9 +122,11 @@
 		data() {
 			return {
                 filters:{ 
+                    product:null, 
+                    project:null,
 					testPlan:null,
-					product:null,
-					project:null,
+					iteration:null,
+					testCasedb:null,
                 }, 
 				 
 				dicts:{testStepTcode:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -262,6 +264,7 @@
 				this.filters.testPlan=this.xmTestPlan
 				this.filters.product=this.xmProduct
 				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration
 				this.filters.testCasedb=this.xmTestCasedb
 				 
 				this.searchXmTestPlanCaseExecStatusDist();  

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

@@ -71,20 +71,20 @@
 		components: {   
 			XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect,
 		},
-        props:['xmProduct','xmProject'],
+        props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
 		    ]), 
             datesCpd(){
-				if(this.xmTestDayTimesList.length==0){
+				if(!this.xmTestDayTimesList || this.xmTestDayTimesList.length==0){
 					return []
 				}else{ 
 					return this.xmTestDayTimesList.map(i=>i.execDate)
 				}
 			}, 
 			testDayTimesCpd(){
-				if(this.xmTestDayTimesList.length==0){
+				if(!this.xmTestDayTimesList || this.xmTestDayTimesList.length==0){
 					return []
 				}else{ 
 					return this.xmTestDayTimesList.map(i=>i.hadExec)
@@ -129,6 +129,9 @@
                     category:'', 
                     product:null, 
                     project:null,
+					testPlan:null,
+					iteration:null,
+					testCasedb:null,
                 },
 				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 },//查询中... 
@@ -171,9 +174,11 @@
 			},
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.testPlan=this.xmTestPlan
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration
+				this.filters.testCasedb=this.xmTestCasedb
 				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
 				this.$nextTick(()=>{
 					this.getXmTestDayTimesList();
@@ -232,6 +237,7 @@
 			},
 
 			onXmTestPlanSelected(xmTestPlan){
+				debugger;
 				this.filters.testPlan=xmTestPlan
 			}, 
 			

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

@@ -68,13 +68,13 @@
 		components: {   
 			XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect,
 		},
-        props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'],
+        props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
 		    ]), 
 			xmTestPlanCaseExecStatusDistsCpd(){
-				if(this.xmTestPlanCaseExecStatusDists.length==0){
+				if(!this.xmTestPlanCaseExecStatusDists || this.xmTestPlanCaseExecStatusDists.length==0){
 					return []
 				}else{   
 					var datas=[]
@@ -115,9 +115,11 @@
 		data() {
 			return {
                 filters:{ 
+                    product:null, 
+                    project:null,
 					testPlan:null,
-					product:null,
-					project:null,
+					iteration:null,
+					testCasedb:null,
                 }, 
 				 
 				dicts:{testStepTcode:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -252,6 +254,7 @@
 				this.filters.testPlan=this.xmTestPlan
 				this.filters.product=this.xmProduct
 				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration
 				this.filters.testCasedb=this.xmTestCasedb
 				 
 				this.searchXmTestPlanCaseExecStatusDist();  

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

@@ -68,14 +68,14 @@
 		components: {   
 			XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect,
 		},
-        props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'],
+        props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
 		    ]), 
 			 
 			hadExecCpd(){
-				if(this.xmTestPlanCaseUserDists.length==0){
+				if(!this.xmTestPlanCaseUserDists ||this.xmTestPlanCaseUserDists.length==0){
 					return []
 				}else{ 
 					return this.xmTestPlanCaseUserDists.map(i=>i.hadExec)
@@ -83,14 +83,14 @@
 			}, 
 			
 			notExecCpd(){
-				if(this.xmTestPlanCaseUserDists.length==0){
+				if(!this.xmTestPlanCaseUserDists ||this.xmTestPlanCaseUserDists.length==0){
 					return []
 				}else{ 
 					return this.xmTestPlanCaseUserDists.map(i=>i.notExec)
 				}
 			}, 
 			legendCpd(){
-				if(this.xmTestPlanCaseUserDists.length==0){
+				if(!this.xmTestPlanCaseUserDists ||this.xmTestPlanCaseUserDists.length==0){
 					return []
 				}else{ 
 					return this.xmTestPlanCaseUserDists.map(i=>i.execUsername)
@@ -98,7 +98,7 @@
 				
 			},
 			xmTestPlanCaseUserDistsCpd(){
-				if(this.xmTestPlanCaseUserDists.length==0){
+				if(!this.xmTestPlanCaseUserDists || this.xmTestPlanCaseUserDists.length==0){
 					return []
 				}else{   
 					var datas=[]
@@ -133,9 +133,11 @@
 		data() {
 			return {
                 filters:{ 
+                    product:null, 
+                    project:null,
 					testPlan:null,
-					product:null,
-					project:null,
+					iteration:null,
+					testCasedb:null,
                 }, 
 				 
 				dicts:{testPlanTcode:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -263,6 +265,7 @@
 				this.filters.testPlan=this.xmTestPlan
 				this.filters.product=this.xmProduct
 				this.filters.project=this.xmProject
+				this.filters.iteration=this.xmIteration
 				this.filters.testCasedb=this.xmTestCasedb
 				this.searchXmTestPlanCaseUserDist();   
 			}