From 353388bbfcfa606d8504fe13569368ba375c2ef8 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, 29 Apr 2021 04:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=9B=BA=E5=AE=9A=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmIteration/XmIterationMng.vue    |  6 +++--
 .../xmIterationMenu/XmIterationMenuMng.vue    |  6 +++--
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  6 +++--
 src/views/xm/core/xmMenu/XmMenuSelect.vue     | 23 +++++++++++--------
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   |  4 +++-
 .../core/xmMenuExchange/XmMenuExchangeMng.vue |  3 ++-
 .../xm/core/xmMenuState/XmMenuStateMng.vue    |  2 ++
 src/views/xm/core/xmProduct/XmProductMng.vue  |  6 +++--
 .../xm/core/xmProduct/XmProductSelect.vue     | 17 ++++++--------
 src/views/xm/core/xmProject/XmProjectInfo.vue | 12 ++++++----
 src/views/xm/core/xmProject/XmProjectList.vue |  1 +
 src/views/xm/core/xmProject/XmProjectMng.vue  | 11 ++++++---
 .../xmProjectPhase/XmProjectPhaseBatch.vue    |  2 ++
 .../core/xmProjectPhase/XmProjectPhaseMng.vue | 11 +++++----
 .../xmProjectPhase/XmProjectPhaseSelect.vue   |  8 ++++---
 .../core/xmProjectState/XmProjectStateMng.vue |  2 +-
 .../xm/core/xmQuestion/XmQuestionAdd.vue      |  2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  6 ++++-
 src/views/xm/core/xmRecord/XmRecord.vue       |  5 ++--
 src/views/xm/core/xmTask/XmTaskAdd.vue        |  2 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue       |  2 +-
 src/views/xm/core/xmTask/XmTaskList.vue       |  4 +++-
 .../xm/core/xmTask/XmTaskListForMenu.vue      |  4 +++-
 .../xm/core/xmTask/XmTaskListForProduct.vue   |  4 +++-
 src/views/xm/core/xmTask/XmTaskMng.vue        | 14 ++++++-----
 src/views/xm/core/xmTask/XmTaskMngBatch.vue   |  2 ++
 .../xm/core/xmTestCase/XmTestCaseAdd.vue      |  2 +-
 .../xm/core/xmTestCase/XmTestCaseEdit.vue     |  2 +-
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |  6 +++--
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue |  6 +++--
 30 files changed, 115 insertions(+), 66 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 9336ac8a..88802d7d 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -11,7 +11,7 @@
  		</el-row>
 		<el-row v-if="!simple" class="app-container"> 
 			<!--列表 XmIteration 迭代定义-->
-			<el-table max-height="750" 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  :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-column type="selection" aria-disabled width="55"></el-table-column> 
 				<el-table-column prop="iterationName" label="迭代名称" min-width="160" >
 					 <template slot-scope="scope">  
@@ -62,7 +62,7 @@
 		
 		<el-row v-if="simple "> 
 			<!--列表 XmIteration 迭代定义-->
-			<el-table max-height="750" :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  :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-column prop="iterationName" label="迭代名称" min-width="160" >
 					<template slot="header" slot-scope="scope">
 						迭代名称 <el-tag size="mini" v-if="editForm.iterationName" closable @close="clearSelectIteration()">{{editForm.seqNo}}&nbsp;{{editForm.iterationName}}</el-tag>
@@ -149,6 +149,7 @@
 				parentIteration:null,
         iterationStateVisible:false,
         gstcVisible:false,
+		tableHeight:500,
         ganrrColumns: {
           children: 'children',
           name: 'iterationName',
@@ -400,6 +401,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmIterations();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index b5543e0f..19c8ceb2 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 max-height="750" :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  :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-column  type="selection" width="45"></el-table-column> 
 						<el-table-column prop="menuName" label="故事名称" min-width="140" > 
 							<template slot-scope="scope">
@@ -32,7 +32,7 @@
 					<el-pagination  layout="total, sizes, prev, pager, 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>
 			</el-col> 
-			<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+			<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen   :close-on-click-modal="false">
 				<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''"  @menus-selected="onSelectedMenus" ></xm-menu-select>
 			</el-dialog>
 		</el-row>
@@ -91,6 +91,7 @@
 				},
 				iteration:null,
 				menuVisible:false,
