From 12596734ffb34e91e1bc92453dc7f819bada4f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 8 Jul 2021 21:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmEnvList/XmEnvListMng.vue  |   2 +-
 src/views/xm/core/xmFile/XmFileMng.vue        |   2 +-
 .../xm/core/xmIteration/XmIterationMng.vue    |   2 +-
 .../xm/core/xmIteration/XmIterationSelect.vue |   2 +-
 .../xmIterationMenu/XmIterationMenuMng.vue    |   2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |   2 +-
 src/views/xm/core/xmMenu/XmMenuMngBatch.vue   |   2 +-
 src/views/xm/core/xmMenu/XmMenuSelect.vue     |   2 +-
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   |   4 +-
 .../xm/core/xmMenuPlan/XmMenuPlanMng.vue      |   2 +-
 .../xm/core/xmMenuState/XmMenuStateMng.vue    |   2 +-
 src/views/xm/core/xmProduct/XmProductMng.vue  |   2 +-
 .../xm/core/xmProduct/XmProductSelect.vue     |   2 +-
 .../core/xmProductState/XmProductStateMng.vue |   2 +-
 .../xm/core/xmProject/XmProjectBudgetCost.vue |   4 +-
 src/views/xm/core/xmProject/XmProjectInfo.vue | 306 +++++++-----------
 src/views/xm/core/xmProject/XmProjectList.vue |   2 +-
 .../XmProjectContractMng.vue                  |   2 +-
 .../xmProjectEnvList/XmProjectEnvListMng.vue  |   2 +-
 .../XmProjectGroupFormwork.vue                |   2 +-
 .../XmProjectGroupFormworkMng.vue             |   2 +-
 .../XmProjectGroupStateMng.vue                |   2 +-
 .../XmProjectGroupUserMng.vue                 |   2 +-
 .../XmProjectGroupUserCandidateMng.vue        |   2 +-
 .../xm/core/xmProjectKpi/XmProjectKpiMng.vue  |   2 +-
 .../XmProjectMBudgetCostNouserMng.vue         |   2 +-
 .../XmProjectMBudgetCostUserMng.vue           |   2 +-
 .../XmProjectMCostNouserMng.vue               |   2 +-
 .../XmProjectMCostUserList.vue                |   2 +-
 .../XmProjectMCostUserMng.vue                 |   2 +-
 .../xmProjectPhase/XmProjectPhaseBatch.vue    |   2 +-
 .../core/xmProjectPhase/XmProjectPhaseMng.vue |   2 +-
 .../xmProjectPhase/XmProjectPhaseSelect.vue   |   7 +-
 .../core/xmProjectState/XmProjectStateMng.vue |   2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |   2 +-
 src/views/xm/core/xmRecord/XmRecord.vue       |   2 +-
 src/views/xm/core/xmTask/XmTaskList.vue       |   2 +-
 .../xm/core/xmTask/XmTaskListForMenu.vue      |   2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        |   8 +-
 src/views/xm/core/xmTask/XmTaskMngBatch.vue   |   2 +-
 .../core/xmTaskExecuser/XmTaskExecuserMng.vue |   2 +-
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |   2 +-
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue |   2 +-
 43 files changed, 166 insertions(+), 239 deletions(-)

diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index 77e1ed51..e9f83fe6 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmEnvList xm_env_list-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column prop="ipAddress" label="内网ip地址" min-width="80" ></el-table-column>
 				<el-table-column prop="port" label="内网访问端口" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue
index 67628307..cd7b2de2 100644
--- a/src/views/xm/core/xmFile/XmFileMng.vue
+++ b/src/views/xm/core/xmFile/XmFileMng.vue
@@ -13,7 +13,7 @@
 				</div>
 			</el-menu> 
 			<!--列表 XmFile xm_file-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmFiles" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmFiles" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column prop="name" label="文档标题" ></el-table-column>
 				<el-table-column prop="createUsername" label="创建人" ></el-table-column>
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index a955bbe3..823b1828 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -73,7 +73,7 @@
  		</el-row>
 		<el-row  class="app-container">
 			<!--列表 XmIteration 迭代定义-->
