diff --git a/src/api/xm/core/xmEnvList.js b/src/api/xm/core/xmEnvList.js
index 20b0856f..bd22958e 100644
--- a/src/api/xm/core/xmEnvList.js
+++ b/src/api/xm/core/xmEnvList.js
@@ -27,4 +27,18 @@ export const batchDelXmEnvList = params => { return axios.post(`${base}/xm/core/
 export const editXmEnvList = params => { return axios.post(`${base}/xm/core/xmEnvList/edit`, params); };
 
 //新增一条xm_env_list
-export const addXmEnvList = params => { return axios.post(`${base}/xm/core/xmEnvList/add`, params); };
\ No newline at end of file
+export const addXmEnvList = params => { return axios.post(`${base}/xm/core/xmEnvList/add`, params); };
+
+
+/**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
+//初始化页面上的字典
+export const initDicts = (that) => {
+    var itemCodes=[];//在此添加要加载的字典 如['sex','grade','lvl']
+    that.dicts['readQx']=[{id:'0',name:'全部可读'},{id:'1',name:'同机构可读'},{id:'2',name:'同项目可读'},{id:'3',name:'创建者的上级可读'},{id:'9',name:'仅自己可读'},]
+    that.dicts['writeQx']=[{id:'0',name:'全部可写'},{id:'1',name:'同机构可写'},{id:'2',name:'同项目可写'},{id:'3',name:'创建者的上级可写'},{id:'9',name:'仅自己可写'},]
+    if(itemCodes.length>0){
+       initSimpleDicts('all',itemCodes).then(res=>{
+           Object.assign(that.dicts,res.data.data)
+       });
+    }
+   };
\ No newline at end of file
diff --git a/src/api/xm/core/xmProjectEnvList.js b/src/api/xm/core/xmProjectEnvList.js
deleted file mode 100644
index d1ecb711..00000000
--- a/src/api/xm/core/xmProjectEnvList.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import axios from '@/utils/request'
-
-import config from '@/common/config'
-
-let base = config.getCoreBasePath();
-
-
-/**
- * xm_project_env_list
- *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',remark:'备注说明',ipAddress:'ip地址',port:'访问端口',projectId:'归属项目组',projectName:'归属项目组名称',accessUserid:'访问用户编号',accessPassword:'访问密码',effect:'作用说明',accessUrl:'访问链接',webIpAddress:'外网ip地址',webPort:'外网端口',otherRemark:'其它说明',createUserid:'添加人员',createUsername:'添加人员姓名',createTime:'添加时间'}
- **/
- 
-//普通查询 条件之间and关系  
-export const listXmProjectEnvList = params => { return axios.get(`${base}/xm/core/xmProjectEnvList/list`, { params: params }); };
-
-//模糊查询xm_project_env_list 条件之间or关系  
-//export const listXmProjectEnvListKey = params => { return axios.get(`${base}/xm/core/xmProjectEnvList/listKey`, { params: params }); };
-
-//删除一条xm_project_env_list params={id:'主键 主键'}
-export const delXmProjectEnvList = params => { return axios.post(`${base}/xm/core/xmProjectEnvList/del`,params); };
-
-//批量删除xm_project_env_list  params=[{id:'主键 主键'}]
-export const batchDelXmProjectEnvList = params => { return axios.post(`${base}/xm/core/xmProjectEnvList/batchDel`, params); };
-
-//修改一条xm_project_env_list记录
-export const editXmProjectEnvList = params => { return axios.post(`${base}/xm/core/xmProjectEnvList/edit`, params); };
-
-//新增一条xm_project_env_list
-export const addXmProjectEnvList = params => { return axios.post(`${base}/xm/core/xmProjectEnvList/add`, params); };
\ No newline at end of file
diff --git a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
index 5efd9abd..c4262af1 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
@@ -2,7 +2,7 @@
 	<section class="page-container  padding border">
 		<el-row>
 			<!--新增界面 XmEnvList xm_env_list--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
+			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
 				<el-form-item label="内网ip地址" prop="ipAddress">
 					<el-input v-model="addForm.ipAddress" placeholder="内网ip地址" ></el-input>
 				</el-form-item> 
@@ -14,25 +14,16 @@
 				</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="effect">
-					<el-input v-model="addForm.effect" placeholder="作用说明" ></el-input>
-				</el-form-item> 
+				</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="供应商" prop="supplier">
-					<el-input v-model="addForm.supplier" placeholder="供应商" ></el-input>
-				</el-form-item> 
+				</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-form-item label="其它说明" prop="otherRemark">
-					<el-input v-model="addForm.otherRemark" placeholder="其它说明" ></el-input>
-				</el-form-item> 
+				</el-form-item>  
 				
 				<el-form-item label="状态" prop="envState">
 					<el-radio-group v-model="addForm.envState">
@@ -40,21 +31,19 @@
 						<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-form-item label="有效日期开始" prop="startTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.startTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="有效日期结束" prop="endTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="费用" prop="feeAmount">
-					<el-input type="number" min="0"  v-model="addForm.feeAmount" placeholder="费用"></el-input>
-				</el-form-item> 
-				<el-form-item label="计费规则" prop="feeRule">
-					<el-input v-model="addForm.feeRule" placeholder="计费规则" ></el-input>
-				</el-form-item>
 				<el-form-item label="备注说明" prop="remark">
-					<el-input v-model="addForm.remark" placeholder="备注说明" ></el-input>
+					<el-input type="textarea" rows="4" v-model="addForm.remark" placeholder="备注说明" ></el-input>
 				</el-form-item>
 				<el-form-item label="添加人员姓名" prop="createUsername">
 					{{userInfo.username}}
@@ -73,7 +62,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
-	import { addXmEnvList } from '@/api/xm/core/xmEnvList';
+	import { initDicts,addXmEnvList } from '@/api/xm/core/xmEnvList';
 	import { mapGetters } from 'vuex'
 	
 	export default { 
@@ -82,7 +71,7 @@
 		      'userInfo','roles'
 		    ])
 		},
-		props:['xmEnvList','visible'],
+		props:['xmEnvList','visible','xmProject'],
 		watch: {
 	      'xmEnvList':function( xmEnvList ) {
 	        this.addForm = xmEnvList;
@@ -119,7 +108,7 @@
 			};
 
 			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{readQx:[],wrightQx:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					startTime: [
@@ -137,7 +126,7 @@
 				},
 				//新增界面数据 xm_env_list
 				addForm: {
-					id:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'',startTime:'',endTime:'',feeAmount:'',feeRule:''
+					id:'',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'
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				
@@ -174,12 +163,12 @@
 						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
 							this.load.add=true
 							let params = Object.assign({}, this.addForm); 
+							params.projectId=this.xmProject.id
 							addXmEnvList(params).then((res) => {
 								this.load.add=false
 								var tips=res.data.tips;
 								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
+ 									this.$emit('submit');//  @submit="afterAddSubmit"
 								}
 								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
 							}).catch( err  => this.load.add=false);
@@ -210,6 +199,7 @@
 		    //在下面添加其它组件 'xm-env-list-edit':XmEnvListEdit
 		},
 		mounted() {
+			initDicts(this)
 			this.addForm=Object.assign(this.addForm, this.xmEnvList);  
 			/**在下面写其它函数***/
 			
diff --git a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
index bd128d56..9b76b5aa 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
@@ -14,25 +14,16 @@
 				</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="effect">
-					<el-input v-model="editForm.effect" placeholder="作用说明" ></el-input>
-				</el-form-item> 
+				</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="供应商" prop="supplier">
-					<el-input v-model="editForm.supplier" placeholder="供应商" ></el-input>
-				</el-form-item> 
+				</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="otherRemark">
-					<el-input v-model="editForm.otherRemark" placeholder="其它说明" ></el-input>
-				</el-form-item> 
+				</el-form-item>  
 				
 				<el-form-item label="状态" prop="envState">
 					<el-radio-group v-model="editForm.envState">
@@ -41,23 +32,28 @@
 						<el-radio label="2">已过期</el-radio>
 					</el-radio-group>
 				</el-form-item> 
+				
+				<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">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.startTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
 				<el-form-item label="有效日期结束" prop="endTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="费用" prop="feeAmount">
-					<el-input type="number" min="0" v-model="editForm.feeAmount" placeholder="费用"></el-input>
-				</el-form-item> 
-				<el-form-item label="计费规则" prop="feeRule">
-					<el-input v-model="editForm.feeRule" placeholder="计费规则" ></el-input>
-				</el-form-item>
+				</el-form-item>   
 				<el-form-item label="备注说明" prop="remark">
-					<el-input v-model="editForm.remark" placeholder="备注说明" ></el-input>
+					<el-input type="textarea" rows="4" v-model="editForm.remark" placeholder="备注说明" ></el-input>
 				</el-form-item>
-				<el-form-item label="添加人员姓名" prop="createUsername">
-					{{userInfo.username}}
+				<el-form-item label="创建者姓名" prop="createUsername">
+					{{editForm.createUsername}}
 				</el-form-item> 
 				<el-form-item> 
 					<el-col :span="24" :offset="8"> 
@@ -73,7 +69,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { editXmEnvList } from '@/api/xm/core/xmEnvList';
+	import { initDicts,editXmEnvList } from '@/api/xm/core/xmEnvList';
 	import { mapGetters } from 'vuex'
 	
 	export default { 
@@ -98,7 +94,7 @@
 	    },
 		data() {
 			return {
-				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{readQx:[],wrightQx:[]},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
@@ -148,6 +144,7 @@
 		    //在下面添加其它组件 'xm-env-list-edit':XmEnvListEdit
 		},
 		mounted() {
+			initDicts(this),
 			this.editForm=Object.assign(this.editForm, this.xmEnvList);  
 		}
 	}
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index ea3f3068..c72bd13b 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -3,34 +3,26 @@
 		<el-row>
 			<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="searchXmEnvLists">查询</el-button>
-			<el-button type="primary" @click="showAdd">添加环境清单</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
+			<span style="float:right;">
+			<el-button type="primary" @click="showAdd" icon="el-icon-plus">添加环境清单</el-button>
+			</span>
 		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmEnvList xm_env_list-->
 			<el-table ref="table" :height="maxTableHeight" :data="xmEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
-				<el-table-column prop="ipAddress" label="内网ip地址" min-width="80" ></el-table-column>
-				<el-table-column prop="port" label="内网访问端口" min-width="80" ></el-table-column>
-				<el-table-column prop="accessUserid" label="访问用户编号" min-width="80" ></el-table-column>
-				<el-table-column prop="accessPassword" label="访问密码" min-width="80" ></el-table-column>
-				<el-table-column prop="effect" label="作用说明" min-width="80" ></el-table-column>
+				<el-table-column prop="ipAddress" label="内网ip" min-width="80" ></el-table-column>
+				<el-table-column prop="port" label="内网端口" min-width="80" ></el-table-column>
+				<el-table-column prop="accessUserid" label="用户编号" min-width="80" ></el-table-column>
 				<el-table-column prop="accessUrl" label="访问链接" min-width="80" ></el-table-column>
-				<el-table-column prop="supplier" label="供应商" min-width="80" ></el-table-column>
-				<el-table-column prop="webIpAddress" label="外网ip地址" min-width="80" ></el-table-column>
+				<el-table-column prop="webIpAddress" label="外网ip" min-width="80" ></el-table-column>
 				<el-table-column prop="webPort" label="外网端口" min-width="80" ></el-table-column>
 				<el-table-column prop="envState" label="状态" min-width="80" >
 					<template slot-scope="scope">
 						{{envStateList[parseInt(scope.row.envState)]}}
 					</template>
 				</el-table-column>
-				<el-table-column prop="startTime" label="有效日期开始" min-width="80" ></el-table-column>
-				<el-table-column prop="endTime" label="有效日期结束" min-width="80" ></el-table-column>
-				<el-table-column prop="feeAmount" label="费用" min-width="80" ></el-table-column>
-				<el-table-column prop="feeRule" label="计费规则" min-width="80" ></el-table-column>
 				<el-table-column prop="remark" label="备注说明" min-width="80" ></el-table-column>
-				<el-table-column prop="otherRemark" label="其它说明" min-width="80" ></el-table-column>
-				<el-table-column prop="createTime" label="添加时间" min-width="80" ></el-table-column>
 				<el-table-column prop="createUsername" label="添加人姓名" min-width="80" ></el-table-column>
 				<el-table-column label="操作" width="160" fixed="right"  >
 					<template slot-scope="scope">
@@ -48,7 +40,7 @@
 	
 			<!--新增 XmEnvList xm_env_list界面-->
 			<el-drawer title="新增环境清单" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-env-list-add :xm-env-list="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-env-list-add>
+				<xm-env-list-add :xm-project="selProject" :xm-env-list="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-env-list-add>
 			</el-drawer> 
 		</el-row>
 	</section>
@@ -69,6 +61,7 @@
 		      'userInfo','roles'
 		    ])
 		},
+		props:['selProject'],
 		data() {
 			return {
 				filters: {
@@ -90,13 +83,13 @@
 				addFormVisible: false,//新增xmEnvList界面是否显示
 				//新增xmEnvList界面初始化数据
 				addForm: {
-					id:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'',startTime:'',endTime:'',feeAmount:'',feeRule:''
+					id:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'1',startTime:'',endTime:'',feeAmount:'',feeRule:'',readQx:'3',writeQx:'3'
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmEnvList界面初始化数据
 				editForm: {
-					id:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'',startTime:'',endTime:'',feeAmount:'',feeRule:''
+					id:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'',startTime:'',endTime:'',feeAmount:'',feeRule:'',readQx:'3',writeQx:'3'
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				
@@ -163,8 +156,9 @@
 				if(this.filters.key!==""){
 					params.fuzzy = '%'+this.filters.key+'%';
 					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
+				} 
+				if(this.selProject && this.selProject.id){
+					params.projectId=this.selProject.id
 				}
 				this.load.list = true;
 				params.branchId = this.userInfo.branchId;
diff --git a/src/views/xm/core/xmFile/XmFileAdd.vue b/src/views/xm/core/xmFile/XmFileAdd.vue
index ede1c483..2cedce65 100644
--- a/src/views/xm/core/xmFile/XmFileAdd.vue
+++ b/src/views/xm/core/xmFile/XmFileAdd.vue
@@ -11,7 +11,7 @@
 					<el-input v-model="addForm.name" placeholder="文件名称" ></el-input>
 				</el-form-item>
 				<el-form-item label="文件说明" prop="description">
-					<vue-editor :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
+					<vue-editor v-if="visible" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
 				</el-form-item>
 				<el-form-item label="附件">
 					<upload v-if="fileVisible" :archiveId="addForm.id" :branchId="userInfo.branchId"  @on-change="onChange"></upload>
diff --git a/src/views/xm/core/xmFile/XmFileEdit.vue b/src/views/xm/core/xmFile/XmFileEdit.vue
index f6e2576a..e5cf4867 100644
--- a/src/views/xm/core/xmFile/XmFileEdit.vue
+++ b/src/views/xm/core/xmFile/XmFileEdit.vue
@@ -10,7 +10,7 @@
 					<el-input v-model="editForm.name" placeholder="文件名称"></el-input>
 				</el-form-item>
 				<el-form-item label="文件说明" prop="description">
-					<vue-editor :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor>
+					<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>
diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue
index a76caed1..3a306f11 100644
--- a/src/views/xm/core/xmFile/XmFileMng.vue
+++ b/src/views/xm/core/xmFile/XmFileMng.vue
@@ -1,17 +1,13 @@
 <template>
 	<section>
-		<el-row v-if="!InfoVisible" class="xm-file">
-			<el-menu disable active-text-color="#00abfc"
-			default-active="all"
-			class="el-menu-demo" mode="horizontal">
-			<!-- :default-active="selkey" 
-			@select="changeSelKey"  -->
-				<el-menu-item class="showall" index="all">全部</el-menu-item>
-				<div style="line-height:50px;float:right;margin-right:10px;">
-					<el-input style="width:200px;" v-model="searchFile" placeholder="文档搜索"></el-input>
+		<el-row v-if="!InfoVisible" class="xm-file"> 
+			<el-row class="padding">
+				<el-input style="width:200px;" v-model="searchFile" placeholder="文档搜索"></el-input>
+				<el-button @click="searchXmFiles" type="plian" icon="el-icon-search">查询</el-button>
+				<div style=" float:right; "> 
 					<el-button @click="showAdd" type="plian">新建文档</el-button>
-				</div>
-			</el-menu> 
+				</div> 
+			</el-row>
 			<!--列表 XmFile xm_file-->
 			<el-table ref="table" :height="tableHeight" :data="xmFiles" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
@@ -24,8 +20,8 @@
 							placement="left"
 							trigger="hover"> -->
 							<el-button-group>
-								<el-button size="small" type="primary" @click.stop="showEdit(scope.row,scope.$index)">编辑</el-button>
-								<el-button size="small" type="primary" @click.stop="handleDel(scope.row,scope.$index)">删除</el-button>
+								<el-button size="mini" type="primary" @click.stop="showEdit(scope.row,scope.$index)">编辑</el-button>
+								<el-button size="mini" type="danger" @click.stop="handleDel(scope.row,scope.$index)">删除</el-button>
 							</el-button-group>
 							<!-- <el-button slot="reference" class="see-more" type="text" icon="el-icon-more"></el-button>
 						</el-popover>	 -->
@@ -183,7 +179,7 @@
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false;
-						this.selProject.file = res.data.data;
+						this.xmFiles = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
 					} 
diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index c0857254..6dff414e 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -65,7 +65,7 @@
 	import xmCost from '../xmProject/XmProjectCost';
 	import xmBudget from '../xmProject/XmProjectBudgetCost';
 	import xmContract from '../xmContract/XmContractMng';
-	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng'; 
+	import xmEnvList from '../xmEnvList/XmEnvListMng'; 
 	import xmMenuMng from '../xmMenu/XmMenuMng';
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
diff --git a/src/views/xm/core/xmProduct/XmProductInfo.vue b/src/views/xm/core/xmProduct/XmProductInfo.vue
index 684f573c..8ebe41d1 100644
--- a/src/views/xm/core/xmProduct/XmProductInfo.vue
+++ b/src/views/xm/core/xmProduct/XmProductInfo.vue
@@ -216,7 +216,7 @@
 	import xmCost from '../xmProject/XmProjectCost';
 	import xmBudget from '../xmProject/XmProjectBudgetCost';
 	import xmContract from '../xmContract/XmContractMng';
-	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng'; 
+	import xmEnvList from '../xmEnvList/XmEnvListMng'; 
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
 	import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';  
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 75dd0ddd..0d876545 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -170,7 +170,7 @@
 	import xmCost from './XmProjectCost';
 	import xmBudget from './XmProjectBudgetCost';
 	import xmContract from '../xmContract/XmContractMng';
-	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng'; 
+	import xmEnvList from '../xmEnvList/XmEnvListMng'; 
 	import xmMenuMng from '../xmMenu/XmMenuMng';
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
deleted file mode 100644
index 0a17a289..00000000
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmProjectEnvList xm_project_env_list--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="归属项目组名称" prop="projectName">
-					{{currProject.name}}
-				</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 v-model="addForm.port" type="number" min="0" 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="effect">
-					<el-input v-model="addForm.effect" placeholder="作用说明" ></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-form-item label="其它说明" prop="otherRemark">
-					<el-input type="textarea" :row="3" v-model="addForm.otherRemark" placehdlder="其它说明" ></el-input>
-				</el-form-item> 
-				<el-form-item label="备注说明" prop="remark">
-					<el-input type="textarea" :row="3" 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"> 
-						<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>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
-	import { addXmProjectEnvList } from '@/api/xm/core/xmProjectEnvList';
-	import { mapGetters } from 'vuex'
-	
-	export default {
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectEnvList','visible',"currProject"],
-		watch: {
-	      'xmProjectEnvList':function( xmProjectEnvList ) {
-	        this.addForm = xmProjectEnvList;
-	      },
-	      'visible':function(visible) {
-	      	if(visible==true){
-						this.$refs["addForm"].resetFields();
-						this.addForm.projectId = this.currProject.id;
-						this.addForm.projectName = this.currProject.name;
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//新增界面数据 xm_project_env_list
-				addForm: {
-					id:'',remark:'',ipAddress:'',port:'',projectId:'',projectName:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmProjectEnvList xm_project_env_list 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true;
-							this.addForm.projectId = this.currProject.id;
-							this.addForm.projectName = this.currProject.name;
-							let params = Object.assign({}, this.addForm); 
-							addXmProjectEnvList(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-env-list-edit':XmProjectEnvListEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectEnvList);  
-			this.addForm.projectId = this.currProject.id;
-			this.addForm.projectName = this.currProject.name;
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
deleted file mode 100644
index 9bfb3e1c..00000000
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row> 
-		<!--编辑界面 XmProjectEnvList xm_project_env_list--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="归属项目组名称" prop="projectName">
-					{{editForm.projectName}}
-				</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 v-model="editForm.port" type="number" min="0" 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="effect">
-					<el-input v-model="editForm.effect" placeholder="作用说明"></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 v-model="editForm.webPort" type="number" min="0" placeholder="外网端口"></el-input>
-				</el-form-item> 
-				<el-form-item label="其它说明" prop="otherRemark">
-					<el-input type="textarea" :row="3" v-model="editForm.otherRemark" placeholder="其它说明"></el-input>
-				</el-form-item>
-				<el-form-item label="备注说明" prop="remark">
-					<el-input type="textarea" :row="3" v-model="editForm.remark" placeholder="备注说明"></el-input>
-				</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-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-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { editXmProjectEnvList } from '@/api/xm/core/xmProjectEnvList';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectEnvList','visible'],
-		watch: {
-	      'xmProjectEnvList':function( xmProjectEnvList ) {
-	        this.editForm = xmProjectEnvList;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				editFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据  XmProjectEnvList xm_project_env_list
-				editForm: {
-					id:'',remark:'',ipAddress:'',port:'',projectId:'',projectName:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmProjectEnvList xm_project_env_list父组件监听@submit="afterEditSubmit"
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmProjectEnvList(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterEditSubmit"
-								}
-								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err =>this.load.edit=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-env-list-edit':XmProjectEnvListEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmProjectEnvList);  
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
deleted file mode 100644
index 6395d422..00000000
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ /dev/null
@@ -1,338 +0,0 @@
-<template>
-	<section>
-		<div class="navbar">
-			<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="searchXmProjectEnvLists">查询</el-button>
-			<el-button type="primary" @click="showAdd">添加项目环境清单</el-button>
-			<el-button type="primary" @click="showImport">选择已有环境清单</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-		</div>
-		<el-row class="page-main "> 
-			<!--列表 XmProjectEnvList xm_project_env_list-->
-			<el-table ref="table" :height="tableHeight" :data="xmProjectEnvLists" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column sortable type="selection" width="40"></el-table-column>
-				<el-table-column prop="ipAddress" label="ip地址" min-width="80" ></el-table-column>
-				<el-table-column prop="port" label="访问端口" min-width="80" ></el-table-column>
-				<el-table-column prop="projectName" label="归属项目组名称" min-width="80" ></el-table-column>
-				<el-table-column prop="accessUserid" label="访问用户编号" min-width="80" ></el-table-column>
-				<el-table-column prop="accessPassword" label="访问密码" min-width="80" ></el-table-column>
-				<el-table-column prop="effect" label="作用说明" min-width="80" ></el-table-column>
-				<el-table-column prop="accessUrl" label="访问链接" min-width="80" ></el-table-column>
-				<el-table-column prop="webIpAddress" label="外网ip地址" min-width="80" ></el-table-column>
-				<el-table-column prop="webPort" label="外网端口" min-width="80" ></el-table-column>
-				<el-table-column prop="remark" label="备注说明" min-width="80" ></el-table-column>
-				<el-table-column prop="otherRemark" label="其它说明" min-width="80" ></el-table-column>
-				<el-table-column prop="createUsername" label="添加人员姓名" min-width="80" ></el-table-column>
-				<el-table-column prop="createTime" label="添加时间" min-width="80" ></el-table-column>
-				<el-table-column label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button>
-					</template>
-				</el-table-column>
-			</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> 
-		
-			<!--编辑 XmProjectEnvList xm_project_env_list界面-->
-			<el-drawer title="编辑项目环境清单" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				  <xm-project-env-list-edit :xm-project-env-list="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-env-list-edit>
-			</el-drawer>
-	
-			<!--新增 XmProjectEnvList xm_project_env_list界面-->
-			<el-drawer title="新增项目环境清单" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-project-env-list-add :curr-project="currProject" :xm-project-env-list="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-project-env-list-add>
-			</el-drawer>
-
-			<el-drawer title="环境清单" :visible.sync="importVisible" size="80%" append-to-body   :close-on-click-modal="false">
-				<el-table :data="envList" highlight-current-row v-loading="load.list" border @current-change="handleCurrent" style="width: 100%;">
-					<el-table-column prop="ipAddress" label="内网ip地址" min-width="80" ></el-table-column>
-					<el-table-column prop="port" label="内网访问端口" min-width="80" ></el-table-column>
-					<el-table-column prop="accessUserid" label="访问用户编号" min-width="80" ></el-table-column>
-					<el-table-column prop="accessPassword" label="访问密码" min-width="80" ></el-table-column>
-					<el-table-column prop="effect" label="作用说明" min-width="80" ></el-table-column>
-					<el-table-column prop="accessUrl" label="访问链接" min-width="80" ></el-table-column>
-					<el-table-column prop="supplier" label="供应商" min-width="80" ></el-table-column>
-					<el-table-column prop="webIpAddress" label="外网ip地址" min-width="80" ></el-table-column>
-					<el-table-column prop="webPort" label="外网端口" min-width="80" ></el-table-column>
-					<el-table-column prop="envState" label="状态" min-width="80" >
-						<template slot-scope="scope">
-							{{envStateList[parseInt(scope.row.envState)]}}
-						</template>
-					</el-table-column>
-					<el-table-column prop="startTime" label="有效日期开始" min-width="80" ></el-table-column>
-					<el-table-column prop="endTime" label="有效日期结束" min-width="80" ></el-table-column>
-					<el-table-column prop="feeAmount" label="费用" min-width="80" ></el-table-column>
-					<el-table-column prop="feeRule" label="计费规则" min-width="80" ></el-table-column>
-					<el-table-column prop="remark" label="备注说明" min-width="80" ></el-table-column>
-					<el-table-column prop="otherRemark" label="其它说明" min-width="80" ></el-table-column>
-					<el-table-column prop="createTime" label="添加时间" min-width="80" ></el-table-column>
-					<el-table-column prop="createUsername" label="添加人姓名" min-width="80" ></el-table-column>
-					<el-table-column label="操作" width="80" fixed="right"  >
-						<template slot-scope="scope">
-							<el-button @click="confirmAdd( scope.row,scope.$index)">选择</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</el-drawer>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { listXmProjectEnvList, addXmProjectEnvList, delXmProjectEnvList, batchDelXmProjectEnvList } from '@/api/xm/core/xmProjectEnvList';
-	import { listXmEnvList } from '@/api/xm/core/xmEnvList';
-	import  XmProjectEnvListAdd from './XmProjectEnvListAdd';//新增界面
-	import  XmProjectEnvListEdit from './XmProjectEnvListEdit';//修改界面
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		props: ["selProject"],
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		data() {
-			return {
-				filters: {
-					key: ''
-				},
-				xmProjectEnvLists: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
-				addFormVisible: false,//新增xmProjectEnvList界面是否显示
-				//新增xmProjectEnvList界面初始化数据
-				addForm: {
-					id:'',remark:'',ipAddress:'',port:'',projectId:'',projectName:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmProjectEnvList界面初始化数据
-				editForm: {
-					id:'',remark:'',ipAddress:'',port:'',projectId:'',projectName:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:''
-				},
-				/**begin 自定义属性请在下面加 请加备注**/
-				
-				envList: [],
-				envStateList:["不可用","已启用","已过期"],
-				importVisible: false,
-				currentRow: null,
-				currProject: {
-					id: this.selProject.id,
-					name: this.selProject.name,
-				},
-
-				tableHeight:300,
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmProjectEnvLists();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmProjectEnvLists();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmProjectEnvLists();
-			},
-			searchXmProjectEnvLists(){
-				 this.pageInfo.count=true; 
-				 this.getXmProjectEnvLists();
-			},
-			//获取列表 XmProjectEnvList xm_project_env_list
-			getXmProjectEnvLists() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					params.fuzzy = '%' + this.filters.key + '%';
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
-				}
-				this.load.list = true;
-				// params.projectId = this.selProject.id;
-				listXmProjectEnvList(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmProjectEnvLists = res.data.data;
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmProjectEnvList xm_project_env_list
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmProjectEnvList xm_project_env_list
-			showAdd: function () {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmProjectEnvLists();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//选择行xmProjectEnvList
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			//删除xmProjectEnvList
-			handleDel: function (row,index) { 
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					let params = { id: row.id };
-					delXmProjectEnvList(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.count=true;
-							this.getXmProjectEnvLists();
-						}
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmProjectEnvList
-			batchDel: function () {
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					batchDelXmProjectEnvList(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.count=true;
-							this.getXmProjectEnvLists(); 
-						}
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			},
-			/**begin 自定义函数请在下面加**/
-
-			showImport(){
-				this.importVisible = true;
-				this.load.list=true;
-				let params = {
-					branchId: this.userInfo.branchId,
-					projectId: this.selProject.id,
-				};
-				listXmEnvList(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.envList = res.data.data;
-						// console.log(this.envList);
-						// this.getXmProjectEnvLists();
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			handleCurrent(val) {
-				this.currentRow = val;
-				console.log(this.currentRow);
-			},
-
-			confirmAdd(row,index) {
-				this.$confirm('确认选择这个吗？', '提示', {}).then(() => { 
-					this.load.add=true;
-					row.projectId = this.selProject.id;
-					row.projectName = this.selProject.name;
-					let params = Object.assign({}, row); 
-					addXmProjectEnvList(params).then((res) => {
-						this.load.add=false;
-						var tips=res.data.tips;
-						if(tips.isOk){
-							this.importVisible = false;
-							this.getXmProjectEnvLists();
-						}
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.add=false);
-				});
-			}
-			
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: { 
-		    'xm-project-env-list-add':XmProjectEnvListAdd,
-		    'xm-project-env-list-edit':XmProjectEnvListEdit,
-		    
-		    //在下面添加其它组件
-		},
-		mounted() { 
-			this.$nextTick(() => { 
-				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);  
-				console.log(this.currProject);
-				this.getXmProjectEnvLists();
-			});
-		}
-	}
-
-</script>
-
-<style scoped>
-.navbar{
-	background: #fafbfc;
-	padding: 0 20px;
-	height: 50px;
-	overflow: auto hidden;
-	line-height: 50px;
-}
-</style>
\ No newline at end of file