diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 781e8909..c1114d8e 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -71,7 +71,7 @@
 				<el-button  slot="reference" icon="el-icon-more" circle></el-button>
 			</el-popover>
  		</el-row>
-		<el-row  class="app-container">
+		<el-row  class="page-main">
 			<!--列表 XmIteration 迭代定义-->
 			<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>
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 85e25a5c..1bc73ab9 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -2,7 +2,7 @@
 	<section>
 
 		<el-row > 
-			<el-col :span="8" class="app-container" v-if="!xmIteration">
+			<el-col :span="8" class="page-main" v-if="!xmIteration">
 				<xm-iteration-mng :simple="true" @row-click="onIterationRowClick" @clear-select="onIterationClearSelect"></xm-iteration-mng>
 			</el-col>
 			<el-col :span="xmIteration?24:16">
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
index 477f870c..1928d626 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row v-if="!xmIteration" class="app-container">
+		<el-row v-if="!xmIteration" class="page-main">
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterationStates">查询</el-button>
   		</el-row>
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
index 477f870c..1928d626 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row v-if="!xmIteration" class="app-container">
+		<el-row v-if="!xmIteration" class="page-main">
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterationStates">查询</el-button>
   		</el-row>
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index efbb4038..aae92a03 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -13,7 +13,7 @@
 			<el-button type="primary" v-if=" batchEditVisible==true "  @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">批量保存</el-button>
 			<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-row class="page-main" v-show="!batchEditVisible">    
 				<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" >
diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
index 414ca9c8..61d290dd 100644
--- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
+++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
@@ -1,12 +1,12 @@
 <template>
 	<section>
-		<el-row  class="app-container" v-if="xmMenu && !simple">
+		<el-row  class="page-main" v-if="xmMenu && !simple">
 			 <h1>{{xmMenu.menuName}}</h1> 
 			<el-divider></el-divider> 
 			<div v-html="xmMenu.remark"></div>
 			<el-divider></el-divider> 
 		</el-row>
-		<el-row  class="app-container" v-if="!xmMenu && !simple">
+		<el-row  class="page-main" v-if="!xmMenu && !simple">
 			 <h1 v-if="filters.xmMenu">{{filters.xmMenu.menuName}}</h1> <el-button @click="showSelectMenu">选择用户故事</el-button>
 			<el-divider v-if="filters.xmMenu"></el-divider> 
 			<div v-if="filters.xmMenu" v-html="filters.xmMenu.remark"></div>
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index 2b77946a..fd58f883 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -8,7 +8,7 @@
 			<el-button type="primary" v-if=" batchEditVisible==true "  @click="saveBatchEdit" v-loading="load.edit">批量保存</el-button>
 			<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-row class="page-main" v-show="!batchEditVisible">    
 				<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" >
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index b7e98c1d..53c01990 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -10,7 +10,7 @@
 			<el-button  v-if="isSelectMenu!=true && batchEditVisible==true"  type="primary" @click="batchSaveMenu">保存</el-button> 
 			<el-button  v-if="isSelectMenu!=true  && batchEditVisible==true "    @click="noBatchEdit">返回</el-button>  
 		</el-row>
-		<el-row class="app-container" >  
+		<el-row class="page-main" >  
 			<el-col  :span="6" v-show="!batchEditVisible">
 				<xm-product-template-mng @row-click="onProductSelected" ref="xmProductTemplateMng" :simple="true"></xm-product-template-mng>
 			</el-col>
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index bb65da54..d2c08383 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section class="page-container page-full-height padding border">
-    <el-row > 
+	<section class="page-container padding">
+    <el-row class="padding-bottom"> 
 			<el-select   v-model="filters.queryScope"    placeholder="产品查询范围">
 				<el-option :label="userInfo.branchName+'机构下所有的产品'" value="branchId"></el-option>
 				<el-option label="我相关的产品" value="compete"></el-option>
@@ -91,7 +91,7 @@
 				<el-button  slot="reference"   icon="el-icon-more" circle></el-button>
 			</el-popover> 
 		</el-row>
-		<el-row  class="app-container"> 
+		<el-row  class="page-main"> 
 			<!--列表 XmProduct 产品表-->
 			<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 prop="productName" label="产品名称" min-width="300"> 
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
index 0f1f9919..da9474ad 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
@@ -1,12 +1,12 @@
 <template>
 	<section>
-		<el-row v-if="simple!=true" class="app-container">
+		<el-row v-if="simple!=true" class="page-main">
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProductTemplates">查询</el-button>
 			<el-button type="primary" @click="showAdd">+产品</el-button>
 			<el-button v-if="isSelectProduct!=true" type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
 		</el-row>
-		<el-row  v-show="simple!=true" class="app-container"> 
+		<el-row  v-show="simple!=true" class="page-main"> 
 			<!--列表 XmProductTemplate 产品表-->
 			<el-table   :data="xmProductTemplates" @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>
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index bdbed3ef..4013afa0 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -70,7 +70,7 @@
 			</el-menu>
 			 
 		</el-row> 
-		<el-row  class="app-container"> 
+		<el-row  class="page-main"> 
 			<!--列表 XmProject xm_project-->
 			<el-row v-show="showType" v-loading="load.list" class="project-box">
 				<el-col  v-cloak v-for="(p,i) in ScreenData" :key="i" :xl="4" :lg="6" :md="8" :sm="12">
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
index 29a2dcaa..762a760a 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
@@ -11,7 +11,7 @@
 					 <el-tag v-else type="warning">未选择项目</el-tag>
  				</el-col> 
 		</el-row>  
