Skip to content

F
founder_vue
Commit 4d8c0ba8 by 张超军
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 00c95dea 940aada9
Showing with 321 additions and 199 deletions
src/views/Home.vue
......@@ -187,14 +187,19 @@ export default {
logout() {
// console.log('退出登录');
// this.$router.replace('/login1')
this.$axios.post("/login/login/userLogout").then(res => {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
});
this.$axios
.post("/login/login/userLogout")
.then(res => {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
})
.catch(err => {
console.info(err);
});
},
/**
* @description: 开始搜索
......
src/views/SystemManage/AuthManage.vue
......@@ -9,6 +9,10 @@
<div class="btn" :class="{ active: isGroup }" @click="getGroup">
用户组列表
</div>
<el-button @click="add">add</el-button>
<el-button @click="edit">edit</el-button>
<el-button @click="del">del</el-button>
<el-button @click="search">search</el-button>
</div> </dvi
><br />
<div class="search">
......@@ -168,6 +172,85 @@ export default {
handleSizeChange: function(val) {
this.reqParam.page.pageSize = val;
// this.search();
},
add() {
var permission = new URLSearchParams();
permission.append("menuname", "菜单30");
permission.append("pid", "3");
permission.append("zindex", "4");
// permission.append("roleId", "30");
// menuname; //菜单名称
// pid;//父级权限id
// permission;//资源权限字符串
// url;//资源 url
// description;//描述
// type;//权限类型
// zindex;//菜单排序
// flag;//是否生成菜单,0:默认不生成菜单,1:生成菜单
// status;//权限状态（01:显示，02：加锁，03：隐藏）
// roleId;/必填
this.$axios
.post("/login/permission/add", permission)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
del() {
var permission = new URLSearchParams();
permission.append("menuId", "888");
this.$axios
.post("/login/permission/deletePermissionById", permission)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
edit() {
var permission = new URLSearchParams();
permission.append("menuId", "777");
this.$axios
.post("/login/permission/querypermissionInfo", permission)
.then(res => {
console.log(res);
})
.catch(failResponse => {});
// menuId;//权限id
// menuname;//菜单名称
// pid;//父级权限id
// permission;//资源权限字符串
// url;//资源 url
// description;//描述
// type;//权限类型
// zindex;//菜单排序
// status;//权限状态（01:显示，02：加锁，03：隐藏）
var permission1 = new URLSearchParams();
permission1.append("menuId", "777");
permission1.append("menuname", "修改菜单名字");
this.$axios
.post("/login/permission/update", permission1)
.then(res => {
console.log(res);
})
.catch(failResponse => {});
},
search() {
var permission = new URLSearchParams();
// permission.append("menuId", "要删除的权限id");
// menuname,pid,
// userId(非admin用户，必填)
permission.append("page", "1"); //必填
permission.append("total", "20"); //必填
this.$axios
.post("/login/permission/querypermissionAll", permission)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
}
},
mounted() {
......
src/views/SystemManage/GroupManage.vue
......@@ -61,6 +61,10 @@
<div class="operation">
<div class="btn1" @click="batch">批量操作</div>
<div class="btns">
<el-button @click="add">add</el-button>
<el-button @click="edit">edit</el-button>
<el-button @click="del">del</el-button>
<el-button @click="search">search</el-button>
<div class="btn1">删除</div>
<div class="add" @click="open">
<svg-icon
......@@ -335,10 +339,77 @@ export default {
this.isShowAddUserDialogBg = false;
},
// 新增方法
// add() {
// this.isShowAddUserDialog = false;
// this.isShowAddUserDialogBg = false;
// this.$message.success("新增成功！");
// }
add() {
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
this.$message.success("新增成功！");
var usergroup = new URLSearchParams();
usergroup.append("groupname", "用户组1122");
usergroup.append("groupdesc", "用户组描述111222");
// usergroup.append("userId", ""); // userId(多个用户id之间用逗号隔开),
// usergroup.append("username", "");// username(多个用户名之间用逗号隔开),
// usergroup.append("roleId", "");// roleId(多个角色id之间用逗号隔开),
// usergroup.append("rolename", "角色名2,角色名3");// rolename(多个角色名之间用逗号隔开),
usergroup.append("status", "1"); // status(激活状态：0未激活；1已激活)
this.$axios
.post("/login/usergroup/saveusergroup", usergroup)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
del() {
var usergroup = new URLSearchParams();
usergroup.append("Id", "1");
this.$axios
.post("/login/usergroup/deleteUserGroupById", usergroup)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
edit() {
var usergroup = new URLSearchParams();
usergroup.append("Id", "2");
this.$axios
.post("/login/usergroup/queryusergroup", usergroup)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
var usergroup1 = new URLSearchParams();
usergroup1.append("Id", "2");
usergroup1.append("groupname", "修改组名");
usergroup1.append("groupdesc", "修改组描述");
usergroup1.append("userId", ""); // userId(多个用户id之间用逗号隔开),
usergroup1.append("username", ""); // username(多个用户名之间用逗号隔开),
usergroup1.append("roleId", ""); // roleId(多个角色id之间用逗号隔开),
this.$axios
.post("/login/usergroup/update", usergroup1)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
search() {
var usergroup = new URLSearchParams();
// usergroup.append("Id", "2");
usergroup.append("page", "1"); //必填
usergroup.append("total", "20"); //必填
this.$axios
.post("/login/usergroup/queryUserGroupList", usergroup)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
}
}
};
......
src/views/SystemManage/RoleManage.vue
......@@ -46,6 +46,10 @@
</div>
<div class="save">
<div class="btn" @click="save">保存</div>
<el-button @click="add">add</el-button>
<el-button @click="edit">edit</el-button>
<el-button @click="del">del</el-button>
<el-button @click="search">search</el-button>
</div>
</div>
<div class="role-info">
......@@ -318,13 +322,65 @@ export default {
this.roleMenusSelection = this.roleMenus;
console.info("roleMenusSelection====", this.roleMenusSelection);
},
// 列表
search() {
var role = new URLSearchParams();
// role.append('userId', "可选");//根据用户id查询角色信息
// role.append('roleId', "可选");//根据角色id查询角色信息
// role.append('roleName', "可选");//根据角色名查询角色信息
// role.append('permissionName', "可选");//查询角色对应的权限
this.$axios
.post("/login/role/queryRolelist", role)
.then(res => {})
.catch(failResponse => {});
},
// 删除
del() {
console.info("删除数据");
var sysRole = new URLSearchParams();
sysRole.append("roleId", "16");
this.$axios
.post("/login/role/deleteRoleById", sysRole)
.then(res => {})
.catch(failResponse => {});
},
// 新增
add() {
console.info("新增数据");
var role = new URLSearchParams();
role.append("roleName", "角色名");
role.append("description", "角色描述");
// sffb; //(是否发布:0:未发布,1:已发布),
// pid; // (父级角色的id),
// isparent; //(是否是父级：0：父级，1：子级),
// type角色类型;
this.$axios
.post("/login/role/add", role)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
// 编辑
edit() {
console.info("编辑数据");
var role = new URLSearchParams();
// 1、进入角色修改界面
role.append("roleId", "15");
this.$axios
.post("/login/role/queryrolesInfo", role)
.then(res => {})
.catch(failResponse => {});
var role1 = new URLSearchParams();
role1.append("roleId", "15");
role1.append("roleName", "修改角色名");
role1.append("description", "修改角色描述");
this.$axios
.post("/login/role/update", role1)
.then(res => {})
.catch(failResponse => {});
},
funAuth() {
this.funFlag = true;
......
src/views/SystemManage/UserManage.vue
<template>
<el-container
class="manage-page"
direction="vertical"
>
<el-container class="manage-page" direction="vertical">
<!-- 标题-->
<div class="title">用户管理</div>
<div
class="clear-btn"
@click="clear"
>清空</div>
<div class="clear-btn" @click="clear">清空</div>
<div class="search">
<div class="search-item">
<div class="label">用户名：</div>
......@@ -67,10 +61,7 @@
v-model="searchParams.role"
placeholder="请输入并选择"
>
<el-option
label="1"
value="1"
> </el-option>
<el-option label="1" value="1"> </el-option>
<!-- <el-option-->
<!-- v-for="item in options"-->
<!-- :key="item.value"-->
......@@ -88,22 +79,13 @@
placeholder="请输入权限"
></el-input>
</div>
<div
class="btn"
@click="search"
>筛选用户</div>
<div class="btn" @click="search">筛选用户</div>
</div>
<div class="operation">
<div
class="btn1"
@click="batch"
>批量操作</div>
<div class="btn1" @click="batch">批量操作</div>
<div class="btns">
<div class="btn1">删除</div>
<div
class="add"
@click="open"
>
<div class="add" @click="open">
<svg-icon
style="width: .8125rem;height: .8125rem;margin-bottom: -.0625rem;margin-right: .25rem"
icon-class="ic_add"
......@@ -118,10 +100,7 @@
style="width:100%;color:#666666;margin-bottom:1rem"
v-show="isShowTip"
>
<i
class="el-icon-info"
style="color:#055FE7;font-size:.9375rem"
></i>
<i class="el-icon-info" style="color:#055FE7;font-size:.9375rem"></i>
已选择
<span style="color:#055FE7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
......@@ -131,7 +110,8 @@
:underline="false"
style="margin-left:1.25rem;"
@click="toggleSelection()"
>清除</el-link>
>清除</el-link
>
</el-tag>
<div class="table-data">
<el-table
......@@ -143,53 +123,21 @@
class="table"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
height
width="auto"
v-if="isSelected"
>
<el-table-column type="selection" height width="auto" v-if="isSelected">
</el-table-column>
<el-table-column
prop="username"
label="用户名"
:width="width1"
>
<el-table-column prop="username" label="用户名" :width="width1">
</el-table-column>
<el-table-column
prop="truename"
label="姓名"
:width="width1"
>
<el-table-column prop="truename" label="姓名" :width="width1">
</el-table-column>
<el-table-column
prop="policemanid"
label="警号"
:width="width2"
>
<el-table-column prop="policemanid" label="警号" :width="width2">
</el-table-column>
<el-table-column
prop="group"
label="用户组"
:width="width3"
>
<el-table-column prop="group" label="用户组" :width="width3">
</el-table-column>
<el-table-column
prop="unitname"
label="所属单位"
:width="width2"
>
<el-table-column prop="unitname" label="所属单位" :width="width2">
</el-table-column>
<el-table-column
prop="roleName"
label="角色"
:width="width4"
>
<el-table-column prop="roleName" label="角色" :width="width4">
<template slot-scope="scope">
<div
class="tags"
v-for="item in scope.row.roleName"
>
<div class="tags" v-for="item in scope.row.roleName">
{{ item }}
</div>
</template>
......@@ -199,20 +147,10 @@
<div v-for="item in scope.row.roleName">{{ item }}/</div>
</template>
</el-table-column>
<el-table-column
prop="status"
label="启用状态"
:width="width1"
>
<el-table-column prop="status" label="启用状态" :width="width1">
<template slot-scope="scope">
<div
v-if="scope.row.status === 0"
class="circle-red"
></div>
<div
v-if="scope.row.status === 1"
class="circle-blue"
></div>
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
{{
scope.row.status === 0
? "停用"
......@@ -222,10 +160,7 @@
}}
</template>
</el-table-column>
<el-table-column
prop="active"
label="操作"
>
<el-table-column prop="active" label="操作">
<img
style="width: 1.125rem;height: 1.125rem;margin-right: 1.125rem;cursor: pointer"
src="../../assets/img/qbryk/bj.png"
......@@ -267,20 +202,11 @@
v-show="isShowAddUserDialogBg"
@click="canceladd"
></div>
<div
class="addUserDialog"
v-show="isShowAddUserDialog"
>
<div class="addUserDialog" v-show="isShowAddUserDialog">
<div class="head-title">
<div class="left">新增用户</div>
<div
class="close"
@click="canceladd"
>
<img
src="@/assets/img/manage/close.png"
alt=""
/>
<div class="close" @click="canceladd">
<img src="@/assets/img/manage/close.png" alt="" />
</div>
</div>
<div class="info">
......@@ -291,55 +217,35 @@
:rules="addrules"
ref="addFormParams"
>
<el-form-item
class="info-item"
label="用户名:"
prop="username"
>
<el-form-item class="info-item" label="用户名:" prop="username">
<el-input
placeholder="请输入用户名"
class="input-info"
v-model="addFormParams.username"
></el-input>
</el-form-item>
<el-form-item
class="info-item"
label="姓名:"
prop="truename"
>
<el-form-item class="info-item" label="姓名:" prop="truename">
<el-input
placeholder="请输入姓名"
class="input-info"
v-model="addFormParams.truename"
></el-input>
</el-form-item>
<el-form-item
class="info-item"
label="所属单位代码:"
prop="unitcode"
>
<el-form-item class="info-item" label="所属单位代码:" prop="unitcode">
<el-input
placeholder="请输入所属单位"
class="input-info"
v-model="addFormParams.unitcode"
></el-input>
</el-form-item>
<el-form-item
class="info-item"
label="用户警号:"
prop="policemanid"
>
<el-form-item class="info-item" label="用户警号:" prop="policemanid">
<el-input
placeholder="请输入用户警号"
class="input-info"
v-model="addFormParams.policemanid"
></el-input>
</el-form-item>
<el-form-item
class="info-item"
label="密码:"
prop="password"
>
<el-form-item class="info-item" label="密码:" prop="password">
<el-input
type="password"
placeholder="请输入密码"
......@@ -347,11 +253,7 @@
v-model="addFormParams.password"
></el-input>
</el-form-item>
<el-form-item
class="info-item"
label="确认密码:"
prop="okpassword"
>
<el-form-item class="info-item" label="确认密码:" prop="okpassword">
<el-input
placeholder="请确认密码"
type="password"
......@@ -359,11 +261,7 @@
v-model="addFormParams.okpassword"
></el-input>
</el-form-item>
<el-form-item
class="info-item"
label="手机号码:"
prop="telphone"
>
<el-form-item class="info-item" label="手机号码:" prop="telphone">
<el-input
placeholder="请输入手机号码"
class="input-info"
......@@ -384,15 +282,8 @@
<!-- v-model="addFormParams.role"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item
class="info-item"
label="启用状态:"
prop="status"
>
<el-radio-group
class="input-info"
v-model="addFormParams.status"
>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="input-info" v-model="addFormParams.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
......@@ -402,11 +293,9 @@
class="add"
type="primary"
@click="submitForm('addFormParams')"
>提交</el-button>
<el-button
class="cancel"
@click="canceladd"
>重置</el-button>
>提交</el-button
>
<el-button class="cancel" @click="canceladd">重置</el-button>
<!-- <div class="add" @click="submitForm('addFormParams')">确定</div>-->
<!-- &lt;!&ndash; <div class="add" @click="add">确定</div>&ndash;&gt;-->
......@@ -547,7 +436,7 @@ export default {
this.width4 = (this.width4 * w2) / w1;
this.width5 = (this.width5 * w2) / w1;
},
data () {
data() {
// 用户名校验
var validateUsername = (rule, value, callback) => {
if (value === "") {
......@@ -557,7 +446,7 @@ export default {
if (/[\u4e00-\u9fa5]+/g.test(value) || value.length >= 8) {
callback(new Error("用户名不可为汉字字符，最长8位！"));
} else {
callback()
callback();
}
}
};
......@@ -570,7 +459,7 @@ export default {
if (!/[\u4e00-\u9fa5]+/g.test(value)) {
callback(new Error("请输入汉字字符！"));
} else {
callback()
callback();
}
}
};
......@@ -583,7 +472,7 @@ export default {
if (!/^1[345678]\d{9}$/.test(value)) {
callback(new Error("手机号码格式不正确！"));
} else {
callback()
callback();
}
}
};
......@@ -592,7 +481,7 @@ export default {
if (value === "") {
callback(new Error("请选择单位代码！"));
} else {
callback()
callback();
}
console.info(value);
};
......@@ -601,7 +490,7 @@ export default {
if (value === "") {
callback(new Error("请选择单位名称！"));
} else {
callback()
callback();
}
console.info(value);
};
......@@ -610,7 +499,7 @@ export default {
if (value === "") {
callback(new Error("请输入警号！"));
} else {
callback()
callback();
}
};
// 密码校验
......@@ -621,7 +510,7 @@ export default {
if (value.length >= 8) {
callback(new Error("密码长度需在8位数以内！"));
} else {
callback()
callback();
}
console.info(value);
// if (this.addFormParams.okpassword !== "") {
......@@ -646,7 +535,7 @@ export default {
if (value === "") {
callback(new Error("请选择状态"));
} else {
callback()
callback();
}
console.info(value);
};
......@@ -795,14 +684,14 @@ export default {
},
computed: {
// 计算总页数
Tpage () {
Tpage() {
return (
Math.floor(this.searchParams.page.total / this.search.page.page) + 1
);
}
},
methods: {
submitForm (formName) {
submitForm(formName) {
this.$refs.addFormParams.validate(valid => {
console.log(valid);
if (valid) {
......@@ -819,40 +708,42 @@ export default {
// console.info(this.$refs[this.$refs[formName]]);
},
// 重置
resetForm (formName) {
resetForm(formName) {
this.$refs[formName].resetFields();
},
clear () {
clear() {
console.info("清空方法");
},
search () {
search() {
console.info("搜索用户列表");
var user = new URLSearchParams();
user.append("username", this.searchParams.username);
user.append("truename", this.searchParams.truename);
user.append("unitcode", this.searchParams.unitcode);
user.append("role", this.searchParams.role);
user.append("page", this.searchParams.page.page);
user.append("total", this.searchParams.page.total);
// user.append("username", this.searchParams.username);
// user.append("truename", this.searchParams.truename);
// user.append("unitcode", this.searchParams.unitcode);
// user.append("role", this.searchParams.role);
// user.append("page", this.searchParams.page.page);
// user.append("total", this.searchParams.page.total);
user.append("page", "1");
user.append("total", "20");
this.$axios
.post("/login/user/queryUserList", user)
.then(res => {
console.log(res);
})
.catch(failResponse => { });
.catch(failResponse => {});
// 做查询时 user.append("page","1");
// user.append("total","20");这两个参数必填
// 修改删除时，userid必填
},
// 搜索方式
searchStyle (val) {
searchStyle(val) {
// console.log(val, '搜索方式')
this.searchOptions = val;
// console.log(this.reqParam.page.searchOptions)
},
// 清除所有选项
toggleSelection (rows) {
toggleSelection(rows) {
if (rows) {
rows.forEach(row => {
this.$refs.multipleTable.toggleRowSelection(row);
......@@ -863,7 +754,7 @@ export default {
console.log(this.multipleSelection);
},
// 选择数据
handleSelectionChange (val) {
handleSelectionChange(val) {
this.multipleSelection = val;
console.info("选择的数据", this.multipleSelection);
if (this.multipleSelection.length) {
......@@ -873,7 +764,7 @@ export default {
}
},
//是否是批量操作
batch () {
batch() {
this.isSelected = !this.isSelected;
},
// 当期页发生变化
......@@ -887,18 +778,18 @@ export default {
// // this.search();
// },
// 打开新增弹窗
open () {
open() {
this.isShowAddUserDialog = true;
this.isShowAddUserDialogBg = true;
this.resetForm("addFormParams");
},
// 关闭新增弹窗
canceladd () {
canceladd() {
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
},
// 新增方法
add () {
add() {
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
var user = new URLSearchParams();
......@@ -911,13 +802,22 @@ export default {
// user.append("telphone", this.addFormParams.telphone);
// // user.append("usergroup", this.searchParams.usergroup); // 警号
// user.append("role", this.addFormParams.role);
user.append("username", "name");
user.append("truename", "姓名");
user.append("unitname", "unitname");
user.append("unitcode", "unitcode");
user.append("username", "测试用户名");
user.append("truename", "测试姓名");
user.append("unitname", "测试unitname");
user.append("unitcode", "测试unitcode");
user.append("password", "123456");
user.append("policemanid", "警号");
user.append("identitycard", "170730");
user.append("policemanid", "测试警号");
user.append("telphone", "17000000000");
user.append("status", "0");
user.append("sex", "0");
user.append("grade", "S"); // grade (S省级;D地市级;X区县级;K科所队),
user.append("roleName", "");
user.append("groupid_coll", "");
user.append("groupid_list", "");
user.append("groupid_edit", "");
user.append("groupid_admin", "");
// user.append("usergroup", this.searchParams.usergroup); // 警号
// user.append("role", this.addFormParams.role);
// user.append("page", this.addParams.page.page);
......@@ -932,7 +832,7 @@ export default {
})
.catch(failResponse => {});
},
edit () {
edit() {
console.info("编辑方法");
// 根据主键查询用户基本信息
var user = new URLSearchParams();
......@@ -956,7 +856,7 @@ export default {
})
.catch(failResponse => {});
},
del () {
del() {
console.info("删除方法");
var user = new URLSearchParams();
user.append("userId", "2");
......@@ -968,7 +868,7 @@ export default {
.catch(failResponse => {});
}
},
mounted () {
mounted() {
this.search();
}
};
......
src/views/login/modules/AccountsLogin.vue
......@@ -72,19 +72,26 @@ export default {
login(userinfo) {
let me = this;
console.info(userinfo);
let authentication = userinfo;
var authentication = new URLSearchParams();
authentication.append("userName", userinfo.userName);
authentication.append(
"passWord",
Encrypt(userinfo.passWord.trim()).toString()
);
// let authentication = userinfo;
// let data = new FormData();
//密码加密
authentication.passWord = Encrypt(
authentication.passWord.trim()
).toString();
// authentication.passWord = Encrypt(
// authentication.passWord.trim()
// ).toString();
// let passwordAES = Encrypt(authentication.passWord.trim()).toString();
// data.append("username", this.userInfo.userName);
// data.append("password", passwordAES);
// data.passWord = passwordAES;
// todo 登录请求
this.$axios
.post("/login/myLoginForm?" + qs.stringify(authentication))
.post("/login/myLoginForm", authentication)
// .post("/login/myLoginForm?" + qs.stringify(authentication))
.then(res => {
if (res.data.code === "200") {
localStorage.setItem("token", res.data.token);
......
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