-			<el-table ref="table" :max-height="tableHeight" v-if="!gstcVisible" :data="xmIterationTreeData" row-key="id"  default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" v-if="!gstcVisible" :data="xmIterationTreeData" row-key="id"  default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" aria-disabled width="55"></el-table-column>
 				<el-table-column prop="iterationName" label="迭代名称" min-width="160" show-overflow-tooltip>
 					 <template slot-scope="scope">
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 0fa07db0..af5fbb99 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -2,7 +2,7 @@
 	<section> 
 		<el-row>
 			<!--列表 XmIteration 迭代定义-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmIterationTreeData" row-key="id"  default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmIterationTreeData" row-key="id"  default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
    				<el-table-column prop="iterationName" label="迭代名称" min-width="160" >
 					<template slot="header" slot-scope="scope">
 						<el-row>
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 74fed3fb..f202f559 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -16,7 +16,7 @@
 				</el-row>
 				<el-row class="app-container">
 					<!--列表 XmIterationMenu 迭代定义-->
-					<el-table ref="table" :max-height="tableHeight" :data="xmIterationMenusTreeData"  default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table ref="table" :height="tableHeight" :data="xmIterationMenusTreeData"  default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column  type="selection" width="45"></el-table-column> 
 						<el-table-column prop="menuName" label="故事名称" min-width="140" > 
 							<template slot-scope="scope">
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 69c4e672..99023817 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -90,7 +90,7 @@
 					
 					</el-row>
 					<el-row style="padding-top:12px;">  
-						<el-table  ref="table" :max-height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick">
+						<el-table  ref="table" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick">
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="故事名称" min-width="160" show-overflow-tooltip> 
 								<template slot-scope="scope">
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index f6a2f04d..fadcf16b 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -93,7 +93,7 @@
 			
 			</el-row>
 			<el-row style="padding-top:12px;"> 
-				<el-table ref="table" :max-height="tableHeight" :data="xmMenusTreeData" class="drag-table" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table ref="table" :height="tableHeight" :data="xmMenusTreeData" class="drag-table" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column  type="selection" width="45"></el-table-column>
 					<el-table-column  prop="seqNo"  label="序号" min-width="100">
 						<template slot-scope="scope">
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 443eab93..2555a302 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -90,7 +90,7 @@
 					<el-button   type="primary" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
 				</el-row>
 				<el-row style="padding-top:12px;">
-					<el-table ref="table" :max-height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table ref="table" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
 						<el-table-column prop="menuName" label="故事名称" min-width="140" > 
 							<template slot-scope="scope">
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index df4abfb8..4d73a596 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -14,7 +14,7 @@
 			<el-button  v-if=" batchEditVisible==true "  @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>  
   		</el-row>
 		<el-row class="app-container" v-show="!batchEditVisible">    
-				<el-table ref="table" :max-height="tableHeight" v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table ref="table" :height="tableHeight" v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column sortable type="selection" width="40"></el-table-column>
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
@@ -94,7 +94,7 @@
 				  
 		</el-row>
 		<el-row v-show="batchEditVisible">
-			<el-table :max-height="tableHeight" :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table :height="tableHeight" :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
index 024070e6..dd338aa1 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmMenuPlan 功能计划表,无需前端维护，所有数据由汇总统计得出-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmMenuPlans" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmMenuPlans" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45"></el-table-column>
 				<el-table-column prop="projectId" label="项目编号" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index 0b6c7c99..75fd5524 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -9,7 +9,7 @@
 			<el-button type="primary" v-if=" batchEditVisible==true "  @click="noBatchEdit" v-loading="load.edit">返回</el-button>  
   		</el-row>
 		<el-row class="app-container" v-show="!batchEditVisible">    
-				<el-table ref="table" :max-height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table ref="table" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column sortable type="selection" width="40"></el-table-column>
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index f96ad3ed..f0c01ee3 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -93,7 +93,7 @@
 		</el-row>
 		<el-row  class="app-container"> 
 			<!--列表 XmProduct 产品表-->
-			<el-table ref="table"  :max-height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table"  :height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column   sortable type="selection" width="55"></el-table-column>
 				<el-table-column sortable type="index" width="55"></el-table-column>
  				<el-table-column prop="productName" label="产品名称" min-width="200" show-overflow-tooltip> 
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index ad26f539..895a6350 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -2,7 +2,7 @@
 	<section>  
 		<el-row > 
 			<!--列表 XmProduct 产品表-->
-			<el-table  ref="table" :max-height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  ref="table" :height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				<el-table-column sortable type="index" width="55"></el-table-column>				
 				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
 					 <template slot="header" slot-scope="scope"> 
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index b160833d..8ffab72c 100644
--- a/src/views/xm/core/xmProductState/XmProductStateMng.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue
@@ -6,7 +6,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProductState 功能状态表,无需前端维护，所有数据由汇总统计得出-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProductStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProductStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				<el-table-column sortable type="index" width="45"></el-table-column> 
  				<el-table-column prop="productName" label="产品名称" min-width="80" ></el-table-column> 
 				<el-table-column prop="calcTime" label="汇总时间" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index 79dbbbb1..69b27aca 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -28,7 +28,7 @@
 					</el-option>
 				</el-select> -->
 				<el-table