-		<el-row class="app-container" v-loading="load.list" >
+		<el-row class="page-main" v-loading="load.list" >
 			<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index">
 				<h3>
 					<div>{{item.groupName + "："}} 
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
index 29176137..d7061d22 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
@@ -15,7 +15,7 @@
 					<el-tooltip  v-else content="黄色表示选中"><span class="addXmProjectGroupFormworkSquare">选中</span></el-tooltip>
 				</el-col> 
 		</el-row>
-		 <el-row class="app-container" v-loading="load.list" v-if="!isSelectSingleUser && !isSelectMultiUser">
+		 <el-row class="page-main" v-loading="load.list" v-if="!isSelectSingleUser && !isSelectMultiUser">
 			<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index">
 				<h3>
 					<div>{{item.groupName + "："}}<el-tag v-if="imGroupVisible==true && imGroups.some(g=>item.id==g.id) "   type="success">已绑定</el-tag><el-tag type="danger" v-else-if="imGroupVisible==true " @click="doCreateImGroup(item)">未绑定，点我去绑定</el-tag>
@@ -32,7 +32,7 @@
 			</el-row>
 		</el-row>
 		
-		<el-row class="app-container" v-loading="load.list" v-else>
+		<el-row class="page-main" v-loading="load.list" v-else>
 			<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index">
 				<h3>
 					<div>{{item.groupName + "："}} 
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index 6d05db89..3d4370af 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row  class="app-container" >
+		<el-row  class="page-main" >
 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete">批量删除</el-button>  
 			<el-button type="warning" @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">批量保存</el-button>
 			
@@ -15,14 +15,14 @@
 				
 			</div> 
 		</el-row>
-		<el-row class="app-container"  >  
+		<el-row class="page-main"  >  
  					<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{toFixed(selProject.planTotalCost/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanCostAt/10000,2)}}万</el-tag> 
 					<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag :type="phaseBudgetData.surplusPlanNouserAt>0?'warning':'danger'">{{toFixed(selProject.planNouserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanNouserAt/10000,2)}}万</el-tag>  
 					<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag  :type="phaseBudgetData.surplusPlanInnerUserAt>0?'warning':'danger'">{{toFixed(selProject.planInnerUserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanInnerUserAt/10000,2)}}万</el-tag>  
 					<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag  :type="phaseBudgetData.surplusPlanOutUserAt>0?'warning':'danger'">{{toFixed(selProject.planOutUserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanOutUserAt/10000,2)}}万</el-tag>  
 
  		</el-row> 
- 		<el-row class="app-container" >   
+ 		<el-row class="page-main" >   
 			<!--列表 XmProjectPhase xm_project_phase-->
 			<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>
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index d77917df..97bbcb54 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row  class="app-container" v-show="batchEditVisible==false"> 
+		<el-row  class="page-main" v-show="batchEditVisible==false"> 
 			<el-button  class="hidden-md-and-down"  @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总进度数据</el-button> 
 			<el-button   @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
 			<span  v-if="batchEditVisible!=true"   >
@@ -65,7 +65,7 @@
 					<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag  :type="phaseBudgetData.surplusPlanOutUserAt>0?'warning':'danger'">{{toFixed(selProject.planOutUserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanOutUserAt/10000,2)}}万</el-tag>  
 
  		</el-row> 
- 		<el-row class="app-container" v-show="batchEditVisible==false"> 
+ 		<el-row class="page-main" v-show="batchEditVisible==false"> 
 			<!--列表 XmProjectPhase xm_project_phase-->
 			<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 prop="phaseName" label="阶段名称" min-width="150" show-overflow-tooltip> 
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
index dd6523e0..ff6d4685 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
@@ -8,7 +8,7 @@
 			<el-button v-if="isSelect" type="primary" @click="selectedConfirm">确认选择</el-button> 
 		</el-row>
 		
-		<el-row class="app-container" v-if="!simple"> 
+		<el-row class="page-main" v-if="!simple"> 
 			<!--列表 XmProjectPhaseTemplate xm_phase_template-->
 			<el-table default-expand-all :data="xmProjectPhaseTemplateTreeData" @sort-change="sortChange" row-key="id"  :tree-props="{children: 'children', hasChildren: 'hasChildren'}" 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> 
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 51e315fc..46d8c271 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -30,7 +30,7 @@
 						</el-input>
 						<el-button v-if="isMultiSelect" @click="selectedTasks" type="primary">确认选择</el-button>
 					</el-row>
-					<el-row  class="app-container">
+					<el-row  class="page-main">
 						<el-table
 							ref="taskTable"
 							show-summary
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index df905486..65cc0498 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row  v-show="batchEditVisible==false" class="app-container">
+		<el-row  v-show="batchEditVisible==false" class="page-main">
 			<el-col v-if="isTaskCenter!='1' && currentProject " :span="4" >
 				<xm-project-phase-mng  :sel-project="currentProject" :simple="true" @row-click="projectPhaseRowClick" @clear-select="clearSelectPhase"></xm-project-phase-mng>
 			</el-col>
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 9c379418..c837a597 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -67,7 +67,7 @@
 					<el-button  slot="reference" icon="el-icon-more" circle></el-button>
 				</el-popover> 
 		</el-row>
-		<el-row class="app-container" v-else> 
+		<el-row class="page-main" v-else> 
 				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 					<template slot="append">
 						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button>