+				tableHeight:500,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -322,6 +323,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmIterationMenus();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index e511f8f8..13a2799e 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -42,7 +42,7 @@
 					
 					</el-row>
 					<el-row v-show="batchEditVisible" class="app-container"> 
-						<el-table max-height="650" :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  :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-column sortable type="selection" width="45"></el-table-column>
 							<el-table-column sortable prop="seqNo"  label="序号" min-width="100">
 								<template slot-scope="scope">
@@ -87,7 +87,7 @@
 						
 					</el-row>
 					<el-row v-show="!batchEditVisible" class="app-container">
-						<el-table  max-height="700" :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   :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-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="故事名称" min-width="140" > 
 								<template slot-scope="scope">
@@ -301,6 +301,7 @@
 				taskListForMenuVisible:false,
 				iterationVisible:false,
 				userSelectVisible:false,
+				tableHeight:500,
  				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -1041,6 +1042,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmMenus();
           }); 
       // 阻止默认行为
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index e2f8437f..672553d6 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -2,21 +2,21 @@
 	<section>
 		
 		
-		<el-row>  
-			<el-col  :span="6"  class="app-container">
+		<el-row class="top">  
+			<el-col  :span="6"  >
 				<xm-product-mng @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-mng>
 			</el-col>
-			<el-col :span="18" >
-				<el-row  class="app-container">  
+			<el-col :span="18"  style="padding-left:12px;" >
+				<el-row  >  
 					<el-input v-model="filters.key" style="width: 30%;" placeholder="模糊查询">
 						<template slot="append">
 							<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
 						</template>
 					</el-input>  
-					<el-button   type="warning" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
+					<el-button   type="primary" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
 				</el-row>
-				<el-row class="app-container">
-					<el-table max-height="750" :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-row style="padding-top:12px;">
+					<el-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-column v-if="multi" type="selection" width="50"></el-table-column>  
 						<el-table-column prop="menuName" label="故事名称" min-width="140" > 
 							<template slot-scope="scope">
@@ -118,7 +118,7 @@
 				},
  				menuDetailVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -266,7 +266,8 @@
 		},
 		mounted() {  
 			this.$nextTick(() => {
-				this.getXmMenus();
+				this.getXmMenus(); 
+            	this.tableHeight = window.innerHeight - 250; 
         	}); 
 		}
 	}
@@ -274,5 +275,7 @@
 </script>
 
 <style scoped>
-
+.top{
+	margin-top:-30px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 2e03b9f8..f16fcea6 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 max-height="650" 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  :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-column sortable type="selection" width="40"></el-table-column>
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
@@ -205,6 +205,7 @@
 				menuDetailVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 				gstcVisible:false,
+				tableHeight:500,
 				ganrrColumns: {
           children: 'children',
           name: 'menuName',
@@ -488,6 +489,7 @@
 		},
 		mounted() {  
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmMenus();
 			}); 
 				listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
index a0584cc1..535baa3c 100644
--- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
+++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
@@ -52,7 +52,7 @@
 
 			</div>
 			
-		<el-dialog append-to-body title="故事选择" :visible.sync="xmMenuVisible" width="80%"    :close-on-click-modal="false">
+		<el-dialog append-to-body title="故事选择" :visible.sync="xmMenuVisible" fullscreen   :close-on-click-modal="false">
 			<xm-menu-select :is-select-menu="true"  @selected="onMenuSelected"></xm-menu-select>
 		</el-dialog>
 		</el-row>
@@ -115,6 +115,7 @@
 					menuId:'',menuName:'',productId:'',remark:'',id:'',pid:'',cuserid:'',cusername:'',ctime:'',cbranchId:'',adopt:'',adoptUserid:'',adoptUsername:'',adoptTime:'',closed:'',puserid:'',pusername:'',premark:'',notifyUserids:'',notifyChannels:'',notifyUsernames:'',cuserHeadImg:'',replyType:''
 				},
 				xmMenuVisible:false,
+				tableHeight:500,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index beff3427..43a83505 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -191,6 +191,7 @@
 				valueChangeRows:[],
 				selGroups:null,
 				menuDetailVisible:false,