-					:max-height="tableHeight"
+					:height="tableHeight"
 					v-if="showType == '人力'"
 					:data="sumXmProjectMBudgetCostUsersConvert"
 					highlight-current-row
@@ -56,7 +56,7 @@
 				</el-table>
 
 				<el-table
-					:max-height="tableHeight"
+					:height="tableHeight"
 					v-if="showType == '非人力'"
 					:data="sumXmProjectMBudgetCostNousersConvert" 
 					highlight-current-row
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 928ee0c0..7c7e3574 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -1,71 +1,110 @@
 <template>
 	<section>
-		<el-row class="app-container" > 
-			<div class="project-info" v-loading.lock="load.list || load.edit">
-				<div class="info-type">
-					<el-radio-group v-model="infotype" size="medium"> 
-						<el-radio-button label="项目概览"></el-radio-button> 
-						<el-radio-button label="用户故事"></el-radio-button>
-						<el-radio-button label="任务"></el-radio-button>
-						<el-radio-button label="缺陷"></el-radio-button>
-						<el-radio-button label="阶段计划"></el-radio-button>
-						<el-radio-button label="团队"></el-radio-button>
-						<el-radio-button class="hidden-sm-and-down" label="风险"></el-radio-button>
-						<el-radio-button label="测试计划"></el-radio-button> 
-						<el-radio-button label="文档"></el-radio-button>
-						<el-radio-button label="故事监控"></el-radio-button>
-						<el-radio-button label="项目监控"></el-radio-button> 
-						<el-radio-button class="hidden-sm-and-down" label="考核"></el-radio-button>
-						<el-radio-button class="hidden-md-and-down" label="日志"></el-radio-button>
-						<el-radio-button class="hidden-md-and-down" label="费用"></el-radio-button>
-						<el-radio-button class="hidden-md-and-down" label="预算"></el-radio-button>
-						<el-radio-button class="hidden-lg-and-down" label="合同管理"></el-radio-button>
-						<el-radio-button class="hidden-lg-and-down" label="环境清单"></el-radio-button> 
-					</el-radio-group>
-					<el-popover
-						placement="top-start" 
-						width="400"
-						trigger="click" >
-						<el-row>
-							<el-button type="primary" @click="toArchive" round>论坛</el-button>
-							<el-button type="success" @click="toIm" round>即聊</el-button> 
-							<el-button type="warning" @click="toHelpMe" round>客服</el-button>
-							<el-button type="primary" @click="handleExport" round v-if="exportArr.includes(infotype)">导出</el-button> 
-						</el-row>
-						<el-row style="padding-top:12px;">
-							<el-button class="hidden-md-and-up" @click="setInfotype('考核')">考核</el-button>
-							<el-button class="hidden-lg-and-up" @click="setInfotype('日志')">日志</el-button>
-							<el-button class="hidden-lg-and-up" @click="setInfotype('费用')">费用</el-button>
-							<el-button class="hidden-lg-and-up" @click="setInfotype('预算')">预算</el-button> 
-						</el-row>
-						<el-row style="padding-top:12px;"> 
-							<el-button class="hidden-xl-and-up" @click="setInfotype('合同管理')">合同管理</el-button>
-							<el-button class="hidden-xl-and-up" @click="setInfotype('环境清单')">环境清单</el-button> 
-						</el-row>
-						<el-button type="text" slot="reference" icon="el-icon-d-arrow-right"></el-button>
-					</el-popover>
-				</div>
-				<div class="info-detail">
+		<el-row class="app-container app-height">   
+			<el-tabs :tab-position="tabPosition"  v-model="infotype" @tab-click="handleClick" stretch=true   class="tabs">
+				<el-tab-pane  name="项目概览" class="tab-pannel"> 
+					 <span slot="label"><i class="el-icon-s-data"></i>项目概览</span>
+					<xm-detail v-if="infotype=='项目概览'" :sel-project="selProject" @submit="afterEditSubmit"></xm-detail>
+				</el-tab-pane>
+				<el-tab-pane label="迭代" name="迭代"> 
+					 <span slot="label"><i class="el-icon-document-copy"></i>迭代</span>
+					 <xm-iteration-mng v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject" ></xm-iteration-mng> 
+				</el-tab-pane>
+				<el-tab-pane label="产品" name="产品">
+					 <span slot="label"><i class="el-icon-s-flag"></i>产品</span>
+					 <xm-product-mng v-if="infotype=='产品'" ref="xmProductMng" :sel-project="selProject" ></xm-product-mng> 
+				</el-tab-pane>
+				<el-tab-pane label="故事" name="用户故事">
+					 <span slot="label"><i class="el-icon-document"></i>故事</span>
+					<xm-menu-mng v-if="infotype=='用户故事'" :sel-project="selProject"></xm-menu-mng> 
+
+				</el-tab-pane>
+				<el-tab-pane label="任务" name="任务">
+					 <span slot="label"><i class="el-icon-s-operation"></i>任务</span>
 					<xm-task-mng v-if="infotype=='任务'" ref="xmTaskMng" :sel-project="selProject" ></xm-task-mng>
