end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化环境清单

master
陈裕财 4 years ago
parent
9718ae4190
commit
7e540d655b
3 changed files with 62 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      src/views/xm/core/xmEnvList/XmEnvListAdd.vue
  2. 20
      src/views/xm/core/xmEnvList/XmEnvListEdit.vue
  3. 23
      src/views/xm/core/xmEnvList/XmEnvListMng.vue

57
src/views/xm/core/xmEnvList/XmEnvListAdd.vue
View File

@ -1,8 +1,18 @@
<template> <template>
<section class="page-container padding border">
<section class="padding">
<el-row> <el-row>
<!--新增界面 XmEnvList xm_env_list--> <!--新增界面 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="归属项目" 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-item label="名称" prop="name">
<el-input v-model="addForm.name" placeholder="名称" ></el-input>
</el-form-item>
<el-form-item label="内网ip地址" prop="ipAddress"> <el-form-item label="内网ip地址" prop="ipAddress">
<el-input v-model="addForm.ipAddress" placeholder="内网ip地址" ></el-input> <el-input v-model="addForm.ipAddress" placeholder="内网ip地址" ></el-input>
</el-form-item> </el-form-item>
@ -63,6 +73,7 @@
import util from '@/common/js/util';//全局公共库 import util from '@/common/js/util';//全局公共库
//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 //import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
import { initDicts,addXmEnvList } from '@/api/xm/core/xmEnvList'; import { initDicts,addXmEnvList } from '@/api/xm/core/xmEnvList';
import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
@ -71,14 +82,14 @@
'userInfo','roles' 'userInfo','roles'
]) ])
}, },
props:['xmEnvList','visible','xmProject'],
props:['xmEnvList','visible','xmProject','xmProduct'],
watch: { watch: {
'xmEnvList':function( xmEnvList ) { 'xmEnvList':function( xmEnvList ) {
this.addForm = xmEnvList;
Object.assign(this.addForm,xmEnvList)
}, },
'visible':function(visible) { 'visible':function(visible) {
if(visible==true){ if(visible==true){
this.$refs['addForm'].resetFields();
this.initData();
//从新打开页面时某些数据需要重新加载，可以在这里添加 //从新打开页面时某些数据需要重新加载，可以在这里添加
} }
} }
@ -110,23 +121,17 @@
return { return {
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'}]} 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 },//查询中... load:{ list: false, edit: false, del: false, add: false },//查询中...
addFormRules: {
startTime: [
{ validator: validateStart, trigger: 'blur' },
],
endTime: [
{ validator: validateEnd, trigger: 'blur' },
],
addFormRules: {
envState: [ envState: [
{ required: true, message: '状态不能为空', trigger: 'blur' }
{ required: true, message: '状态不能为空', trigger: 'change' }
], ],
id: [
//{ required: true, message: '主键不能为空', trigger: 'blur' }
name: [
{ required: true, message: '名称不能为空', trigger: 'change' }
] ]
}, },
//新增界面数据 xm_env_list //新增界面数据 xm_env_list
addForm: { addForm: {
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'
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 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
@ -162,8 +167,7 @@
this.$confirm('确认提交吗？', '提示', {}).then(() => { this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.load.add=true this.load.add=true
let params = Object.assign({}, this.addForm);
params.projectId=this.xmProject.id
let params = Object.assign({}, this.addForm);
addXmEnvList(params).then((res) => { addXmEnvList(params).then((res) => {
this.load.add=false this.load.add=false
var tips=res.data.tips; var tips=res.data.tips;
@ -191,16 +195,31 @@
isEmpty(val) { isEmpty(val) {
return val == "" || val == null || typeof(val) == undefined; return val == "" || val == null || typeof(val) == undefined;
}, },
onProjectRowClick(project){
this.addForm.projectId=project.id
this.addForm.projectName=project.name
},
initData(){
if(this.xmProject && this.xmProject.id){
this.addForm.projectId=this.xmProject.id
this.addForm.projectName=this.xmProject.name
}else{
this.addForm.projectId=''
this.addForm.projectName=''
}
}
/**end 在上面加自定义方法**/ /**end 在上面加自定义方法**/
},//end method },//end method
components: { components: {
XmProjectSelect,
//在下面添加其它组件 'xm-env-list-edit':XmEnvListEdit //在下面添加其它组件 'xm-env-list-edit':XmEnvListEdit
}, },
mounted() { mounted() {
initDicts(this)
this.addForm=Object.assign(this.addForm, this.xmEnvList); this.addForm=Object.assign(this.addForm, this.xmEnvList);
this.initData();
initDicts(this)
/**在下面写其它函数***/ /**在下面写其它函数***/
}//end mounted }//end mounted

20
src/views/xm/core/xmEnvList/XmEnvListEdit.vue
View File

@ -1,8 +1,11 @@
<template> <template>
<section class="page-container padding border">
<section class="padding border">
<el-row> <el-row>
<!--编辑界面 XmEnvList xm_env_list--> <!--编辑界面 XmEnvList xm_env_list-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm"> <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-form-item>
<el-form-item label="内网ip地址" prop="ipAddress"> <el-form-item label="内网ip地址" prop="ipAddress">
<el-input v-model="editForm.ipAddress" placeholder="内网ip地址" ></el-input> <el-input v-model="editForm.ipAddress" placeholder="内网ip地址" ></el-input>
</el-form-item> </el-form-item>
@ -43,12 +46,9 @@
<el-option v-for="(item,index) in dicts['writeQx']" :key="index" :value="item.id" :label="item.name"></el-option> <el-option v-for="(item,index) in dicts['writeQx']" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select> </el-select>
</el-form-item> </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="startTime,endTime">
<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"></date-range>
</el-form-item>
<el-form-item label="备注说明" prop="remark"> <el-form-item label="备注说明" prop="remark">
<el-input type="textarea" rows="4" 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>
@ -97,13 +97,13 @@
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'}]} 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 },//查询中... load:{ list: false, edit: false, del: false, add: false },//查询中...
editFormRules: { editFormRules: {
id: [
//{ required: true, message: '主键不能为空', trigger: 'blur' }
name: [
{ required: true, message: '名称不能为空', trigger: 'change' }
] ]
}, },
//编辑界面数据 XmEnvList xm_env_list //编辑界面数据 XmEnvList xm_env_list
editForm: { editForm: {
id:'',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:'',startTime:'',endTime:'',feeAmount:'',feeRule:''
} }
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/

23
src/views/xm/core/xmEnvList/XmEnvListMng.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<section class="page-container padding border"> <section class="page-container padding border">
<el-row> <el-row>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable></el-input>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmEnvLists">查询</el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmEnvLists">查询</el-button>
<span style="float:right;"> <span style="float:right;">
<el-button type="primary" @click="showAdd" icon="el-icon-plus">添加环境清单</el-button> <el-button type="primary" @click="showAdd" icon="el-icon-plus">添加环境清单</el-button>
@ -11,6 +11,7 @@
<!--列表 XmEnvList xm_env_list--> <!--列表 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 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 sortable type="selection" width="40"></el-table-column>
<el-table-column prop="name" label="名称" min-width="80" ></el-table-column>
<el-table-column prop="ipAddress" label="内网ip" 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="port" label="内网端口" min-width="80" ></el-table-column>
<el-table-column prop="accessUserid" label="用户编号" min-width="80" ></el-table-column> <el-table-column prop="accessUserid" label="用户编号" min-width="80" ></el-table-column>
@ -34,14 +35,14 @@
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination> <el-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界面--> <!--编辑 XmEnvList xm_env_list界面-->
<el-drawer title="编辑环境清单" :visible.sync="editFormVisible" size="50%" append-to-body :close-on-click-modal="false">
<el-dialog title="编辑环境清单" :visible.sync="editFormVisible" width="60%" 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> <xm-env-list-edit :xm-env-list="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-env-list-edit>
</el-drawer>
</el-dialog>
<!--新增 XmEnvList xm_env_list界面--> <!--新增 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-project="selProject" :xm-env-list="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-env-list-add>
</el-drawer>
<el-dialog title="新增环境清单" :visible.sync="addFormVisible" 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> </el-row>
</section> </section>
</template> </template>
@ -61,7 +62,7 @@
'userInfo','roles' 'userInfo','roles'
]) ])
}, },
props:['selProject'],
props:['selProject','xmProduct'],
data() { data() {
return { return {
filters: { filters: {
@ -83,13 +84,13 @@
addFormVisible: false,//新增xmEnvList界面是否显示 addFormVisible: false,//新增xmEnvList界面是否显示
//新增xmEnvList界面初始化数据 //新增xmEnvList界面初始化数据
addForm: { addForm: {
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'
id:'',name:'',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',projectId:'',projectName:''
}, },
editFormVisible: false,//编辑界面是否显示 editFormVisible: false,//编辑界面是否显示
//编辑xmEnvList界面初始化数据 //编辑xmEnvList界面初始化数据
editForm: { editForm: {
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'
id:'',name:'',remark:'',ipAddress:'',port:'',branchId:'',accessUserid:'',accessPassword:'',effect:'',accessUrl:'',supplier:'',webIpAddress:'',webPort:'',otherRemark:'',createUserid:'',createUsername:'',createTime:'',envState:'',startTime:'',endTime:'',feeAmount:'',feeRule:'',readQx:'3',writeQx:'3',projectId:'',projectName:''
}, },
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
@ -160,6 +161,10 @@
if(this.selProject && this.selProject.id){ if(this.selProject && this.selProject.id){
params.projectId=this.selProject.id params.projectId=this.selProject.id
} }
if(this.xmProduct && this.xmProduct.id){
params.linkProductId=this.xmProduct.id
}
this.load.list = true; this.load.list = true;
params.branchId = this.userInfo.branchId; params.branchId = this.userInfo.branchId;
listXmEnvList(params).then((res) => { listXmEnvList(params).then((res) => {

Write Preview
Loading…
Cancel
Save