diff --git a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
index 85943bf2..1116b35d 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
@@ -2,61 +2,84 @@
 	<section class="padding">
 		<el-row>
 			<!--新增界面 XmEnvList xm_env_list--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
-				<el-form-item label="归属项目" prop="projectName">
-					<el-input v-model="addForm.projectName" placeholder="项目名称" readonly></el-input>
-					 <xm-project-select style="display:inline;" v-if="!xmProject||!xmProject.id" :auto-select="false"   :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" >
-					 	<div slot="title">选择项目</div>
-					 </xm-project-select>
-
-				</el-form-item> 
+			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm" label-position="left">  
 				<el-form-item label="名称" prop="name">
 					<el-input v-model="addForm.name" placeholder="名称" ></el-input>
+					<el-row class="label-font-color"> <span v-if="addForm.projectName">归属项目：{{ addForm.projectName}} <el-divider direction="vertical"></el-divider></span>
+					 
+						 <xm-project-select style="display:inline;" v-if="!xmProject||!xmProject.id" :auto-select="false"   :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" >
+							<div slot="title">选择项目</div>
+						</xm-project-select>
+					</el-row>
 				</el-form-item> 
-				<el-form-item label="内网ip地址" prop="ipAddress">
-					<el-input v-model="addForm.ipAddress" placeholder="内网ip地址" ></el-input>
-				</el-form-item> 
-				<el-form-item label="内网访问端口" prop="port">
-					<el-input type="number" min="0"  v-model="addForm.port" placeholder="内网访问端口" ></el-input>
-				</el-form-item> 
-				<el-form-item label="访问用户编号" prop="accessUserid">
-					<el-input v-model="addForm.accessUserid" placeholder="访问用户编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="访问密码" prop="accessPassword">
-					<el-input v-model="addForm.accessPassword" placeholder="访问密码" show-password ></el-input>
-				</el-form-item>  
+				
 				<el-form-item label="访问链接" prop="accessUrl">
 					<el-input v-model="addForm.accessUrl" placeholder="访问链接" ></el-input>
 				</el-form-item>  
-				<el-form-item label="外网ip地址" prop="webIpAddress">
-					<el-input v-model="addForm.webIpAddress" placeholder="外网ip地址" ></el-input>
-				</el-form-item> 
-				<el-form-item label="外网端口" prop="webPort">
-					<el-input type="number" min="0"  v-model="addForm.webPort" placeholder="外网端口" ></el-input>
-				</el-form-item>  
+				<el-row>
+					<el-col :span="8"> 
+						<el-form-item label="访问用户编号" prop="accessUserid">
+							<el-input v-model="addForm.accessUserid" placeholder="访问用户编号" style="width:99%;"></el-input>
+						</el-form-item> 
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="访问密码" prop="accessPassword">
+							<el-input v-model="addForm.accessPassword" placeholder="访问密码" show-password style="width:99%;"></el-input>
+						</el-form-item>  
+					</el-col>
+				</el-row> 
+				<el-row>
+					<el-col :span="8"> 
+						<el-form-item label="内网ip地址" prop="ipAddress">
+							<el-input v-model="addForm.ipAddress" style="width:99%;" placeholder="内网ip地址" ></el-input>
+						</el-form-item> 
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label=" 访问端口" prop="port">
+							<el-input type="number" min="0"  v-model="addForm.port" placeholder="内网访问端口" style="width:99%;"></el-input>
+						</el-form-item> 
+					</el-col>
+				</el-row> 
+				<el-row>
+					<el-col :span="8"> 
+						<el-form-item label="外网ip地址" prop="webIpAddress">
+							<el-input v-model="addForm.webIpAddress" placeholder="外网ip地址" style="width:99%;"></el-input>
+						</el-form-item> 
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="外网端口" prop="webPort">
+							<el-input type="number" min="0"  v-model="addForm.webPort" placeholder="外网端口" style="width:99%;"></el-input>
+						</el-form-item>  
+					</el-col>
+				</el-row>  
 				