-					<xm-project-phase-mng v-if="infotype=='阶段计划'" ref="xmProjectPhaseMng" :sel-project="selProject" ></xm-project-phase-mng>
-					<xm-group-mng v-if="infotype=='团队'" :sel-project="selProject"></xm-group-mng>  
-					<xm-question v-if="infotype=='风险'" :qtype="'risk'" :sel-project='selProject' ref="xmRisk"></xm-question>
-					<xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :sel-project='selProject' ref="xmQuestion"></xm-question>
-					<xm-test-case-exec-mng v-if="infotype=='测试计划'" :visible="infotype=='测试计划'"  :sel-project='selProject' ref="xmQuestion"></xm-test-case-exec-mng> 
+
+				</el-tab-pane>
+				<el-tab-pane label="缺陷" name="缺陷">
+					 <span slot="label"><i class="el-icon-question"></i>缺陷</span>
+					 <xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :sel-project='selProject' ref="xmQuestion"></xm-question>
+
+				</el-tab-pane>
+				<el-tab-pane label="团队" name="团队">
+					 <span slot="label"><i class="el-icon-user-solid"></i>团队</span>					
+					 <xm-group-mng v-if="infotype=='团队'" :sel-project="selProject"></xm-group-mng>  
+
+
+				</el-tab-pane>
+				<el-tab-pane label="文档" name="文档">
+					 <span slot="label"><i class="el-icon-document"></i>文档</span>
 					<xm-file-mng v-if="infotype=='文档'" :sel-project="selProject"></xm-file-mng> 
-					<xm-menu-mng v-if="infotype=='用户故事'" :sel-project="selProject"></xm-menu-mng> 
-					<xm-menu-with-plan v-if="infotype=='故事监控'" ref="xmMenuWithPlan" :sel-project="selProject"></xm-menu-with-plan> 
+
+				</el-tab-pane>
+				<el-tab-pane label="阶段计划" name="阶段计划">
+					 <span slot="label"><i class="el-icon-odometer"></i>阶段计划</span>
+					 <xm-project-phase-mng v-if="infotype=='阶段计划'" ref="xmProjectPhaseMng" :sel-project="selProject" ></xm-project-phase-mng>
+
+				</el-tab-pane>
+				<el-tab-pane label="测试计划" name="测试计划">
+					 <span slot="label"><i class="el-icon-odometer"></i>测试计划</span>
+					<xm-test-case-exec-mng v-if="infotype=='测试计划'" :visible="infotype=='测试计划'"  :sel-project='selProject' ref="xmQuestion"></xm-test-case-exec-mng> 
+
+				</el-tab-pane>
+				<el-tab-pane label="故事监控" name="故事监控">
+					 <span slot="label"><i class="el-icon-video-camera"></i>故事监控</span>
+ 					<xm-menu-with-plan v-if="infotype=='故事监控'" ref="xmMenuWithPlan" :sel-project="selProject"></xm-menu-with-plan> 
+
+				</el-tab-pane>
+				<el-tab-pane label="项目监控" name="项目监控">
+					 <span slot="label"><i class="el-icon-video-camera"></i>项目监控</span>
 					<xm-project-state-mng v-if="infotype=='项目监控'" :sel-project="selProject"></xm-project-state-mng> 
-					<xm-detail v-if="infotype=='项目概览'" :sel-project="selProject" @submit="afterEditSubmit"></xm-detail>
-					<xm-project-kpi v-if="infotype=='考核'"  :sel-project="selProject"></xm-project-kpi>
-					<xm-record v-if="infotype=='日志'" :visible="infotype=='日志'" :sel-project="selProject"></xm-record>
-					<xm-cost v-if="infotype=='费用'" :sel-project="selProject"></xm-cost>
+
+				</el-tab-pane>
+				<el-tab-pane label="预算" name="预算">
+					 <span slot="label"><i class="el-icon-coin"></i>预算</span>
 					<xm-budget v-if="infotype=='预算'" :sel-project="selProject"></xm-budget>
+
+				</el-tab-pane>
+				<el-tab-pane label="费用" name="费用">
+					 <span slot="label"><i class="el-icon-coin"></i>费用</span>
+					 <xm-cost v-if="infotype=='费用'" :sel-project="selProject"></xm-cost>
+
+				</el-tab-pane>
+				<el-tab-pane label="考核" name="考核">
+					 <span slot="label"><i class="el-icon-view"></i>考核</span> 
+					 <xm-project-kpi v-if="infotype=='考核'"  :sel-project="selProject"></xm-project-kpi>
+
+				</el-tab-pane> 
+				<el-tab-pane label="日志" name="日志">
+					 <span slot="label"><i class="el-icon-edit-outline"></i>日志</span>
+					<xm-record v-if="infotype=='日志'" :visible="infotype=='日志'" :sel-project="selProject"></xm-record>
+
+				</el-tab-pane>
+				<el-tab-pane label="合同管理" name="合同管理">
+					 <span slot="label"><i class="el-icon-s-data"></i>合同管理</span>
 					<xm-contract v-if="infotype=='合同管理'" :sel-project="selProject"></xm-contract>
-					<xm-env-list v-if="infotype=='环境清单'" :sel-project="selProject"></xm-env-list> 
-				</div>
-			</div> 
-		</el-row>
+
+				</el-tab-pane> 
+				<el-tab-pane label="环境清单" name="环境清单">
+					 <span slot="label"><i class="el-icon-setting"></i>环境清单</span>
+					<xm-env-list v-if="infotype=='环境清单'" :sel-project="selProject"></xm-env-list>  
+				</el-tab-pane> 
+				<el-tab-pane label="风险" name="风险">
+					 <span slot="label"><i class="el-icon-question"></i>风险</span>
+					<xm-question v-if="infotype=='风险'" :qtype="'risk'" :sel-project='selProject' ref="xmRisk"></xm-question>
+				</el-tab-pane> 
+				<el-tab-pane label="论坛" name="论坛">
+					 <span slot="label"><i class="el-icon-date"></i>论坛</span> 
+				</el-tab-pane>
+				<el-tab-pane label="即聊" name="即聊">
+					 <span slot="label"><i class="el-icon-date"></i>即聊</span> 
+				</el-tab-pane>
+				<el-tab-pane label="客服" name="客服">
+					 <span slot="label"><i class="el-icon-date"></i>客服</span>
+
+				</el-tab-pane> 
+			</el-tabs> 
+		</el-row>  
 		
 		<el-dialog title="选中团队成员" :visible.sync="groupUserVisible"  width="50%"  append-to-body   :close-on-click-modal="false">
 			<xm-project-group-select :sel-project="selProject" :visible="groupUserVisible" is-select-multi-user="1" @user-confirm="onUserSelected"></xm-project-group-select>
@@ -100,6 +139,8 @@
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
 	import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';
+	import xmIterationMng from '../xmIteration/XmIterationMng';
+	import xmProductMng from '../xmProduct/XmProductMng';
 
 
 	export default { 
@@ -122,7 +163,8 @@
 		},
 		data() {
 			return { 
-				infotype:"任务",
+				tabPosition:'left',
+				infotype:"项目概览",
 				load:{list:false,edit:false},
         groupUserVisible:false,
         exportArr: ['任务', '阶段计划', '故事监控']
@@ -151,7 +193,9 @@
 						}
 				}); 
 			},
