diff --git a/build/copy.js b/build/copy.js
deleted file mode 100644
index 4f3e7a2d..00000000
--- a/build/copy.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var fs = require('fs');
-var path = require('path')
-function copy(src, dst) {
-  fs.writeFileSync(dst, fs.readFileSync(src));
-}
-function travel(dir, callback) {
-	if (fs.statSync(dir).isDirectory()) {
-    	callback(dir,true);
-    }
-  fs.readdirSync(dir).forEach(function (file) {
-    var pathname = path.join(dir, file);
-    if (fs.statSync(pathname).isDirectory()) {
-      travel(pathname, callback);
-    } else {
-      callback(pathname,false);
-    }
-  });
-}
-
-function copy(src,  dest){
-	travel(src,function(file,isDir){ 
-		var filename=dest+file.substring(src.length);
-		if (isDir===true && !fs.existsSync(filename)) { 
-				fs.mkdirSync(filename); 
-        }
-		if(isDir===false){
-        	fs.writeFileSync(filename, fs.readFileSync(file));
-        }
-	});
-};
-
-
-copy('../mdp-sys-web/src/api/mdp/','src/api/mdp/');
-copy('../mdp-sys-web/src/views/mdp/','src/views/mdp/'); 
-copy('../ac-core-web/src/api/ac/','src/api/ac/');
-copy('../ac-core-web/src/views/ac/','src/views/ac/'); 
-copy('../mk-mng-web/src/api/mk/','src/api/mk/');
-copy('../mk-mng-web/src/views/mk/','src/views/mk/'); 
\ No newline at end of file
diff --git a/copy/copy.js b/copy/copy.js
deleted file mode 100644
index 5f172de0..00000000
--- a/copy/copy.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var fs = require('fs');
-var path = require('path')
-function copy(src, dst) {
-  fs.writeFileSync(dst, fs.readFileSync(src));
-}
-function travel(dir, callback) {
-	if (fs.statSync(dir).isDirectory()) {
-    	callback(dir,true);
-    }
-  fs.readdirSync(dir).forEach(function (file) {
-    var pathname = path.join(dir, file);
-    if (fs.statSync(pathname).isDirectory()) {
-      travel(pathname, callback);
-    } else {
-      callback(pathname,false);
-    }
-  });
-}
-
-function copy(src,  dest){
-	travel(src,function(file,isDir){ 
-		var filename=dest+file.substring(src.length);
-		if (isDir===true && !fs.existsSync(filename)) { 
-				fs.mkdirSync(filename); 
-        }
-		if(isDir===false){
-        	fs.writeFileSync(filename, fs.readFileSync(file));
-        }
-	});
-};
-
-
-//copy('../mdp-sys-web/src/api/mdp/','src/api/mdp/');
-//copy('../mdp-sys-web/src/views/mdp/','src/views/mdp/'); 
\ No newline at end of file
diff --git a/copy/copyDistToStatic.js b/copy/copyDistToStatic.js
deleted file mode 100644
index aa3ed70c..00000000
--- a/copy/copyDistToStatic.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var fs = require('fs');
-var path = require('path')
-function copy(src, dst) {
-  fs.writeFileSync(dst, fs.readFileSync(src));
-}
-function travel(dir, callback) {
-	if (fs.statSync(dir).isDirectory()) {
-    	callback(dir,true);
-    }
-  fs.readdirSync(dir).forEach(function (file) {
-    var pathname = path.join(dir, file);
-    if (fs.statSync(pathname).isDirectory()) {
-      travel(pathname, callback);
-    } else {
-      callback(pathname,false);
-    }
-  });
-}
-
-function copy(src,  dest){
-	travel(src,function(file,isDir){ 
-		var filename=dest+file.substring(src.length);
-		if (isDir===true && !fs.existsSync(filename)) { 
-				fs.mkdirSync(filename); 
-        }
-		if(isDir===false){
-        	fs.writeFileSync(filename, fs.readFileSync(file));
-        }
-	});
-};
-
-function delDir(path) {
-    if( fs.existsSync(path) ) {
-        fs.readdirSync(path).forEach(function(file) {
-            var curPath = path + "/" + file;
-            if(fs.statSync(curPath).isDirectory()) { // recurse
-            	delDir(curPath);
-            } else { // delete file
-                fs.unlinkSync(curPath);
-            }
-        });
-        fs.rmdirSync(path);
-    }
-};
-
-function delCopy(src,dest){
-	delDir(dest);
-	copy(src,dest);
-}
-delCopy('dist','../oa-starter/src/main/resources/static');
\ No newline at end of file
diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 9f726bc4..32e29b8f 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -82,10 +82,21 @@ export default {
         { path: 'xmMenu/XmMenuMng', component: _import('xm/core/xmMenu/XmMenuMng'), name: 'XmMenuMng', meta: { title: '故事管理' }},
          { path: 'xmMenuExchange/XmMenuExchangeMng', component: _import('xm/core/xmMenuExchange/XmMenuExchangeMng'), name: 'XmMenuExchangeMng', meta: { title: '互动评论' }}, 
         { path: 'xmMenuTemplate/XmMenuTemplateMng', component: _import('xm/core/xmMenuTemplate/XmMenuTemplateMng'), name: 'XmMenuTemplateMng', meta: { title: '故事模板' }},
+      ]
+    },
+    {
+      path: '/xm/core',
+      component: Layout,
+      name: '迭代管理',
+      iconCls: 'fa el-icon-menu',
+      meta: {
+        title: '迭代管理',
+        icon: 'project'
+      },
+      // leaf: true,//只有一个节点
+      children: [  
         { path: 'xmIteration/XmIterationMng', component: _import('xm/core/xmIteration/XmIterationMng'), name: 'XmIterationMng', meta: { title: '迭代管理' }},
         { path: 'xmIterationMenu/XmIterationMenuMng', component: _import('xm/core/xmIterationMenu/XmIterationMenuMng'), name: 'XmIterationMenuMng', meta: { title: '故事迭代' }},
-
-
       ]
     }
   ]
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 3582601d..11428202 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="650" 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="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-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 :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="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-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>
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 3ac18800..e82fc128 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -19,7 +19,7 @@
 				</el-row>
 				<el-row class="app-container">
 					<!--列表 XmIterationMenu 迭代定义-->