-				<el-form-item label="状态" prop="envState">
-					<el-radio-group v-model="addForm.envState">
-						<el-radio label="0">不可用</el-radio>
-						<el-radio label="1">已启用</el-radio>
-						<el-radio label="2">已过期</el-radio>
-					</el-radio-group>
-				</el-form-item>  
-				<el-form-item label="浏览权限" prop="readQx"> 
-				    <el-select v-model="addForm.readQx">
-						<el-option v-for="(item,index) in dicts['readQx']" :key="index" :value="item.id" :label="item.name"></el-option>
-					</el-select>
-				</el-form-item>  
-				<el-form-item label="修改权限" prop="writeQx"> 
-				    <el-select v-model="addForm.writeQx">
-						<el-option v-for="(item,index) in dicts['writeQx']" :key="index" :value="item.id" :label="item.name"></el-option>
-					</el-select>
-				</el-form-item> 
+				<el-row>
+					<el-col :span="8"> 
+							<el-form-item label="状态" prop="envState"> 
+								<el-select v-model="addForm.envState">
+									<el-option  value="0" label="不可用"></el-option>
+									<el-option  value="1" label="已启用"></el-option>
+									<el-option  value="2" label="已过期"></el-option>
+								</el-select>
+							</el-form-item>   
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="浏览权限" prop="readQx"> 
+							<el-select v-model="addForm.readQx">
+								<el-option v-for="(item,index) in dicts['readQx']" :key="index" :value="item.id" :label="item.name"></el-option>
+							</el-select>
+						</el-form-item>  
+					</el-col>
+					<el-col :span="8">
+					<el-form-item label="修改权限" prop="writeQx"> 
+						<el-select v-model="addForm.writeQx">
+							<el-option v-for="(item,index) in dicts['writeQx']" :key="index" :value="item.id" :label="item.name"></el-option>
+						</el-select>
+					</el-form-item> 
+				</el-col>
+				</el-row>
 				<el-form-item label="备注说明" prop="remark">
 					<el-input type="textarea" rows="4" v-model="addForm.remark" placeholder="备注说明" ></el-input>
-				</el-form-item>
-				<el-form-item label="添加人员姓名" prop="createUsername">
-					{{userInfo.username}}
 				</el-form-item> 
 				<el-form-item>
 					<el-col :span="24" :offset="8"> 
diff --git a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
index 8c3d79a3..5315bbe7 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
@@ -5,55 +5,77 @@
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="名称" prop="name">
 					<el-input v-model="editForm.name" placeholder="名称" ></el-input>
+					<el-row class="label-font-color"> <span v-if="editForm.projectName">归属项目：{{ editForm.projectName}} <el-divider direction="vertical"></el-divider></span> 
+					</el-row>
 				</el-form-item> 
-				<el-form-item label="内网ip地址" prop="ipAddress">
-					<el-input v-model="editForm.ipAddress" placeholder="内网ip地址" ></el-input>
-				</el-form-item> 
-				<el-form-item label="内网访问端口" prop="port">
-					<el-input type="number" min="0" v-model="editForm.port" placeholder="内网访问端口" ></el-input>
-				</el-form-item> 
-				<el-form-item label="访问用户编号" prop="accessUserid">
-					<el-input v-model="editForm.accessUserid" placeholder="访问用户编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="访问密码" prop="accessPassword">
-					<el-input v-model="editForm.accessPassword" placeholder="访问密码" show-password ></el-input>
-				</el-form-item>  
+				
 				<el-form-item label="访问链接" prop="accessUrl">
 					<el-input v-model="editForm.accessUrl" placeholder="访问链接" ></el-input>
 				</el-form-item>  