-			
+			handleMenuSelect(menuId){
+				this.infotype=menuId
+			},
 			onUserSelected:function(users){
 				if(this.groupUserVisible==true){
 					var query={}
@@ -312,6 +356,8 @@
 			xmProjectStateMng,
 			xmTestCaseExecMng,
 			xmProjectGroupSelect,
+			xmIterationMng,
+			xmProductMng
 			//在下面添加其它组件
 		},
 		mounted() { 
@@ -322,132 +368,16 @@
 	}
 </script>
 
-<style scoped>
-.app-container{
-	display: flex; 
-	margin-left: 1px;
-	margin-right:1px;
-	padding: 2px;
-	background: #e8edf7;
-}
-.project-handle{
-	height: 820px;
-	display: flex;
-	align-items: center;
-}
-.project-list{
-	padding-left: 10px;
-	width: 310px;
-	min-width: 310px;
-	border-right: 1px solid #efefef;
-	flex-grow: 1;
-}
-.project-search{
-	display: flex;
-	height: 50px;
-	text-align: right;
-	padding: 7px 20px;
-	background: #fafbfc;
-}
-.search-btn{
-	padding: 10px;
-	border-radius: 0;
-	border-left: 0;
-}
-.search-btn-show{
-	color: #3a8ee6;
-	background-color: #ecf5ff;
-	outline: 0;
-}
-.project-show-end{
-	height: 50px;
-	background: skyblue;
-}
-.list{
-	height: 720px;
-	background: #fff;
-	font-size: 14px;
-	color: #666;
-}
-.list-item{
-	padding: 8px 16px;
-}
-.list-item:hover{
-	background: #f7f7f8;
-}
-.list-item:hover .project-btns{
-	display:block;
-
-}
-.item-info{
-	display: flex;
-	align-items: center;
-}
-.item-info>.content{
-	flex-grow: 1;
-}
-.item-info>.content>div:last-child{
-	margin-top: 2px;
-	color: #999;
-	font-size:12px;
-}
-.project-btns{
-	position: absolute;
-	top: 0;
-	right: 0;
-	display:none;
-	flex-grow: 1;
-	font-size: 12px;
-	text-align: right;
-}
-.project-btns>button{
-	padding: 0;
-	font-size: 12px;
-}
-.rate{
-	width: 40px;
-	text-align: right;
-}
-
-
-.show-project{
-	width: 10px;
-}
-.show-project>button{
-	padding-left: 0;
-	padding-right: 0;
-	width: 100%;
-}
-.show-project i{
-	margin-left: -4px;
-	font-size: 16px;
-	font-weight: bold;
-}
-.project-info{
-	width: 100%;
-	flex-grow: 1;
-	/* height: 820px; */
-	background: #fff;
-}
-.info-type{
-	background: #fafbfc;
-	border-bottom: 1px solid #efefef; 
-}
-.info-type>div{
-	padding-left: 10px;
-	line-height: 50px;
-}
-.info-type >>> .el-radio-button__inner{
-	background: transparent;
-	border: 0;
-	box-shadow: 0 0 0 0 !important;
-}
-.info-type .is-active >>> .el-radio-button__inner{
-	color: #409EFF !important;
-	border: 1px solid #409EFF;
+<style scoped> 
+.tabs{  
+	height: calc(98vh);
 }
-.info-detail{
-	 max-height: 100%;
+.tab-pannel{ 
+	overflow: auto;   
+	height: calc(98vh);
+} 
+.app-height{
+	height: calc(100vh);
 }
 /* 超过宽度则用...代替 */
 .truncate{
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index bf1e2c5f..d537a849 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -8,7 +8,7 @@
 			</el-input>
 		</el-row>
 		<el-row class="app-container">   
-			<el-table ref="table" :max-height="tableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"   style="width: 100%;">
+			<el-table ref="table" :height="tableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"   style="width: 100%;">
 				<el-table-column  type="index" label="序号" width="55" ></el-table-column>
 				<el-table-column prop="code" label="项目编号" min-width="80" ></el-table-column>
 				<el-table-column prop="name" label="标题名称" min-width="80" ></el-table-column> 
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index 2c8e22df..b6335f15 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -12,7 +12,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectContract xm_project_contract-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectContracts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectContracts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<!-- ht_contract_card表 -->
 				<el-table-column prop="htSn" label="合同编号" min-width="80" ></el-table-column>
 				<el-table-column prop="htName" label="合同标题" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index 4a9b4725..08521936 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -9,7 +9,7 @@
 		</div>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectEnvList xm_project_env_list-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column prop="ipAddress" label="ip地址" min-width="80" ></el-table-column>
 				<el-table-column prop="port" label="访问端口" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
index 5f988471..071a391b 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
@@ -68,7 +68,7 @@
 				<el-button  v-else @click.stop="setTemplateVisible=false" icon="el-icon-back">返回</el-button>
 
 			</el-row>
-			<el-table ref="groupTable" :max-height="tableHeight" @selection-change="addIsSels" @row-click.self="changesels" :data="convertXmProjectGroupFormworks"  v-loading="load.list">
+			<el-table ref="groupTable" :height="tableHeight" @selection-change="addIsSels" @row-click.self="changesels" :data="convertXmProjectGroupFormworks"  v-loading="load.list">
 				<el-table-column type="selection" aria-disabled width="55"></el-table-column>
 				<el-table-column align="center" prop="groupName" label="小组模板" width="200"></el-table-column>
 				<el-table-column   align="center" label="操作"> 
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
index 3df456e0..cda6980b 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupFormwork xm_project_group_formwork-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupFormworks" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectGroupFormworks" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
index c71abe55..24b7593e 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
@@ -7,7 +7,7 @@
  		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupState 功能状态表,无需前端维护，所有数据由汇总统计得出-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectGroupStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				<el-table-column sortable type="index" width="45"></el-table-column> 
   				<el-table-column prop="groupName" label="团队名称" min-width="80" ></el-table-column>   
 				<el-table-column prop="finishRate" label="总体进度" min-width="80" ></el-table-column>    
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index d5e8ab8f..6f47e8d0 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupUser xm_project_group_user-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupUsers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectGroupUsers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
index 0f2d9704..bb31b386 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
@@ -8,7 +8,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectGroupUserCandidate xm_project_group_user_candidate-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectGroupUserCandidates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectGroupUserCandidates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
index fcdfcf10..2f2a3355 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
@@ -9,7 +9,7 @@
 				</div>
 			</el-menu>  
 			<!--列表 XmProjectKpi xm_project_kpi-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectKpis" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectKpis" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="index" width="40"></el-table-column> 
 				<el-table-column prop="kpiName" label="指标名称" min-width="80" ></el-table-column>
 				<el-table-column prop="minValue" label="正常值范围" min-width="80" >
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
index bc2348f7..d73c03eb 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
@@ -20,7 +20,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMBudgetCostNouser xm_project_m_budget_cost_nouser-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMBudgetCostNousers"     show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectMBudgetCostNousers"     show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="subjectId" label="预算科目编号" min-width="80" >
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
index 5cec2a64..6bfecbad 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
@@ -20,7 +20,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMBudgetCostUser xm_project_m_budget_cost_user-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMBudgetCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectMBudgetCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="60"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="username" label="用户名" min-width="80" >
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
index 6246ae1a..cc91b1f2 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
@@ -19,7 +19,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMCostNouser xm_project_m_budget_cost_nouser-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMCostNousers"     show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectMCostNousers"     show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="subjectId" label="成本科目编号" min-width="80" >
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
index 7d740182..a5b12e95 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
@@ -6,7 +6,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMCostUser xm_project_m_budget_cost_user-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="username" label="用户名" min-width="80" >
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 4000247d..1ec7b1c1 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -21,7 +21,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmProjectMCostUser xm_project_m_budget_cost_user-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectMCostUsers" show-summary @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="60"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>   
 				<el-table-column prop="username" label="用户名" min-width="80" >
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index e4179073..8b6c7880 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -24,7 +24,7 @@
  		</el-row> 
  		<el-row class="app-container" >   
 			<!--列表 XmProjectPhase xm_project_phase-->
-			<el-table ref="table" :max-height="tableHeight" class="drag-table" default-expand-all :summary-method="getSummariesForBatchEdit" :data="projectPhaseTreeData"    :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" class="drag-table" default-expand-all :summary-method="getSummariesForBatchEdit" :data="projectPhaseTreeData"    :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column    type="selection" width="50"></el-table-column>
 				<el-table-column  prop="seqNo" label="序号" width="150">
 					<template  slot-scope="scope">
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 72c7594e..04e427ba 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -50,7 +50,7 @@
  		</el-row> 
  		<el-row class="app-container" v-show="batchEditVisible==false"> 
 			<!--列表 XmProjectPhase xm_project_phase-->
-			<el-table ref="table" :max-height="tableHeight" v-show="!gstcVisible "  default-expand-all :data="projectPhaseTreeData"  :summary-method="getSummariesForNoBatchEdit"  :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" v-show="!gstcVisible "  default-expand-all :data="projectPhaseTreeData"  :summary-method="getSummariesForNoBatchEdit"  :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column   sortable type="selection" width="40"></el-table-column>
  				<el-table-column prop="phaseName" label="阶段名称" min-width="150" show-overflow-tooltip> 
 					 <template slot-scope="scope">  
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 20d2dd71..f76315bd 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>  
 		<el-row>
-		<el-table :max-height="tableHeight" ref="selectPhaseTable" :data="projectPhaseTreeData"    :show-summary="false"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+		<el-table :height="tableHeight" ref="selectPhaseTable" :data="projectPhaseTreeData"    :show-summary="false"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  			<el-table-column prop="phaseName" label="阶段名称" min-width="160" show-overflow-tooltip> 
 				 <template slot="header" slot-scope="scope">
 					<div>阶段  <el-tag size="mini" v-if="editForm.id" closable @close="clearSelectPhase()"> {{editForm.phaseName}}</el-tag></div>
@@ -11,7 +11,8 @@
 				</template>
 			</el-table-column>   
 		</el-table>
-		<el-pagination    class="hidden-md-and-down"   layout=" sizes,  prev, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+ 		<el-pagination    class="hidden-md-and-down"   layout="   prev,sizes, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+		
 		</el-row>
 	</section>
 </template>
@@ -418,7 +419,7 @@
        
 			this.$nextTick(() => {
 				var clientRect=this.$refs.selectPhaseTable.$el.getBoundingClientRect();
-				var subHeight=150/1000 * window.innerHeight; 
+				var subHeight=70/1000 * window.innerHeight; 
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.selectPhaseTable.$el.offsetTop-subHeight; 
 				if(this.selProject){
 					this.getXmProjectPhases();
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index 09c33340..f08a916b 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -13,7 +13,7 @@
 		</el-row> 
 		<el-row class="app-container"> 
 			<!--列表 XmProjectState 项目指标日统计表-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmProjectStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmProjectStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45">  </el-table-column> 
 				<el-table-column   type="expand" width="45">
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 684c9419..e7d8b1d5 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -123,7 +123,7 @@
 			 </el-row>
 			 <el-row class="app-container">
 				<!--列表 XmQuestion xm_question-->
-				<el-table ref="table" :max-height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table ref="table" :height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column sortable type="index" width="45"></el-table-column> 
 					<el-table-column prop="name" label="缺陷名称"  min-width="200" show-overflow-tooltip> 
 						<template slot-scope="scope">
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 078f1ec5..c2887158 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -7,7 +7,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmRecord xm_record-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmRecords" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmRecords" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="projectId" label="项目编号" v-if="!simple" min-width="80" ></el-table-column>  
 				<el-table-column prop="taskId" label="对象主键编号" v-if="!simple" min-width="80" ></el-table-column> 
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 3c32800f..7c5c0846 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -46,7 +46,7 @@
 							default-expand-all 
 							:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 							row-key="id"
-							 :max-height="tableHeight"
+							 :height="tableHeight"
 							>
 							<el-table-column v-show="isMultiSelect" reserve-selection sortable width="70" type="selection"></el-table-column>
 							<el-table-column prop="name" label="任务名称"  min-width="260" show-overflow-tooltip>
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index d518b8fb..79f5fc3a 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -20,7 +20,7 @@
 						default-expand-all
 						:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 						row-key="id"
-						 :max-height="tableHeight"
+						 :height="tableHeight"
 						 ref="table"
 						>
  						<el-table-column v-show="isMultiSelect" sortable width="60" type="selection"></el-table-column>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 97e352b8..16fff0e5 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -132,8 +132,7 @@
 							tooltip-effect="light"
 							size="mini"
 							default-expand-all
-							:max-height="tableHeight"
-							:height="tableHeight"
+							:height="tableHeight" 
 							:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 							row-key="id"
 							ref="table"
@@ -1772,10 +1771,7 @@ XmProjectGroupSelect,XmProductSelect
 				debugger
 				this.getXmTasks();     
 				var clientRect=this.$refs.table.$el.getBoundingClientRect(); 
-				var subHeight=140/1000 * window.innerHeight;
-				if(this.isTaskCenter){
-					subHeight=50/1000 * window.innerHeight;
-				}
+				var subHeight=50/1000 * window.innerHeight; 
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				// 监听窗口大小变化
 				/**
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index 1fd35c98..b5da3f8f 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -17,7 +17,7 @@
 						<!-- show-summary -->
 					<el-table
 						ref="table"
-						:max-height="tableHeight"
+						:height="tableHeight"
           				show-summary
             			class="drag-table2"
 						:data="tasksTreeData"
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 42affd6a..c1a476ff 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -9,7 +9,7 @@
 		</div>
 		<el-row class="app-container"> 
 			<!--列表 XmTaskExecuser xm_task_execuser-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column> <!-- :selectable="checkSelectable" -->
 				<el-table-column sortable type="index" width="40"></el-table-column>
 				<el-table-column type="expand">
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 614a7f06..1a3c4947 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -68,7 +68,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmTestCase 测试用例-->
-			<el-table ref="table" :max-height="tableHeight" :data="xmTestCases" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="tableHeight" :data="xmTestCases" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45"></el-table-column>
 				<el-table-column prop="caseName" label="标题" min-width="100" show-overflow-tooltip>
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 3cd7c14e..c9fe1ae3 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -78,7 +78,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmTestCaseExec xm_test_case_exec-->
-			<el-table ref="table"  :max-height="tableHeight" v-if="!gstcVisible" :data="xmTestCaseExecs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table"  :height="tableHeight" v-if="!gstcVisible" :data="xmTestCaseExecs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45"></el-table-column>
  				<el-table-column prop="projectName" label="项目名称" min-width="100" show-overflow-tooltip>