-					<el-table :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="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-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 67eac491..578e7a0b 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -26,7 +26,7 @@
 						<el-button v-if=" batchEditVisible==true && isPmUser " type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
 					</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="750" :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">
@@ -71,7 +71,7 @@
 						
 					</el-row>
 					<el-row v-show="!batchEditVisible" class="app-container">
-						<el-table  max-height="650" :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="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-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="故事名称" min-width="140" > 
 								<template slot-scope="scope">
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 6e909a62..1a60cee8 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -16,7 +16,7 @@
 					<el-button   type="warning" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
 				</el-row>
 				<el-row class="app-container">
-					<el-table max-height="650" :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="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-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 81811c65..c0564961 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -13,7 +13,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="750" 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"> 
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 04712652..991441e9 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   :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="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-column sortable type="index" width="55"></el-table-column>				
 				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
 					<template slot-scope="scope">
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index d0f349fa..c25a37f9 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -23,11 +23,9 @@
 						<el-radio-button label="环境清单"></el-radio-button> 
 					</el-radio-group>
 					<el-popover
-						placement="top-start"
-						title="更多操作"
+						placement="top-start" 
 						width="400"
-						trigger="hover"
-						content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
+						trigger="hover" >
 						  
 						<el-button type="primary" @click="toArchive" round>论坛</el-button>
 						<el-button type="success" @click="toIm" round>即聊</el-button> 
@@ -314,7 +312,8 @@
 <style scoped>
 .app-container{
 	display: flex;
-	padding: 10px;
+	margin-top: -28px;
+	padding: 2px;
 	background: #e8edf7;
 }
 .project-handle{
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 4d921a34..68630d02 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="650" 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="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-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>
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index efe1134c..7ccbdc57 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="650" :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="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-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 87822623..ace68a81 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -34,7 +34,7 @@
 				</div>
 			</el-menu> 
 			<!--列表 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="750" :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">
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index e166abf5..a7316c18 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -66,11 +66,13 @@
 							@row-click="rowClick"
 							@selection-change="selsChange" 
 							highlight-current-row
+							current-row-key="id"
 							stripe
 							fit
 							border
+							size="mini"
 							default-expand-all
-							max-height="650"
+							max-height="600"
 							:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 							row-key="id"
 							> 
@@ -80,13 +82,13 @@
 									
 								</template>
 							</el-table-column> 
-							<el-table-column  prop="projectName" label="项目"  min-width="120"> 
+							<el-table-column v-if=" !selProject || !selProject.id" prop="projectName" label="项目"  min-width="120"> 
 								
 								<template slot="header">
 									项目<el-button @click="showProjectList"  icon="el-icon-search" circle size="mini"></el-button>
 								</template>
 								<template slot-scope="scope">
-									<el-link      @click.stop="toMenu(scope.row)">{{scope.row.projectName}}</el-link> 
+									{{scope.row.projectName}} 
 								</template>
 							</el-table-column> 
 							<el-table-column sortable prop="menuId" label="故事"  min-width="120"> 
@@ -105,7 +107,7 @@
 									<el-link    type="warning"     v-if="scope.row.createUsername==null || scope.row.createUsername ==''" @click.stop="showGroupUserSelect(scope.row)"  >去设置</el-link>  
 								</template>
 							</el-table-column>
-							<el-table-column sortable label="执行人" prop="exeUserids" min-width="120" show-overflow-tooltip>
+							<el-table-column sortable label="执行人" prop="exeUserids" width="120" show-overflow-tooltip>
 								<template slot-scope="scope"> 
 									<el-link     type="danger"    v-if="scope.row.exeUsernames!=null && scope.row.exeUsernames !='' && scope.row.exeUsernames.indexOf('验收不过')>=0"  @click.stop="showExecusers(scope.row)">{{scope.row.exeUsernames}}</el-link> 
 									<el-link     type="success"    v-else-if="scope.row.exeUsernames!=null && scope.row.exeUsernames !='' && scope.row.exeUsernames.indexOf('已验收')>=0"  @click.stop="showExecusers(scope.row)">{{scope.row.exeUsernames}}</el-link>     
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 2ab54415..90eaa0ff 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -31,7 +31,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="750" 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" >