-				<el-form-item label="外网ip地址" prop="webIpAddress">
-					<el-input v-model="editForm.webIpAddress" placeholder="外网ip地址" ></el-input>
-				</el-form-item> 
-				<el-form-item label="外网端口" prop="webPort">
-					<el-input type="number" min="0" v-model="editForm.webPort" placeholder="外网端口" ></el-input>
-				</el-form-item>  
-				
-				<el-form-item label="状态" prop="envState">
-					<el-radio-group v-model="editForm.envState">
-						<el-radio label="0">不可用</el-radio>
-						<el-radio label="1">已启用</el-radio>
-						<el-radio label="2">已过期</el-radio>
-					</el-radio-group>
-				</el-form-item> 
+				<el-row>
+					<el-col :span="8"> 
+						<el-form-item label="访问用户编号" prop="accessUserid">
+							<el-input v-model="editForm.accessUserid" placeholder="访问用户编号" style="width:99%;"></el-input>
+						</el-form-item> 
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="访问密码" prop="accessPassword">
+							<el-input v-model="editForm.accessPassword" placeholder="访问密码" show-password style="width:99%;"></el-input>
+						</el-form-item>  
+					</el-col>
+				</el-row> 
+				<el-row>
+					<el-col :span="8"> 
+						<el-form-item label="内网ip地址" prop="ipAddress">
+							<el-input v-model="editForm.ipAddress" style="width:99%;" placeholder="内网ip地址" ></el-input>
+						</el-form-item> 
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label=" 访问端口" prop="port">
+							<el-input type="number" min="0"  v-model="editForm.port" placeholder="内网访问端口" style="width:99%;"></el-input>
+						</el-form-item> 
+					</el-col>
+				</el-row> 
+				<el-row>
+					<el-col :span="8"> 
+						<el-form-item label="外网ip地址" prop="webIpAddress">
+							<el-input v-model="editForm.webIpAddress" placeholder="外网ip地址" style="width:99%;"></el-input>
+						</el-form-item> 
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="外网端口" prop="webPort">
+							<el-input type="number" min="0"  v-model="editForm.webPort" placeholder="外网端口" style="width:99%;"></el-input>
+						</el-form-item>  
+					</el-col>
+				</el-row>  
 				
-				<el-form-item label="浏览权限" prop="readQx"> 
-				    <el-select v-model="editForm.readQx">
-						<el-option v-for="(item,index) in dicts['readQx']" :key="index" :value="item.id" :label="item.name"></el-option>
-					</el-select>
-				</el-form-item>  
-				<el-form-item label="修改权限" prop="writeQx"> 
-				    <el-select v-model="editForm.writeQx">
-						<el-option v-for="(item,index) in dicts['writeQx']" :key="index" :value="item.id" :label="item.name"></el-option>
-					</el-select>
-				</el-form-item> 
-				<el-form-item label="有效日期" prop="startTime,endTime">
-					<mdp-date-range type="daterange" placeholder="选择日期" :auto-default="false" v-model="editForm" start-key="startTime" end-key="endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></mdp-date-range>
-				</el-form-item>    
+				<el-row>
+					<el-col :span="8"> 
+							<el-form-item label="状态" prop="envState"> 
+								<el-select v-model="editForm.envState">
+									<el-option  value="0" label="不可用"></el-option>
+									<el-option  value="1" label="已启用"></el-option>
+									<el-option  value="2" label="已过期"></el-option>
+								</el-select>
+							</el-form-item>   
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="浏览权限" prop="readQx"> 
+							<el-select v-model="editForm.readQx">
+								<el-option v-for="(item,index) in dicts['readQx']" :key="index" :value="item.id" :label="item.name"></el-option>
+							</el-select>
+						</el-form-item>  
+					</el-col>
+					<el-col :span="8">
+					<el-form-item label="修改权限" prop="writeQx"> 
+						<el-select v-model="editForm.writeQx">
+							<el-option v-for="(item,index) in dicts['writeQx']" :key="index" :value="item.id" :label="item.name"></el-option>
+						</el-select>
+					</el-form-item> 
+				</el-col>
+				</el-row>
 				<el-form-item label="备注说明" prop="remark">
 					<el-input type="textarea" rows="4" v-model="editForm.remark" placeholder="备注说明" ></el-input>
-				</el-form-item>
-				<el-form-item label="创建者姓名" prop="createUsername">
-					{{editForm.createUsername}}
 				</el-form-item> 
 				<el-form-item> 
 					<el-col :span="24" :offset="8"> 
