From ee72cca731d93c0390e95c5add9d3c3615414a9f 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, 6 Feb 2023 19:14:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routes_xm.js                       |  2 +
 src/views/xm/core/xmTestPlan/Detail.vue       | 46 +++++++++++++++++++
 src/views/xm/core/xmTestPlan/Overview.vue     |  6 +--
 .../xm/core/xmTestPlan/XmTestPlanInfo.vue     | 13 +++---
 .../xmTestPlan/XmTestPlanListForProject.vue   | 16 ++++---
 .../xm/core/xmTestPlan/XmTestPlanMng.vue      | 12 ++++-
 6 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 src/views/xm/core/xmTestPlan/Detail.vue

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index ba6581eb..07573c18 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -640,6 +640,8 @@ export default {
         { path: 'case', component: _import('xm/core/xmTestCase/XmTestCaseList'), name: 'testCase', meta: { title: '用例管理',roles:["user"] },hidden:true},
         { path: 'flow', component: _import('xm/core/xmTestCase/XmTestCaseFlow'), name: 'testFlow', meta: { title: '用例评审',roles:["user"] },hidden:true},
         { path: 'plan', component: _import('xm/core/xmTestPlan/Overview'), name: 'testPlan', meta: { title: '测试计划',roles:["user"] },hidden:true},
+        { path: 'plan/detail', component: _import('xm/core/xmTestPlan/Detail'), name: 'testPlanDetail', meta: { title: '测试计划明细',roles:["user"] },hidden:true},
+
         { path: 'group', component: _import('xm/core/xmGroup/XmGroupForTest'), name: 'testGroup', meta: { title: '团队',roles:["user"] },hidden:true},
         { path: 'rpt', component: _import('xm/rpt/index/indexForTest'), name: 'testRpt', meta: { title: '统计分析',roles:["user"] },hidden:true},
 
diff --git a/src/views/xm/core/xmTestPlan/Detail.vue b/src/views/xm/core/xmTestPlan/Detail.vue
new file mode 100644
index 00000000..3897dada
--- /dev/null
+++ b/src/views/xm/core/xmTestPlan/Detail.vue
@@ -0,0 +1,46 @@
+<template>
+	<section>
+		 <xm-test-plan-info  v-if="xmTestPlan && xmTestPlan.id" :xm-test-casedb="testCasedb" :xm-test-plan="xmTestPlan"></xm-test-plan-info>
+	</section>
+</template>
+
+<script>  
+	import { mapGetters } from 'vuex'; 
+	import XmTestPlanInfo from './XmTestPlanInfo'
+
+	export default {  
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles','testCasedb'
+				]), 
+		}, 
+		watch:{
+			 
+		},
+		data() {
+			return {  
+				xmTestPlan:null,
+			}
+		},//end data
+		methods: {  
+			  
+		},//end methods
+		components: {  
+			XmTestPlanInfo,
+			//在下面添加其它组件
+		},  
+		mounted() {   
+			var planId=this.$route.query.id
+			if(planId){ 
+				var key="xm-test-plan-info-"+planId
+				var str=sessionStorage.getItem(key)
+				if(str && str!='null' && str!='undefined'){
+					this.xmTestPlan=JSON.parse(str)
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped> 
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTestPlan/Overview.vue b/src/views/xm/core/xmTestPlan/Overview.vue
index 3cb31c35..81fbd339 100644
--- a/src/views/xm/core/xmTestPlan/Overview.vue
+++ b/src/views/xm/core/xmTestPlan/Overview.vue
@@ -1,12 +1,12 @@
 <template>
 	<section>
-		 <xm-test-plan-info v-if="testCasedb&&testCasedb.id" :xm-test-casedb="testCasedb"></xm-test-plan-info>
+		 <xm-test-plan-mng v-if="testCasedb&&testCasedb.id" :xm-test-casedb="testCasedb"></xm-test-plan-mng>
 	</section>
 </template>
 
 <script>  
 	import { mapGetters } from 'vuex'; 
-	import XmTestPlanInfo from './XmTestPlanInfo'
+	import XmTestPlanMng from './XmTestPlanMng'
 
 	export default {  
 		computed: {
@@ -25,7 +25,7 @@
 			  
 		},//end methods
 		components: {  
-			XmTestPlanInfo,
+			XmTestPlanMng,
 			//在下面添加其它组件
 		},  
 		mounted() {   
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index a134f74e..c1613d75 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -4,9 +4,9 @@
             
         </el-row>
 		<el-row>
-            <el-row v-if="activeIndex=='testPlanCase'&& xmTestPlan && xmTestPlan.id">
+            <el-row v-if=" xmTestPlan && xmTestPlan.id">
                 <el-row class="border padding-left padding-right">
-                     <el-button icon="el-icon-back" @click="activeIndex='testPlan'" type="text"></el-button>
+                     <el-button icon="el-icon-back" @click="goBackToPlanList()" type="text"></el-button>
                      <el-divider direction="vertical"></el-divider>
                      {{xmTestPlan.name}}
                      <el-divider direction="vertical"></el-divider>
@@ -47,8 +47,7 @@
                      <xm-rpt key="xmRpt"  ref="xmRpt" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}"  category="测试计划级"></xm-rpt >
                 </el-row>
             </el-row> 
-            <xm-test-plan-mng v-else @select="onTestPlanSelect" :xm-test-casedb="xmTestCasedb"> </xm-test-plan-mng>
-        </el-row>     
+         </el-row>     
 	</section>
 </template>
 
@@ -72,7 +71,7 @@ export default {
         "xm-test-case-mng":()=>import("../xmTestCase/XmTestCaseMng.vue"),
         "xm-test-plan-case-mng":()=>import("../xmTestPlanCase/XmTestPlanCaseMng.vue")
     },
-    props:['visible','xmTestCasedb'],
+    props:['visible','xmTestCasedb','xmTestPlan'],
     computed: {
         ...mapGetters(['userInfo']),
         calcProgress(){
@@ -132,7 +131,6 @@ export default {
                 testPlanStatus:[],
              },
             activeIndex:'testPlan',//testPlanCase,testPlan
-            xmTestPlan:null,
             subPage:'testPlanCase',//testPlanCase,testBug
         }
     },//end data
@@ -161,6 +159,9 @@ export default {
                     })
                 }
             }) 
