Skip to content

A
apaas-ui
Commit f9ac3f4d authored by 张俊's avatar 张俊
Browse files
Options

用户管理接口对接

parent e7514cbe
Show whitespace changes
Inline Side-by-side
Showing with 207 additions and 57 deletions
src/pages/authority/addroles.vue
View file @ f9ac3f4d
......@@ -207,17 +207,13 @@ export default {
{ max: 200, message: "长度小于200个字符", trigger: "blur" },
],
},
edit_flag:0,
};
},
watch: {},
computed: {},
created() {
this.now_user = this.$store.state.role;
getRole().then((data) => {
this.now_user = data;
this.$store.commit("rolefun", data);
this.now_page();
});
this.get_now_page()
console.log(this.$route);
},
mounted() {},
......@@ -233,16 +229,31 @@ export default {
}
});
},
now_page() {
if (this.$route.path.indexOf("edit") !== -1) {
this.getInfo();
get_now_page(){
console.log(this.$route);
if(this.$route.path.indexOf('add')!==-1){
this.edit_flag = 0
}
if(this.$route.path.indexOf('edit')!==-1){
this.edit_flag = 1
this.getInfo()
}
if (this.$route.path.indexOf("allot") !== -1) {
this.getInfo();
if(this.$route.path.indexOf('detail')!==-1){
this.edit_flag = 2
this.getInfo()
}
},
getInfo() {
console.log("111");
this.$http
.get(`/apaas/backmgt/role/id/${this.$route.params.id}`)
.then(response => {
console.log(response);
let data = response.data.data
})
.catch((response)=> {
});
},
changePermissions(values) {
console.log(values);
......
src/pages/authority/organizationuser.vue
View file @ f9ac3f4d
......@@ -10,9 +10,10 @@
<p class="formname">用户账号：</p>
<el-input v-model="form.account"></el-input>
</el-form-item>
<el-form-item prop="password">
<el-form-item prop="password" :class="{'shortpass':edit_flag}">
<p class="formname">登录密码：</p>
<el-input v-model="form.password"></el-input>
<el-input v-model="form.password" :disabled="tranform_flag(edit_flag)"></el-input>
<div v-if="edit_flag" class="fixpass" @click="change_pass()">修改密码</div>
</el-form-item>
<el-form-item prop="nickname">
<p class="formname">昵称：</p>
......@@ -33,11 +34,11 @@
<p class="formname">业务系统名称：</p>
<el-input v-model="form.systemname"></el-input>
</el-form-item>
<el-form-item prop="domain" v-if="now_user==0">
<el-form-item prop="domain">
<p class="formname">域名：</p>
<el-input v-model="form.domain"></el-input>
</el-form-item>
<el-form-item prop="ip" v-if="now_user==0">
<el-form-item prop="ip">
<p class="formname">IP白名单：</p>
<el-input v-model="form.ip"></el-input>
</el-form-item>
......@@ -58,7 +59,7 @@
<el-select v-model="form.origin" placeholder="请选择">
<el-option
v-for="item in originoptions"
:key="item.value"
:key="item.value+100"
:label="item.label"
:value="item.value">
</el-option>
......@@ -69,7 +70,7 @@
<el-select v-model="form.able" placeholder="请选择">
<el-option
v-for="item in ableoptions"
:key="item.value"
:key="item.value+200"
:label="item.label"
:value="item.value">
</el-option>
......@@ -94,7 +95,7 @@
<el-form-item>
<el-button @click="resetForm('form')" class="left" v-if="$route.name =='usersadd'">重置</el-button>
<el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button>
<el-button class="right">取消</el-button>
<el-button class="right" @click="backPage">取消</el-button>
</el-form-item>
</el-form>
......@@ -113,6 +114,16 @@ export default {
uploadFile,
},
data() {
var checkip = (rule, value, callback) => {
var reg = /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g
setTimeout(() => {
if (!reg.test(value)) {
callback(new Error('请使用;隔开ip地址'));
} else {
callback();
}
}, 1000);
};
return {
form: {
account:'',
......@@ -128,27 +139,26 @@ export default {
desc:'',
person:'',
date:'',
ip:'',
domain:''
},
open:true,
open1:false,
open2:'true',
now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
typeoptions:[
{
label:'普通用户',
value:0,
value:3,
},
{
label:'组织管理员',
value:1,
value:2,
},
{
label:'超级管理员',
value:2,
value:1,
},
{
label:'开发者',
value:3,
value:4,
}
],
originoptions:[
......@@ -168,11 +178,11 @@ export default {
ableoptions:[
{
label:'是',
value:1,
value:0,
},
{
label:'否',
value:0,
value:1,
},
],
origin_arr:[],
......@@ -180,38 +190,95 @@ export default {
able:[
{ required: true, message: '请选择是否禁用', trigger: 'change' }
],
domain:[
{ required: true, message: '请输入域名', trigger: 'blur' }
],
// domain:[
// { required: true, message: '请输入域名', trigger: 'blur' }
// ],
ip:[
{ required: true, message: '请输入ip地址', trigger: 'blur' }
// { required: true, message: '请输入ip地址', trigger: 'blur' }
],
}
},
edit_flag:0,
};
},
watch: {},
computed: {},
created() {
this.now_user = this.$store.state.role
getRole().then(data => {
this.now_user = data;
this.now_user = 0;
console.log(data);
this.$store.commit('rolefun',data)
this.getOriginArr()
});
console.log(this.$route);
this.get_now_page()
},
mounted() {},
methods: {
get_now_page(){
console.log(this.$route);
if(this.$route.path.indexOf('add')!==-1){
this.edit_flag = 0
}
if(this.$route.path.indexOf('edit')!==-1){
this.edit_flag = 1
this.get_user()
}
if(this.$route.path.indexOf('detail')!==-1){
this.edit_flag = 2
this.get_user()
}
},
tranform_flag(val){
return val?true:false
},
change_pass(){
this.$http
.put(`/apaas/backmgt/user/initalPasswd/${this.$route.params.id}`)
.then(response => {
console.log(response);
this.$message.success('修改成默认密码成功 默认密码：123456')
})
.catch((response)=> {
});
},
get_user(){
this.$http
.get(`/apaas/backmgt/user/detail/${this.$route.params.id}`)
.then(response => {
console.log(response);
let data = response.data.data
this.form={
account:data.user_id,
password:'******',
nickname:data.user_name,
type:data.is_admin,
systemname:data.system_name,
contact:data.link_man,
phone:data.phone,
email:data.email,
origin:data.department_id,
able:data.state,
desc:data.description,
person:data.create_user,
date:data.create_date,
ip:data.ip_whitelist.map((v,k)=>{
return v
}).join(';'),
domain:data.domain_name
}
})
.catch((response)=> {
});
},
getOriginArr(){
this.originoptions = []
this.$http
.get('/static/serviceedit.json')
.get('/apaas/backmgt/department/list')
.then(response => {
let data = response.data.data
this.origin_arr = data.origin_arr
// this.originoptions = data
data.forEach(e => {
this.originoptions.push({
label:e.department_name,
value:e.department_id
})
});
})
.catch(function(response) {
......@@ -219,26 +286,78 @@ export default {
},
removepic(){
this.$refs.servicepic.handleRemove()
},
backPage(){
this.$router.back(-1)
},
add_user(){
var temp = {
"user_id":this.form.account, // 用户名
"user_name":this.form.nickname, // 昵称
"system_name":this.form.systemname,//系统名称
"phone":this.form.phone, // 电话号
"email":this.form.email, // 邮箱
"department_id":this.form.origin, // 组织id
"is_admin":this.form.type,
"state":this.form.able, // 用户状态，1——启用，0 禁用
"domain_name":this.form.domain,//
"ip_whitelist":this.form.ip.split(';'),//
"description":this.form.desc, //描述
"link_man":this.form.contact
}
this.$http
.post(`/apaas/backmgt/user/register`,temp)
.then(response => {
console.log(response);
this.backPage()
this.$message.success('新增成功')
})
.catch((response)=> {
this.$message.success('新增失败')
});
},
set_user(){
var temp = {
"user_id":this.form.account, // 用户名
"user_name":this.form.nickname, // 昵称
"system_name":this.form.systemname,//系统名称
"phone":this.form.phone, // 电话号
"email":this.form.email, // 邮箱
"department_id":this.form.origin, // 组织id
"is_admin":this.form.type,
"state":this.form.able, // 用户状态，1——启用，0 禁用
"domain_name":this.form.domain,//
"ip_whitelist":this.form.ip.split(';'),//
"description":this.form.desc, //描述
"link_man":this.form.contact
}
this.$http
.put(`/apaas/backmgt/user/put`,temp)
.then(response => {
console.log(response);
this.backPage()
this.$message.success('修改成功')
})
.catch((response)=> {
this.$message.success('修改失败')
});
},
onSubmit(formName) {
console.log('submit!');
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
if(this.edit_flag == 0){
this.add_user()
}else{
this.set_user()
}
} else {
console.log('error submit!!');
return false;
}
});
},
getNewList(val) {
console.log(val);
this.form.fileList = ""
this.form.fileList = url.map((v,k)=>{
return v.url
}).join(';')
console.log(this.form.fileList)
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
......@@ -252,6 +371,13 @@ export default {
background-color: #f7f8f9;
width: 1022px;
}
.shortpass .el-input__inner{
background-color: #f7f8f9;
width: 888px;
}
.shortpass .el-input{
width: 888px;
}
.info_contain .el-textarea__inner{
background-color: #f7f8f9;
width: 1022px;
......@@ -401,4 +527,17 @@ export default {
position: absolute;
right: 0;
}
.fixpass{
width: 124px;
height: 44px;
line-height: 44px;
text-align: center;
font-size: 16px;
color: #fff;
background-color: #495feb;
border-radius: 8px;
display: inline-block;
margin-left: 5px;
cursor: pointer;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment