From fc15c02556a124f8b0a5f7f31083ebae772f3a84 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, 16 Jan 2023 02:26:40 +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

---
 src/router/routes_xm.js                       | 14 +---
 src/views/xm/core/xmMyFocus/XmMyFocusList.vue |  4 +-
 .../xm/core/xmProduct/XmProductInfoRoute.vue  | 84 -------------------
 .../xm/core/xmProduct/XmProductOverview.vue   |  3 +-
 .../xmProduct/XmProductOverviewComplex.vue    | 14 ++--
 .../xm/core/xmProduct/XmProductTplMng.vue     |  2 +-
 src/views/xm/core/xmProduct/index.vue         |  9 +-
 .../XmProductProjectLinkMng.vue               |  4 +-
 .../xm/core/xmProject/XmProjectOverview.vue   |  2 +-
 .../xmProject/XmProjectOverviewComplex.vue    |  2 +-
 src/views/xm/core/xmProject/index.vue         |  4 +-
 11 files changed, 24 insertions(+), 118 deletions(-)
 delete mode 100644 src/views/xm/core/xmProduct/XmProductInfoRoute.vue

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 4dcff7b3..b4bc2eb7 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -488,19 +488,7 @@ export default {
           { path: 'xmIteration/XmIterationMng', component: _import('xm/core/xmIteration/XmIterationMng'), name: 'XmIterationMng', meta: { title: '迭代管理',roles:["user"] }},
          
       ]
-    }, 
-    
-    {
-      path: '/xm/core/xmProduct/XmProductInfoRoute',
-      component: _import('xm/core/xmProduct/XmProductInfoRoute'),
-      name: 'XmProductInfoRoute',
-      iconCls: 'fa el-icon-menu',
-      meta: {
-        title: '产品管理-如有跳转',
-        icon: 'product',roles:["user"]
-      },
-      hidden:true
-    },
+    },  
     {
       path: '/xm/core/xmIteration/XmIterationInfoRoute',
       component: _import('xm/core/xmIteration/XmIterationInfoRoute'),
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusList.vue b/src/views/xm/core/xmMyFocus/XmMyFocusList.vue
index 41a99640..cdd07cd7 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusList.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusList.vue
@@ -215,9 +215,9 @@ export default {
          */
         toBizPage(bizObj){
             if(bizObj.focusType=='1'){
-                this.$router.push({path:'/xm/core/xmProject/XmProjectInfoRoute',query:{id:bizObj.bizId}})
+                this.$router.push({path:'/xm/core/project/overview',query:{projectId:bizObj.bizId}})
             }else if(bizObj.focusType=='3'){
-                 this.$router.push({path:'/xm/core/xmProduct/XmProductInfoRoute',query:{id:bizObj.bizId}})
+                 this.$router.push({path:'/xm/core/product/overview',query:{productId:bizObj.bizId}})
             }else if(bizObj.focusType=='2'){
                  this.$router.push({path:'/xm/core/xmTask/XmTaskDetailRoute',query:{id:bizObj.bizId}})
             }else if(bizObj.focusType=='4'){
diff --git a/src/views/xm/core/xmProduct/XmProductInfoRoute.vue b/src/views/xm/core/xmProduct/XmProductInfoRoute.vue
deleted file mode 100644
index e6abfff4..00000000
--- a/src/views/xm/core/xmProduct/XmProductInfoRoute.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-	<section>
-		 <xm-product-info v-if="xmProduct" :xm-product="xmProduct" :visible="showInfo" @edit-fields="onEditFields"></xm-product-info>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	 
-	import {  listXmProductWithState } from '@/api/xm/core/xmProduct';
-	import { mapGetters } from 'vuex'; 
-	import XmProductInfo from './XmProductInfo'
-
-	export default {  
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-				]), 
-		}, 
-		watch:{
-			 
-		},
-		data() {
-			return { 
-				 xmProduct:null,
-				 showInfo:false,
-			}
-		},//end data
-		methods: { 
-			 
-			 
-			 initByQueryId(){
-				 if(this.$route.query && this.$route.query.id){
-					var localStorageProduct=localStorage.getItem("xm-product-info-route")
-					var product=null;
-					if(localStorageProduct  && localStorageProduct!='undefined'){
-						product=JSON.parse(localStorageProduct)
-						if(product && product.id==this.$route.query.id){
-							this.xmProduct=product
-							this.showInfo=true;
-						}else{
-							this.getProduct(this.$route.query.id);
-						}
-					}else{
-						this.getProduct(this.$route.query.id);
-					} 
-				} 
-			 },
-			 getProduct(id){
-				 listXmProductWithState({id:id}).then(res=>{
-					 var tips = res.data.tips;
-					 if(tips.isOk){
-						 this.xmProduct=res.data.data[0]
-						 localStorage.setItem("xm-product-info-route",JSON.stringify(this.xmProduct)) 
-						this.showInfo=true;
-					 }else{
-
-					 }
-				 })
-			 },
-			 
-
-			onEditFields(row) {
-				Object.assign(this.xmProduct, row);
-				localStorage.setItem("xm-product-info-route",JSON.stringify(this.xmProduct)) 
-				this.$emit("edit-fields", row);
-			},
-			
-		},//end methods
-		components: {  
-			XmProductInfo,
-			//在下面添加其它组件
-		}, 
-		activated(){
-			this.initByQueryId();
-		},
-		mounted() {  
-			  this.initByQueryId();
-		}
-	}
-</script>
-
-<style scoped> 
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
index 835eb3d7..71b2723f 100644
--- a/src/views/xm/core/xmProduct/XmProductOverview.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <section >
-    <el-row ref="pageMainRef" :style="{overflowX:'hidden',height:maxTableHeight+'px'}" > 
+    <el-row class="page-main" ref="pageMainRef" :style="{overflowX:'hidden',height:maxTableHeight+'px'}" > 
       <el-row :gutter="10" style="margin-bottom:10px">
           <el-col :span="8" >
             <el-card class="box-card" style="padding:0px ;height:425px">
@@ -581,6 +581,7 @@ export default {
   mounted() {
 			
     this.$nextTick(() => {
+      debugger;
       this.maxTableHeight=util.calcTableMaxHeight(this.$refs.pageMainRef.$el)
     });
 			initSimpleDicts('all',['xmProductPstatus'] ).then(res=>{
diff --git a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
index bf624298..9a348621 100644
--- a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
@@ -1,10 +1,9 @@
 <template>
-  <section class="padding-left padding-right">
+  <section class="page-container padding-left padding-right">
     <el-row ref="pageBody">
         <el-col
           :span="4"
-          class="padding border"
-          :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"
+          class="padding border" :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"
         >
           <h4 class="padding-bottom">常用功能导航</h4>
           <el-steps
@@ -217,7 +216,8 @@
         </el-menu-item> 
 
         </el-menu>
-        <xm-product-overview  v-if="showPanelName=='overview'" :xm-product="xmProduct"></xm-product-overview>
+
+        <xm-product-overview  v-if="showPanelName=='overview' && xmProduct && xmProduct.id" :xm-product="xmProduct"></xm-product-overview>
         <xm-product-edit  v-if="showPanelName=='detail'" :xm-product="xmProduct"></xm-product-edit>
         <xm-iteration-link-for-product v-if="showPanelName=='iterationProductLink'" :xm-product="xmProduct"></xm-iteration-link-for-product>
         <xm-product-project-link-mng  v-if="showPanelName=='productProjectLink'" :xm-product="xmProduct"></xm-product-project-link-mng>
@@ -417,11 +417,11 @@ export default {
   },
 
   mounted() {
-    initDicts(this)
-    this.$nextTick(() => {
-      
+    
+    this.$nextTick(() => { 
       this.maxTableHeight  = util.calcTableMaxHeight(this.$refs.pageBody.$el);
     });
+    initDicts(this)
   },
 
 };
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 8f09644d..4304ab71 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -304,7 +304,7 @@
 			//进入info界面
 			intoInfo(row) {
 				this.editForm = row;
-				this.$router.push({ name:'XmProductInfoRoute', params: row })
+				this.$router.push({ name:'productOverview', query: {productId:row.id} })
 				//this.showInfo = true;
 			},
 			//选择行xmProduct
diff --git a/src/views/xm/core/xmProduct/index.vue b/src/views/xm/core/xmProduct/index.vue
index 2d9116a9..3e6911a0 100644
--- a/src/views/xm/core/xmProduct/index.vue
+++ b/src/views/xm/core/xmProduct/index.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
-    <top-nav/> 
-    <keep-alive><router-view></router-view></keep-alive> 
+    <top-nav v-if="xmProduct&&xmProduct.id"/> 
+    <keep-alive><router-view v-if="xmProduct && xmProduct.id"></router-view></keep-alive> 
   </section>
 </template>
 
@@ -12,7 +12,7 @@ import util from "@/common/js/util"; //全局公共库
 import { mapGetters } from "vuex"; 
 import topNav from './top-nav.vue' 
 import store from '@/store' 
-import { listXmProduct } from '@/api/xm/core/xmProduct'; 
+import { listXmProductWithState } from '@/api/xm/core/xmProduct'; 
 
 export default { 
   computed: {
@@ -31,12 +31,13 @@ export default {
     //在下面添加其它组件
   }, 
   mounted() {   
+    debugger;
     if(!this.$route.query.productId){
       this.$message.error("地址不合规")
       this.$route.back(-1)
     }
     if(!this.xmProduct||this.xmProduct.id!=this.$route.query.productId){  
-      listXmProduct({id:this.$route.query.productId}).then(res=>{
+      listXmProductWithState({id:this.$route.query.productId}).then(res=>{
         var tips = res.data.tips;
         if(tips.isOk ){
           if( res.data.data.length==1){
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
index ff598692..1ffcfbf9 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
@@ -304,10 +304,10 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
           },
 			
 			goToProject(row){
-				this.$router.push({path:'/xm/core/xmProject/XmProjectInfoRoute',query:{id:row.projectId}})
+				this.$router.push({path:'/xm/core/project/overview',query:{projectId:row.projectId}})
 			},	
 			goToProduct(row){
-				this.$router.push({path:'/xm/core/xmProduct/XmProductInfoRoute',query:{id:row.productId}})
+				this.$router.push({path:'/xm/core/product/overview',query:{productId:row.productId}})
 			},	
 			/**end 自定义函数请在上面加**/
 			
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index ae15a4a8..238ba74c 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <section>
-    <el-row class="page-main " :style="{overflowX: 'hidden',height:maxTableHeight+'px'}" ref="table"> 
+    <el-row class="page-main" :style="{overflowX: 'hidden',height:maxTableHeight+'px'}" ref="table"> 
       <el-row :gutter="10" style="margin-bottom:10px">
           <el-col :span="8" >
             <el-card class="box-card" style="padding:0px ;height:425px">
diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
index 5db8cf07..2e5512a1 100644
--- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="page-container  padding-left padding-right">
     <el-row ref="pageBody">
-      <el-col :span="4" class="padding border" :style="{maxHeight:maxTableHeight+'px',overflowY:'auto'}">
+      <el-col :span="4" class="padding border" :style="{height:maxTableHeight+'px',overflowY:'auto'}">
       <h4 class="padding-bottom">常用功能快捷导航</h4>
         <el-steps :active="calcProjectStatusStep" finish-status="success" direction="vertical">
           <el-step
diff --git a/src/views/xm/core/xmProject/index.vue b/src/views/xm/core/xmProject/index.vue
index 83f5a40e..68a89353 100644
--- a/src/views/xm/core/xmProject/index.vue
+++ b/src/views/xm/core/xmProject/index.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
-    <top-nav/> 
-    <keep-alive><router-view></router-view></keep-alive> 
+    <top-nav v-if="projectInfo && projectInfo.id"/> 
+    <keep-alive><router-view v-if="projectInfo && projectInfo.id"></router-view></keep-alive> 
   </section>
 </template>