+				tableHeight:500,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -455,6 +456,7 @@
 		},
 		mounted() {  
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmMenus();
 			}); 
 				listOption([{categoryId:'all',itemCode:'xmMenuStateStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 2c16e4b9..0dea0c04 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -13,7 +13,7 @@
 		</el-row>
 		<el-row  class="app-container"> 
 			<!--列表 XmProduct 产品表-->
-			<el-table  max-height="750" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-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-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="150" > 
@@ -84,7 +84,7 @@
 				title="产品关联的迭代查询"
 				:visible.sync="iterationVisible"
 				 >
-					<xm-iteration-mng :simple="true" :product-id="editForm.id" ></xm-iteration-mng>
+					<xm-iteration-mng :simple="true" :visible="iterationVisible" :product-id="editForm.id" ></xm-iteration-mng>
 			</el-dialog>
 	</section>
 </template>
@@ -140,6 +140,7 @@
 				},
 				iterationVisible:false,
 				productStateVisible:false,
+				tableHeight:500,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -336,6 +337,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmProducts();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index ca27d236..b1785f78 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -2,17 +2,12 @@
 	<section>  
 		<el-row > 
 			<!--列表 XmProduct 产品表-->
-			<el-table  max-height="650" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-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-column sortable type="index" width="55"></el-table-column>				
 				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
-					 <template slot="header" slot-scope="scope">
-						 <div>
-						 产品名称 <el-input v-model="filters.key" style="width:60%;" placeholder="按产品名称模糊搜索">
-							 <template slot="append">
-							 <el-button icon="el-icon-search" @click="searchXmProducts"></el-button>
-							 </template>
-						 </el-input>
-						 </div>
+					 <template slot="header" slot-scope="scope"> 
+						 产品名称 <el-input size="mini" v-model="filters.key" style="width:60%;"  placeholder="输入文字回车键搜索" @keyup.enter.native="searchXmProducts"> 
+						 </el-input> 
 					 </template>
 					<template slot-scope="scope">
 						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primary">{{scope.row.productName}}</el-link>
@@ -24,7 +19,7 @@
 					</template>
 				</el-table-column>
 			</el-table>
-			<el-pagination class="hidden-md-and-down" layout="total, sizes, prev, pager, 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  layout="total, 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-row> 
 	</section>
 </template>
@@ -75,6 +70,7 @@
 				},
 				iterationVisible:false,
 				productStateVisible:false,
+				tableHeight:500,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -164,6 +160,7 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmProducts();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 63470cd7..6cc83138 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
+		<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">
@@ -42,7 +42,7 @@
 							<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  slot="reference" icon="el-icon-more" circle></el-button>
+						<el-button type="text" slot="reference" icon="el-icon-d-arrow-right"></el-button>
 					</el-popover>
 				</div>
 				<div class="info-detail">
@@ -326,6 +326,8 @@
 .app-container{
 	display: flex;
 	margin-top: -28px;
+	margin-left: 1px;
+	margin-right:1px;
 	padding: 2px;
 	background: #e8edf7;
 }
@@ -423,7 +425,7 @@
 	font-weight: bold;
 }
 .project-info{
-	width: 75%;
+	width: 100%;
 	flex-grow: 1;
 	/* height: 820px; */
 	background: #fff;
@@ -445,7 +447,9 @@
 	color: #409EFF !important;
 	border: 1px solid #409EFF;
 }