@@ -103,7 +125,7 @@
 				},
 				//编辑界面数据  XmEnvList xm_env_list
 				editForm: {
-					id:'',name:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'',startTime:'',endTime:'',feeAmount:'',feeRule:''
+					id:'',name:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'1',startTime:'',endTime:'',feeAmount:'',feeRule:'',readQx:'9',writeQx:'9',projectId:'',projectName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index beafd1b0..8e3e9024 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -33,12 +33,12 @@
 			<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> 
 		
 			<!--编辑 XmEnvList xm_env_list界面-->
-			<el-dialog title="编辑环境清单" :visible.sync="editFormVisible"  width="60%" top="20px" append-to-body   :close-on-click-modal="false">
+			<el-dialog title="编辑环境清单" :visible.sync="editFormVisible"  width="80%" top="20px" append-to-body   :close-on-click-modal="false">
 				  <xm-env-list-edit :xm-env-list="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-env-list-edit>
 			</el-dialog>
 	
 			<!--新增 XmEnvList xm_env_list界面-->
-			<el-dialog title="新增环境清单" :visible.sync="addFormVisible"  top="20px"   append-to-body   :close-on-click-modal="false">
+			<el-dialog title="新增环境清单" :visible.sync="addFormVisible" width="80%"  top="20px"   append-to-body   :close-on-click-modal="false">
 				<xm-env-list-add :xm-project="selProject" :xm-product="xmProduct" :xm-env-list="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-env-list-add>
 			</el-dialog> 
 		</el-row>
diff --git a/src/views/xm/core/xmFile/XmFileAdd.vue b/src/views/xm/core/xmFile/XmFileAdd.vue
index 2cedce65..3083263a 100644
--- a/src/views/xm/core/xmFile/XmFileAdd.vue
+++ b/src/views/xm/core/xmFile/XmFileAdd.vue
@@ -1,14 +1,12 @@
 <template>
-	<section class="page-container  padding border">
+	<section>
 		<el-row>
 			<!--新增界面 XmFile xm_file-->
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="项目名称">
-					{{addForm.projectName}}
-					<!-- <el-input v-model="addForm.projectName" placeholder="项目名称" ></el-input> -->
-				</el-form-item>
+			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
 				<el-form-item label="文件名称" prop="name">
 					<el-input v-model="addForm.name" placeholder="文件名称" ></el-input>
+					<el-row class="label-font-color"> <span v-if="addForm.projectName">归属项目：{{ addForm.projectName}} <el-divider direction="vertical"></el-divider></span> </el-row>
+
 				</el-form-item>
 				<el-form-item label="文件说明" prop="description">
 					<vue-editor v-if="visible" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
@@ -16,14 +14,11 @@
 				<el-form-item label="附件">
 					<upload v-if="fileVisible" :archiveId="addForm.id" :branchId="userInfo.branchId"  @on-change="onChange"></upload>
 				</el-form-item>
-				<el-form-item label="创建人">
-					{{userInfo.username}}
-				</el-form-item>
 				<el-form-item>
-					<el-col :span="24" :offset="8">
+					<span style="float:right;">
 						<el-button @click.native="handleCancel">取消</el-button>
 						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>
-					</el-col>
+					</span>
 				</el-form-item>
 			</el-form>
 		</el-row>
@@ -146,8 +141,5 @@
 
 </script>
 
-<style scoped>
-.el-form-item__content{
-	margin-left: 0;
-}
+<style scoped> 
 </style>
diff --git a/src/views/xm/core/xmFile/XmFileEdit.vue b/src/views/xm/core/xmFile/XmFileEdit.vue
index e5cf4867..02c3d345 100644
--- a/src/views/xm/core/xmFile/XmFileEdit.vue
+++ b/src/views/xm/core/xmFile/XmFileEdit.vue
@@ -1,31 +1,23 @@
 <template>
-	<section class="page-container  padding border">
+	<section>
 		<el-row>
 		<!--编辑界面 XmFile xm_file-->
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="项目名称" prop="projectName">
-					{{editForm.projectName}}
-				</el-form-item>
+			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 				<el-form-item label="文件名称" prop="name">
 					<el-input v-model="editForm.name" placeholder="文件名称"></el-input>
+					<el-row class="label-font-color">编号：{{editForm.id}} <el-divider direction="vertical"></el-divider><span v-if="editForm.projectName">归属项目：{{ editForm.projectName}} <el-divider direction="vertical"></el-divider></span>创建人：{{ editForm.createUsername }}<el-divider direction="vertical"></el-divider> 创建时间：{{ editForm.createTime }}</el-row>
 				</el-form-item>
 				<el-form-item label="文件说明" prop="description">
 					<vue-editor v-if="visible" :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor>
 				</el-form-item>
 				<el-form-item label="附件">
 					<upload :archiveId="editForm.id" :branchId="userInfo.branchId"  @on-change="onChange"></upload>
-				</el-form-item>
-				<el-form-item label="创建人" prop="createUsername">
-					{{editForm.createUsername}}
-				</el-form-item>
-				<el-form-item label="创建时间" prop="createTime">
-					{{editForm.createTime}}
-				</el-form-item>
-				<el-form-item>
-					<el-col :span="24" :offset="8">
+				</el-form-item>  
+				<el-form-item> 
+					<span style="float:right;">
 						<el-button @click.native="handleCancel">取消</el-button>
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>
-					</el-col>
+						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button> 
+					</span>
 				</el-form-item>
 			</el-form>
 		</el-row>
diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue
index 3a306f11..2a455701 100644
--- a/src/views/xm/core/xmFile/XmFileMng.vue
+++ b/src/views/xm/core/xmFile/XmFileMng.vue
@@ -30,42 +30,15 @@
 			</el-table>
 			<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> 
 			<!--编辑 XmFile xm_file界面-->
-			<el-drawer title="编辑文档" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="编辑文档" :visible.sync="editFormVisible"  width="80%" top="20px"  append-to-body   :close-on-click-modal="false">
 				  <xm-file-edit :xm-file="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-file-edit>
-			</el-drawer>
+			</el-dialog>
 
 			<!--新增 XmFile xm_file界面-->
-			<el-drawer title="新增文档" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="新增文档" :visible.sync="addFormVisible"  width="80%" top="20px"   append-to-body   :close-on-click-modal="false">
 				<xm-file-add :xm-file="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-file-add>
-			</el-drawer> 
-		</el-row>
-		<el-row v-else class="xm-file-detail">
-			<div class="title-bar">
-				文档详情
-				<el-button @click="InfoVisible=false" type="plian">返回</el-button>
-			</div>
-			<!--列表 XmFile xm_file-->
-			<el-form class="file-form" :model="selFile" label-width="120px">
-				<el-form-item label="项目名称">
-					<span>{{selFile.projectName}}</span>
-				</el-form-item> 
-				<el-form-item label="名称名称" prop="name">
-					<span>{{selFile.name}}</span>
-				</el-form-item> 
-				<el-form-item label="文件说明">
-					<span v-html="selFile.description"></span>
-				</el-form-item> 
-				<el-form-item label="创建人">
-					<span>{{selFile.createUsername}}</span>
-				</el-form-item>
-				<el-form-item label="创建时间">
-					<span>{{selFile.createTime}}</span>
-				</el-form-item>
-				<el-form-item label="附件">
-					<el-tag v-for="(item,i) in selFile.attachment" :key="i">{{item.name}}</el-tag>
-				</el-form-item> 
-			</el-form>
-		</el-row>
+			</el-dialog> 
+		</el-row> 
 	</section>
 </template>
 
@@ -248,8 +221,7 @@
 				});
 			},
 			rowClick: function(row, event, column){
-				this.selFile = row;
-				this.InfoVisible = true;
+				this.selFile = row; 
 				// this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			},
 			/**begin 自定义函数请在下面加**/