+        },
+        goBackToPlanList(){
+            this.$router.go(-1);
         }
  
     },//end methods
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue b/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue
index 58be716c..a46144cc 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue
@@ -196,13 +196,15 @@ export default {
             this.visible=true
         },
         select(row){ 
-			this.$route.push({
-				path:'/xm/core/test/plan',
-				query:{
+			var key="xm-test-plan-info-"+row.id
+            sessionStorage.setItem(key,JSON.stringify(row))
+            this.$router.push({
+                path:'/xm/core/test/plan/detail',
+                query:{
 					casedbId:row.casedbId,
-					id:row.id
-				}
-			})
+                    id:row.id
+                }
+            })
         }
 
     },//end methods
@@ -210,7 +212,7 @@ export default {
         this.$nextTick(() => {
             initDicts(this);
             this.initData()
-            //this.searchXmTestPlans();
+            this.searchXmTestPlans();
             this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTestPlanTable.$el)
 
         });
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index eb2f9f55..b98fa5d5 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -337,8 +337,16 @@ export default {
         initData: function(){
 
         },
-        goToTestPlanCase(row){ 
-            this.$emit('select',row);//  @row-click="rowClick"
+        goToTestPlanCase(row){  
+			var key="xm-test-plan-info-"+row.id
+            sessionStorage.setItem(key,JSON.stringify(row))
+            this.$router.push({
+                path:'/xm/core/test/plan/detail',
+                query:{
+					casedbId:row.casedbId,
+                    id:row.id
+                }
+            })
         },
         calcXmTestPlan(row){
             calcXmTestPlan({id:row.id}).then(res=>{