-
+.info-detail{
+	 max-height: 100%;
+}
 /* 超过宽度则用...代替 */
 .truncate{
 	overflow: hidden;
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index 23fa886f..c70a26f4 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -71,6 +71,7 @@
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
+				tableHeight:500,
 				//编辑xmProject界面初始化数据
 				editForm: {
 					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 3d24f951..703a7d9e 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row>
-			<el-menu  active-text-color="#00abfc" :default-active="menukey" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+			<el-menu  active-text-color="#00abfc" :default-active="menukey"   mode="horizontal" @select="handleSelect">
 				<el-menu-item index="all">全部</el-menu-item>
 				<el-menu-item index="compete">我参与</el-menu-item>
 				<el-menu-item index="leader">我管理</el-menu-item>
@@ -23,7 +23,7 @@
 					<el-menu-item index="7-2">选项2</el-menu-item>
 					<el-menu-item index="7-3">选项3</el-menu-item>
 				</el-submenu> -->
-				<el-popover 
+				<el-popover
 					placement="top-start"
 					title=""
 					width="200"
@@ -48,7 +48,7 @@
 							<el-button class="hidden-xl-and-up hidden-btn"    @click="handleSelect('myExecuserStatus7')">我放弃</el-button>
 						</el-col> 
 					</el-row>
-					<el-button type="text"  slot="reference" icon="el-icon-more"></el-button>
+					<el-button type="text" class="right-btn" slot="reference" icon="el-icon-d-arrow-right"></el-button>
 				</el-popover>
 			</el-menu>
 			 
@@ -269,6 +269,7 @@
 				finishFlag: false,
 				xmRecordVisible: false,
 				productSelectVisible:false,
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -638,6 +639,7 @@
 				this.filters.productName=this.$route.params.productName;
 			}
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 200; 
 				this.showInfo = false;
 				this.getXmProjects();
 			}); 
@@ -779,4 +781,7 @@
 	margin-top: 5px;
 	margin-bottom: 5px;
 }
+.right-btn{
+	margin-top: 12px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index 7a7a7613..f80ffffd 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -280,6 +280,7 @@
 				valueChangeRows:[],
 				batchEditVisible:false,
 				menuVisible:false,//由故事自动创建阶段计划
+				tableHeight:500,
         pickerOptions: util.pickerOptions('date'),
         gstcVisible:false,
         ganrrColumns: {
@@ -1209,6 +1210,7 @@
 		mounted() { 
        
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				if(this.selProject){
 					this.getXmProjectPhases();
 				}
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index b05862f3..06ee3e42 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 max-height="650" 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 :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-column   sortable type="selection" width="40"></el-table-column>
  				<el-table-column prop="phaseName" label="阶段名称" min-width="160" > 
 					 <template slot-scope="scope">  
@@ -148,7 +148,7 @@
 				<xm-project-group-select :visible="groupUserSelectVisible" :sel-project="selProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-project-group-select>
 				 
 			</el-dialog> 
-			<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+			<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen    :close-on-click-modal="false">
 				<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true"    @menus-selected="onSelectedMenus" ></xm-menu-select>
 			</el-dialog>
 		</el-row>
@@ -318,6 +318,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 				valueChangeRows:[],
 				batchEditVisible:false,
 				menuVisible:false,//由故事自动创建阶段计划
+				tableHeight:500,
         pickerOptions: util.pickerOptions('date'),
         gstcVisible:false,
 		groupUserSelectVisible:false,//选择负责人
@@ -330,6 +331,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
           endDate: 'endDate',
 		  
         },
+		tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -1066,8 +1068,8 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 				var phaseActWorkload=this.phaseBudgetData.phaseActWorkload 
 				var budgetCost=this.phaseBudgetData.phaseBudgetNouserAt+this.phaseBudgetData.phaseBudgetInnerUserAt+this.phaseBudgetData.phaseBudgetOutUserAt
 				var actCost=this.phaseBudgetData.actInnerUserAt+this.phaseBudgetData.actNouserAt+this.phaseBudgetData.actOutUserAt
-				sums[5]='预算工作量:'+budgetWorkload+'人时,实际:'+phaseActWorkload+'人时' 
-				sums[6]='预算金额:'+budgetCost.toFixed(0)+'元,'+(budgetCost/10000).toFixed(2)+'万元,实际:'+actCost.toFixed(0)+'元,'+(actCost/10000).toFixed(2)+'万元'
+				sums[5]='预算:'+budgetWorkload+',实际:'+phaseActWorkload+'' 
+				sums[6]='预算:'+budgetCost.toFixed(0)+',实际:'+actCost.toFixed(0)+''
 
 				return sums;
 			},
@@ -1293,6 +1295,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 					this.getXmProjectPhases();
 				}
 				
+				this.tableHeight = window.innerHeight - 300; 
 				listOption([
 					{categoryId:'all',itemCode:'xmPhaseStatus'} 
 				]).then(res=>{
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 8c2f6d1c..898a76e2 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -1,17 +1,17 @@
 <template>
 	<section>  
 		<el-row>
-		<el-table max-height="750" 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  :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-column prop="phaseName" label="阶段名称" min-width="160" > 
 				 <template slot="header" slot-scope="scope">
-					<div>阶段名称 <el-tag size="mini" v-if="editForm.id" closable @close="clearSelectPhase()">{{editForm.seqNo}}&nbsp;{{editForm.phaseName}}</el-tag></div>
+					<div>阶段  <el-tag size="mini" v-if="editForm.id" closable @close="clearSelectPhase()"> {{editForm.phaseName}}</el-tag></div>
 				</template>
 				<template slot-scope="scope">  
 					{{scope.row.seqNo}} &nbsp;&nbsp;{{scope.row.phaseName}}
 				</template>
 			</el-table-column>   
 		</el-table>
-		<el-pagination  class="hidden-md-and-down"   layout="total,  prev, pager, 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=" 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-row>
 	</section>
 </template>
@@ -108,6 +108,7 @@
 				menuVisible:false,//由故事自动创建阶段计划
         pickerOptions: util.pickerOptions('date'),
         gstcVisible:false,
+		tableHeight:500,
         ganrrColumns: {
           children: 'children',
           name: 'phaseName',
@@ -416,6 +417,7 @@
 		mounted() { 
        
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				if(this.selProject){
 					this.getXmProjectPhases();
 				}
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index 7ccbdc57..00fa1c9c 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 max-height="750" :data="xmProjectStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-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-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/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index aecd72de..72fe3c09 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -77,7 +77,7 @@
 				<xm-task-list  :sel-project="filters.selProject"   @task-selected="onSelectedTask"></xm-task-list>
 			</el-dialog> 	
 			
-			<el-dialog append-to-body title="故事选择" :visible.sync="selectMenuVisible" width="80%" fullscreen   :close-on-click-modal="false">
+			<el-dialog append-to-body title="故事选择" :visible.sync="selectMenuVisible"   fullscreen   :close-on-click-modal="false">
 				<xm-menu-select :is-select-menu="true"  @selected="onSelectedMenu" :sel-project="filters.selProject"></xm-menu-select>
 			</el-dialog>
 			
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 69f34350..6d53ff11 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -63,7 +63,7 @@
 			 </el-row>
 			 <el-row class="app-container">
 				<!--列表 XmQuestion xm_question-->
-				<el-table max-height="650" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-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-column sortable type="index" width="45"></el-table-column> 
 					<el-table-column prop="name" label="问题名称"  min-width="200"> 
 						<template slot-scope="scope">
@@ -224,6 +224,7 @@
 				selectUserVisible:false,
 				selectProjectVisible:false,
 				nextAction:'',
+				tableHeight:500,
 				cloumns: [
 					{
 						key: 'name',
@@ -262,7 +263,9 @@
 					}
 				]
 				/**end 自定义属性请在上面加 请加备注**/
+				
 			}
+
 		},//end data
 		methods: { 
 			handleSizeChange(pageSize) { 
@@ -679,6 +682,7 @@
 				this.filters.selProject=this.selProject
 			}
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight-250; 
 				this.getXmQuestions();
 			}); 
 				listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index c06e8ca8..799bff56 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 :data="xmRecords" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-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-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> 
@@ -98,6 +98,7 @@
 				editForm: {
 					id:'',projectId:'',operUserid:'',operUsername:'',operTime:'',objType:'',action:'',oldValue:'',newValue:'',remarks:'',taskId:'',reqNo:'',branchId:'',ip:''
 				},
+				tableHeight:500,
 				/**begin 自定义属性请在下面加 请加备注**/
 				objTypeOptions: [{key:"all",name:"全部"},{key:"task",name:"任务"},{"key":"project" ,name:"项目"},{key:"budget",name:"预算"},{key:"cost",name:"成本"},{key:"phase",name:"阶段计划"},{"key":"group",name:"团队"}]
 				/**end 自定义属性请在上面加 请加备注**/
@@ -254,7 +255,7 @@
 			}
 			
 			this.$nextTick(() => {
-
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmRecords();
         	}); 
 		}
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 84b62317..227d93ac 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -149,7 +149,7 @@
 			<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
 		</el-dialog>
 
-		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen    :close-on-click-modal="false">
 			<xm-menu-select :is-select-menu="true"  @selected="onMenuSelected" :sel-project="xmProject"></xm-menu-select>
 		</el-dialog>
 		
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 9ee40d20..cf8b5cf7 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -145,7 +145,7 @@
 			<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
 		</el-dialog>
 
-		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen   :close-on-click-modal="false">
 			<xm-menu-select :is-select-menu="true"  @selected="onMenuSelected" :sel-project="xmProject"></xm-menu-select>
 		</el-dialog>
 		
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 262ed59d..19a0d181 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -29,7 +29,7 @@
 							default-expand-all 
 							:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 							row-key="id"
-							max-height="700"
+							 :max-height="tableHeight"
 							>
 							<el-table-column v-show="isMultiSelect" reserve-selection sortable width="50" type="selection"></el-table-column>
 							<el-table-column prop="name" label="任务名称"  min-width="260" >
@@ -147,6 +147,7 @@
  				projectPhase: null,
  				pickerOptions:  util.pickerOptions(), 
 				selectProjectVisible:false,
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -437,6 +438,7 @@
 		mounted() {
 			this.filters.selProject=this.selProject
 			this.$nextTick(()=>{ 
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmTasks(); 
 			});
 				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index ee57be8b..8f9a5396 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="450"
+						 :max-height="tableHeight"
 						>
  						<el-table-column v-show="isMultiSelect" sortable width="50" type="selection"></el-table-column>
 						<el-table-column prop="name" label="任务名称"  min-width="260" >
@@ -151,6 +151,7 @@
 
 				selkey: "all",       
  				pickerOptions:  util.pickerOptions(),
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -397,6 +398,7 @@
 		},
 		mounted() {
 			this.$nextTick(()=>{ 
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmTasks(); 
 			});
 				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index 0e5fa04b..ae8eae00 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -13,7 +13,7 @@
 					<xm-project-phase-mng   :sel-project="filters.selProject" :simple="true" @row-click="projectPhaseRowClick"></xm-project-phase-mng>
 				</el-col>
 				<el-col :span=" filters.selProject?20:24">
-					<el-table max-height="650"
+					<el-table  :max-height="tableHeight"
 						ref="taskTable"
 						show-summary
 						:data="tasksTreeData"
@@ -172,6 +172,7 @@
  				projectPhase: null,
  				pickerOptions:  util.pickerOptions(), 
 				selectProjectVisible:false,
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -458,6 +459,7 @@
 		},
 		mounted() { 
 			this.$nextTick(()=>{ 
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmTasks(); 
 			});
 				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 631546f1..fea4042c 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -36,7 +36,7 @@
 								<el-button    @click="searchXmTasks" type="primary" icon="el-icon-search" v-loading="load.list"></el-button> 
 							</template>
 						</el-input>  
-						<el-button  v-if=" isTaskCenter!='1'   && isMy!='1'"  @click="showAdd" type="primary" icon="el-icon-plus" round></el-button>  
+						<el-button  v-if=" isTaskCenter!='1'   && isMy!='1'"  @click="showAdd" type="primary" icon="el-icon-plus" circle></el-button>  
 						<el-popover
 							placement="top-start"
 							title=""
@@ -79,13 +79,14 @@
 							stripe
 							fit
 							border
+							tooltip-effect="light"
 							size="mini"
 							default-expand-all
-							max-height="600"
+							:max-height="tableHeight"
 							:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 							row-key="id"
 							> 
-							<el-table-column sortable prop="name" label="任务名称(点击详情)"  min-width="240"> 
+							<el-table-column sortable prop="name" label="任务名称(点击详情)"  min-width="240" show-overflow-tooltip> 
 								<template slot-scope="scope">
 									{{scope.row.sortLevel}}&nbsp;<el-link  type="primary"  @click.stop="showDrawer(scope.row)">{{scope.row.name}}</el-link> 
 									
@@ -164,7 +165,7 @@
 							<el-table-column prop="description" label="任务描述" min-width="160" > 
 							</el-table-column>
 							-->
-							<el-table-column  v-if=" isTaskCenter!='1'"   header-align="center" fixed="right"  label="操作"  width="100">
+							<el-table-column  v-if=" isTaskCenter!='1'"   header-align="center" fixed="right"  label="操作"  width="80">
 								<template slot-scope="scope">
 									<!--
 									<el-button-group>
@@ -344,7 +345,7 @@
 			<xm-project-list    @project-confirm="onPorjectConfirm"></xm-project-list>
 		</el-dialog> 
 		
-		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen   :close-on-click-modal="false">
 			<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true"    @menus-selected="onSelectedMenus" ></xm-menu-select>
 		</el-dialog>
 		
@@ -609,6 +610,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 				gstcVisible:false,
 				groupUserSelectVisible:false,//选择负责人
 				showSkillSearchVisible:false,//按技能查询
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -1582,7 +1584,7 @@ XmProjectGroupSelect
 			this.$nextTick(()=>{
 				
 				this.getXmTasks();
-
+				this.tableHeight = window.innerHeight - 250; 
 				listOption([{categoryId:'all',itemCode:'planType'}
 				,{categoryId:'all',itemCode:'taskType'}
 				,{categoryId:'all',itemCode:'urgencyLevel'}
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index 2fc1ec18..faf35c20 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -317,6 +317,7 @@
 				menuDetailVisible:false,
 				pickerOptions:  util.pickerOptions(),
 				gstcVisible:false,
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -1270,6 +1271,7 @@
 				this.getXmTasks();
 			}
 			this.$nextTick(()=>{ 
+				this.tableHeight = window.innerHeight - 250; 
 				listOption([{categoryId:'all',itemCode:'planType'}
 				,{categoryId:'all',itemCode:'taskType'}
 				,{categoryId:'all',itemCode:'urgencyLevel'}
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
index 93966b03..07ff6480 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
@@ -33,7 +33,7 @@
  				</el-form-item> 
 			</el-form>
 			
-		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen    :close-on-click-modal="false">
 			<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''"  @menus-selected="onSelectedMenus" ></xm-menu-select>
 		</el-dialog>
 		</el-row>
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 9443c9bd..92ae08e9 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -35,7 +35,7 @@
  				</el-form-item> 
 			</el-form>
 			
-		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen   :close-on-click-modal="false">
 			<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''"  @menus-selected="onSelectedMenus" ></xm-menu-select>
 		</el-dialog>
 		</el-row>
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 4d39e0da..b259e14e 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -18,7 +18,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmTestCase 测试用例-->
-			<el-table max-height="700" :data="xmTestCases" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-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-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" >
@@ -59,7 +59,7 @@
 				<xm-test-case-add :xm-test-case="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-test-case-add>
 			</el-dialog> 
 		</el-row>
-		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible"    fullscreen   :close-on-click-modal="false">
 			<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''"  @menus-selected="onSelectedMenus" ></xm-menu-select>
 		</el-dialog>
 	</section>
@@ -117,6 +117,7 @@
 				},
 				/**begin 自定义属性请在下面加 请加备注**/ 
 				menuVisible:false,
+				tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -299,6 +300,7 @@
 		mounted() { 
 			this.$nextTick(() => {
 				this.getXmTestCases();
+				this.tableHeight = window.innerHeight - 250; 
         	}); 
         	/** 举例，
     		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 47ed46f8..9f333692 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -26,7 +26,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmTestCaseExec xm_test_case_exec-->
-			<el-table max-height="650" 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  :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-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" >
@@ -120,7 +120,7 @@
 			<el-dialog title="选中项目" :visible.sync="selectProjectVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
 				<xm-project-list    @project-confirm="onPorjectConfirm"></xm-project-list>
 			</el-dialog> 
-			<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" width="80%"    :close-on-click-modal="false">
+			<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen     :close-on-click-modal="false">
 				<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true"   @menus-selected="onSelectedMenus" ></xm-menu-select>
 			</el-dialog>
 			
@@ -241,6 +241,7 @@
             endDate: 'endTime',
 
           },
+			tableHeight:500,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -631,6 +632,7 @@
 		mounted() { 
 			this.filters.selProject=this.selProject; 
 			this.$nextTick(() => {
+				this.tableHeight = window.innerHeight - 250; 
 				this.getXmTestCaseExecs();
         	}); 
         	/** 举例，