Skip to content

F
founder_vue
Commit 7acfd8b7 by liyuhang19990520
Options

1

parent 50237842
Showing with 208 additions and 157 deletions
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-15 17:00:14
* @LastEditTime: 2021-11-15 19:29:50
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -72,6 +72,7 @@ _axios.interceptors.response.use(
if (response.data.code === 401) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userName”的信息。
this.$router.push("/login1");
}
return response;
......@@ -83,7 +84,7 @@ _axios.interceptors.response.use(
setTimeout(() => {
loading && loading.close();
loading = null
}, 1000);
}, 500);
}
// Do something with response error
return Promise.reject(error);
......
src/views/Home.vue
......@@ -190,6 +190,7 @@ export default {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userInfor”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
......
src/views/Home/Home.vue
......@@ -176,6 +176,7 @@ export default {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor");
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
......
src/views/SystemManage/GroupManage.vue
......@@ -105,6 +105,7 @@
class="tags"
v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')"
:key="item"
>
{{ item }}
</div>
......@@ -153,7 +154,7 @@
}}
</template>
</el-table-column>
<el-table-column prop="active" label="操作">
<el-table-column prop="active" label="操作" width="150">
<template slot-scope="scope">
<div @click="offMultiple()">
<Confirmation content="编辑用户">
......@@ -187,9 +188,9 @@
</div>
<div class="footer">
<span class="count"
>共{{ searchParams.page.count }} 条记录 第{{
searchParams.page.page
}}/{{ Tpage }}页</span
>共{{ tableData.length }} 条记录 第{{ searchParams.page.page }}/{{
Tpage
}}页</span
>
<div class="page">
<el-pagination
......@@ -361,21 +362,60 @@
<div class="info">
<div class="header">
<div>组角色</div>
<div>完成</div>
<div class="delbtn">
<img src="@/assets/img/del.png" alt="" />
<span>删除</span>
</div>
</div>
<div class="default-role-group">
<div class="default-btn">指纹入库员</div>
<div class="default-btn">综合认定员</div>
<div class="default-btn">高级认定员</div>
<div class="default-btn">
<span>指纹入库员</span>
<div class="triangle">
<i class="el-icon-close"></i>
</div>
</div>
<div class="default-btn">
<span>综合认定员</span>
<div class="triangle">
<i class="el-icon-close"></i>
</div>
</div>
<div class="default-btn">
<span>高级认定员</span>
<div class="triangle">
<i class="el-icon-close"></i>
</div>
</div>
</div>
<div class="add-btn">
<i class="el-icon-plus"></i>
添加完成
</div>
<div class="add-btn">添加完成</div>
<div class="add-role-group">
<div class="default-btn">指纹入库员</div>
<div class="default-btn">综合认定员</div>
<div class="default-btn">高级认定员</div>
<div class="default-btn">指纹入库员</div>
<div class="default-btn">综合认定员</div>
<div class="default-btn">高级认定员</div>
<div class="default-btn">
<span>指纹入库员</span>
<img src="@/assets/img/jiahao.png" alt="" />
</div>
<div class="default-btn">
<span>综合认定员</span>
<img src="@/assets/img/jiahao.png" alt="" />
</div>
<div class="default-btn">
<span>高级认定员</span>
<img src="@/assets/img/jiahao.png" alt="" />
</div>
<div class="default-btn">
<span>指纹入库员</span>
<img src="@/assets/img/jiahao.png" alt="" />
</div>
<div class="default-btn custom">
<span>综合认定员</span>
<img src="@/assets/img/jiahao.png" alt="" />
</div>
<div class="default-btn custom">
<span>高级认定员</span>
<img src="@/assets/img/jiahao.png" alt="" />
</div>
</div>
</div>
<div class="addbtns">
......@@ -775,18 +815,16 @@ export default {
// 新增用户组
submitForm(formName) {
this.$refs.addFormParams.validate((valid) => {
console.info(valid);
if (valid) {
this.$axios
.post("/system/user-groups", this.addFormParams)
.then((res) => {
console.info(res);
if (res.data === "成功") {
if (res.status == "201") {
this.isShowAddUserDialogBg = false;
this.isShowAddUserDialog = false;
this.$message.success(res.data);
this.$message.success("新增成功");
this.search();
}
this.search();
})
.catch((failResponse) => {});
} else {
......
src/views/SystemManage/PermissionManage.vue
......@@ -171,7 +171,7 @@
<!-- 用户分页-->
<div class="footer">
<span class="count"
>共{{ userSearchParams.page.count }} 条记录 第{{
>共{{ userTableData.length }} 条记录 第{{
userSearchParams.page.page
}}/{{ userTpage }}页</span
>
......@@ -329,7 +329,7 @@
<!-- 用户组分页-->
<div class="footer">
<span class="count"
>共{{ groupSearchParams.page.count }} 条记录 第{{
>共{{ groupTableData.length }} 条记录 第{{
groupSearchParams.page.page
}}/{{ groupTpage }}页</span
>
......
src/views/SystemManage/RoleManage.vue
......@@ -4,7 +4,12 @@
<div class="btns">
<div class="add" @click="add">
<svg-icon
style="width: .8125rem;height: .8125rem;margin-bottom: -0.0625rem;margin-right: .25rem "
style="
width: 0.8125rem;
height: 0.8125rem;
margin-bottom: -0.0625rem;
margin-right: 0.25rem;
"
icon-class="ic_add"
/>
新增角色
......@@ -12,20 +17,30 @@
<div class="img-btn" @click="copy">
<img
src="../../assets/img/role/copy.png"
style="height: .9375rem;width: .9375rem;margin-left:.0625rem ;margin-top: .25rem"
style="
height: 0.9375rem;
width: 0.9375rem;
margin-left: 0.0625rem;
margin-top: 0.25rem;
"
/>
</div>
<div class="img-btn" @click="del(diyRoleItemIndex)">
<img
src="../../assets/img/role/delete.png"
style="height: .9375rem;width: .9375rem;margin-left:.0625rem ;margin-top: .25rem"
style="
height: 0.9375rem;
width: 0.9375rem;
margin-left: 0.0625rem;
margin-top: 0.25rem;
"
/>
</div>
</div>
<div class="default-role">
<div
class="default-role-item"
v-for="(item, index) in defaultRoleBtns"
v-for="item in defaultRoleBtns"
:key="item.id"
:class="{ active: item.id === defaultRoleItemIndex }"
@click="chooseDefaultRoleItem(item)"
......@@ -206,15 +221,15 @@ import "@/icons/ic_add.svg";
export default {
name: "RoleManage",
watch: {
roleMenusSelection: function(val) {
roleMenusSelection: function (val) {
console.info(val);
}
},
},
data() {
return {
// 功能权限标志 数据权限标志
editurl: require("@/assets/img/edit.png"),
funFlag: false,
funFlag: true,
dataFlag: false,
roles: [],
addRoleParams: [],
......@@ -227,13 +242,13 @@ export default {
// 自定义的角色组
diyRoleList: [],
diyRoleItemIndex: -1,
defaultRoleItemIndex: -1
defaultRoleItemIndex: -1,
};
},
methods: {
// 获取权限列表
getPermissionDataLists() {
this.$axios.get("/system/permissions").then(res => {
this.$axios.get("/system/permissions").then((res) => {
if (res.data.length > 0) {
var arr = [];
for (let i = 0; i < res.data.length; i++) {
......@@ -257,9 +272,9 @@ export default {
addrole() {
var role = {
name: "测试角色",
permissionIds: [11, 12]
permissionIds: [11, 12],
};
this.$axios.post("/system/roles", role).then(res => {
this.$axios.post("/system/roles", role).then((res) => {
console.info(res);
});
},
......@@ -276,7 +291,7 @@ export default {
search() {
this.$axios
.get("/system/roles")
.then(res => {
.then((res) => {
if (res.data !== null) {
res.data.forEach((item, index) => {
var arr = [];
......@@ -308,7 +323,7 @@ export default {
this.$message.error("获取角色信息失败！");
}
})
.catch(failResponse => {});
.catch((failResponse) => {});
},
// 删除
del(id) {
......@@ -322,7 +337,7 @@ export default {
name: "自定义" + (this.diyRoleList.length + 1),
flag: false,
code: this.diyRoleList.length,
edit: false
edit: false,
};
this.diyRoleList.push(roleitem);
console.info("新增数据");
......@@ -368,7 +383,7 @@ export default {
this.funFlag = false;
this.dataFlag = true;
console.info("数据权限");
}
},
},
created() {
this.search();
......@@ -377,7 +392,7 @@ export default {
mounted() {
this.defaultRoleBtns[0].flag = true;
this.funFlag = true;
}
},
};
</script>
......
src/views/SystemManage/UserManage.vue
......@@ -167,7 +167,7 @@
cursor: pointer;
"
src="../../assets/img/qbryk/bj.png"
@click="openedit(scope.row.userId)"
@click="openedit(scope.row.id)"
/>
</Confirmation>
<Confirmation
......@@ -189,9 +189,9 @@
</div>
<div class="footer">
<span class="count"
>共{{ searchParams.page.count }} 条记录 第{{
searchParams.page.page
}}/{{ Tpage }}页</span
>共{{ tableData.length }} 条记录 第{{ searchParams.page.page }}/{{
Tpage
}}页</span
>
<div class="page">
<el-pagination
......@@ -304,7 +304,7 @@
<el-button
class="add"
type="primary"
@click="submitForm('addFormParams')"
@click="submitForm(addFormParams)"
>提交</el-button
>
<el-button class="cancel" @click="canceladd">取消</el-button>
......@@ -534,28 +534,17 @@ export default {
height: 480,
// 新增对象
addFormParams: {
username: "",
phoneNumber: "",
password: "",
okpassword: "",
policeNumber: "",
username: "2233333",
phoneNumber: "13327454372",
password: "2222222",
okpassword: "2222222",
policeNumber: "222222",
unitName: "长沙",
unitCode: "",
name: "",
unitCode: "2222",
name: "我当时大多数",
status: 1,
userGroupId: null,
roleId: null,
// username: "", //用户名
// password: "1", //密码
// okpassword: "1", // 确认密码
// truename: "", //用户真实姓名
// policemanid: "A1111", //警号
// telphone: "17323245432", //用户电话
// unitcode: "3700000", //单位代码
// unitname: "北京市海淀区公安局分局", //单位名称
// group: "", // 用户组
// role: "", // 角色
// status: "1" // 启用状态
},
editFormParams: {
userId: "",
......@@ -680,11 +669,12 @@ export default {
console.log(valid);
if (valid) {
this.$axios.post("/system/users", this.addFormParams).then((res) => {
console.info(res);
if (res.data === "成功") {
this.$message.error(res.data);
console.log(1111111, res);
if (res.status == 201) {
this.$message.success("添加成功");
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
this.search();
}
});
} else {
......@@ -801,22 +791,23 @@ export default {
this.isShowAddUserDialog = true;
this.isShowAddUserDialogBg = true;
(this.addFormParams.username = ""), //用户名
(this.addFormParams.password = ""), //密码
(this.addFormParams.okpassword = ""), // 确认密码
(this.addFormParams.name = ""), //用户真实姓名
(this.addFormParams.policeNumber = ""), //警号
(this.addFormParams.phoneNumber = ""), //用户电话
(this.addFormParams.unitCode = ""), //单位代码
(this.addFormParams.unitName = "长沙"), //单位名称
(this.addFormParams.userGroupId = ""), // 用户组
(this.addFormParams.roleId = ""), // 角色
(this.addFormParams.status = 1); // 启用状态
// (this.addFormParams.username = ""), //用户名
// (this.addFormParams.password = ""), //密码
// (this.addFormParams.okpassword = ""), // 确认密码
// (this.addFormParams.name = ""), //用户真实姓名
// (this.addFormParams.policeNumber = ""), //警号
// (this.addFormParams.phoneNumber = ""), //用户电话
// (this.addFormParams.unitCode = ""), //单位代码
// (this.addFormParams.unitName = "长沙"), //单位名称
// (this.addFormParams.userGroupId = ""), // 用户组
// (this.addFormParams.roleId = ""), // 角色
// (this.addFormParams.status = 1); // 启用状态
},
// 打开编辑弹窗
openedit(id) {
this.editFormParams.userId = id;
var user = new URLSearchParams();
console.log(99999999, id, user);
user.append("userId", id);
// user.append("userId", this.editFormParams.userId);
this.$axios
......@@ -991,5 +982,5 @@ const data1 = [
margin-top: 0px !important;
}
@import "scss/user";
@import './scss/dialog_table'
@import "./scss/dialog_table";
</style>
src/views/SystemManage/UserPermission.vue
......@@ -197,7 +197,7 @@ export default {
return {
id: "",
rolename: "",
status: "-1",
status: "1",
userData: {},
funFlag: false,
dataFlag: false,
......@@ -209,7 +209,7 @@ export default {
{ name: "质量检查员", value: 4, flag: false },
{ name: "高级质量检查", value: 5, flag: false },
{ name: "一般管理员", value: 6, flag: false },
{ name: "超级管理员", value: 7, flag: false }
{ name: "超级管理员", value: 7, flag: false },
],
// 角色权限菜单
roleMenus: [
......@@ -221,12 +221,12 @@ export default {
{ name: "质量检查", code: 5, flag: false },
{ name: "高级质量检查", code: 6, flag: false },
{ name: "信息管理", code: 7, flag: false },
{ name: "高级管理", code: 8, flag: false }
{ name: "高级管理", code: 8, flag: false },
],
// 指掌纹采集菜单
printCollectMenus: [
{ name: "指掌纹采集", code: 0, flag: false },
{ name: "非违法人员指纹采集", code: 1, flag: false }
{ name: "非违法人员指纹采集", code: 1, flag: false },
],
// 指掌纹录入菜单
printInputMenus: [
......@@ -234,12 +234,12 @@ export default {
{ name: "FPTX数据导入", code: 1, flag: false },
{ name: "人员指纹扫描", code: 2, flag: false },
{ name: "案件指纹扫描", code: 3, flag: false },
{ name: "笔录指纹", code: 4, flag: false }
{ name: "笔录指纹", code: 4, flag: false },
],
// 档案信息录入菜单
fileInformationInputMenus: [
{ name: "人员文字信息录入", code: 0, flag: false },
{ name: "案件文字信息录入", code: 1, flag: false }
{ name: "案件文字信息录入", code: 1, flag: false },
],
// 综合认定
comprehensiveMenus: [
......@@ -260,7 +260,7 @@ export default {
{ name: "案件指纹编辑", code: 14, flag: false },
{ name: "文字信息修改", code: 15, flag: false },
{ name: "二次打印", code: 16, flag: false },
{ name: "比中信息撤销", code: 17, flag: false }
{ name: "比中信息撤销", code: 17, flag: false },
],
// 高级认定
seniorMenus: [
......@@ -268,19 +268,19 @@ export default {
{ name: "高级案件编辑", code: 2, flag: false },
{ name: "人案控制条码规则", code: 3, flag: false },
{ name: "基本/比中数据上报", code: 4, flag: false },
{ name: "全用户认定权限", code: 5, flag: false }
{ name: "全用户认定权限", code: 5, flag: false },
],
// 质量检查
qualityTestingMenus: [
{ name: "比中信息复核", code: 1, flag: false },
{ name: "协查信息复核", code: 2, flag: false },
{ name: "人案控制条码规则", code: 3, flag: false }
{ name: "人案控制条码规则", code: 3, flag: false },
],
// 高级质量检查
seniorQualityTestingMenus: [
{ name: "比中信息复核", code: 1, flag: false },
{ name: "协查信息复核", code: 2, flag: false },
{ name: "人案控制条码规则", code: 3, flag: false }
{ name: "人案控制条码规则", code: 3, flag: false },
],
// 信息管理
informationManageMenus: [
......@@ -294,7 +294,7 @@ export default {
{ name: "系统操作日志", code: 8, flag: false },
{ name: "复制案件数据", code: 9, flag: false },
{ name: "FPTX数据导出", code: 10, flag: false },
{ name: "批量处理操作", code: 11, flag: false }
{ name: "批量处理操作", code: 11, flag: false },
],
// 高级管理
seniorManageMenus: [
......@@ -312,10 +312,10 @@ export default {
{ name: "查询模块管理", code: 12, flag: false },
{ name: "上报条件设置", code: 13, flag: false },
{ name: "本地重卡反馈", code: 14, flag: false },
{ name: "本地涉案反馈", code: 15, flag: false }
{ name: "本地涉案反馈", code: 15, flag: false },
],
// 保存的角色选项
roleMenusSelection: []
roleMenusSelection: [],
};
},
methods: {
......@@ -333,7 +333,7 @@ export default {
save() {
this.roleMenusSelection = this.roleMenus;
console.info("roleMenusSelection====", this.roleMenusSelection);
}
},
},
mounted() {
this.funFlag = true;
......@@ -344,7 +344,7 @@ export default {
// 获取用户信息
this.$axios
.post("/login/user/queryuserInfo", user)
.then(res => {
.then((res) => {
if (res.data) {
console.info(res.data);
this.userData = res.data.user;
......@@ -352,9 +352,9 @@ export default {
console.info(res.data.user.status);
}
})
.catch(failResponse => {});
.catch((failResponse) => {});
console.info("chuancan", this.$route.params.id);
}
},
};
</script>
......
src/views/SystemManage/scss/role.scss
......@@ -81,6 +81,8 @@
//border: saddlebrown 1px solid;
width: 215px;
height: 366px;
box-sizing: border-box;
padding-left: 20px;
//display: flex;
//flex-direction: column;
overflow:scroll;
......
src/views/SystemManage/scss/userpermission.scss
.manage-page {
width: 100%;
padding: 24px;
padding-top: 12px;
font-family: MicrosoftYaHei;
div {
display: inline-block;
}
.header{
.header {
display: flex;
width: 1544px;
height: 54px;
border-radius: 8px;
margin-bottom: 9px;
overflow: hidden;
&.down{
background: #FEF5F6;
&.down {
background: #fef5f6;
}
&.up{
&.up {
background: #f2f7fe;
}
.title{
.title {
width: 96px;
height: 96px;
border-radius: 16px;
......@@ -24,88 +27,88 @@
position: relative;
left: -23px;
top: -17px;
&.down{
background: #FAE1E4;
&.down {
background: #fae1e4;
}
&.up{
background: #DDEBFF;
&.up {
background: #ddebff;
}
.title-status{
.title-status {
position: relative;
top: 28px;
left: 30px;
transform: rotate(-40deg);
.circle-red{
width: 8px;
height: 8px;
background-color:#FE0000;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-blue{
width: 8px;
height: 8px;
background-color:#055FE7;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-red {
width: 8px;
height: 8px;
background-color: #fe0000;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-blue {
width: 8px;
height: 8px;
background-color: #055fe7;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
}
}
.info{
.info {
display: flex;
justify-content: flex-start;
align-items: center;
//border: 1px solid hotpink; width: auto;
.info-item{
padding:0 20px 0 20px;
border-right: 1px solid #E6E6E8;
.info-title{
.info-item {
padding: 0 20px 0 20px;
border-right: 1px solid #e6e6e8;
.info-title {
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
.info-value {
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
}
.info-value1{
.info-value1 {
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
.tags{
.tags {
}
}
}
.info-item1{
padding:0 20px 0 20px;
.info-title{
.info-item1 {
padding: 0 20px 0 20px;
.info-title {
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
.info-value {
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
.tags{
.tags {
width: 100px;
height: 24px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
text-align: center;
margin-right: 16px;
......@@ -115,7 +118,6 @@
}
}
.main {
width: 100%;
height: 100%;
......@@ -123,8 +125,12 @@
flex-direction: column;
justify-content: center;
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 55px;
margin: 0 auto;
margin-bottom: 5px;
//margin-bottom: 3px;
.btns {
width: 224px;
......@@ -155,7 +161,6 @@
}
.save {
.btn {
position: absolute;
right: 30px;
top: 150px;
width: 72px;
......@@ -170,20 +175,18 @@
}
.role-info {
width: 100%;
height: 690px;
height: calc(100% - 115px);
background: #ffffff;
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3),
-1px 1px 3px 0px rgba(5, 95, 231, 0.24);
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3), -1px 1px 3px 0px rgba(5, 95, 231, 0.24);
border-radius: 10px;
display: flex;
flex-direction: row;
.menus {
width: 155px;
height: 100%;
border-right: 1px solid #eeeeee;
.div3 {
width: 100%;
height: 130px;
height: 117px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 12px 20px 0 20px;
......@@ -191,7 +194,7 @@
}
.div2 {
width: 100%;
height: 90px;
height: 85px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
......@@ -199,7 +202,7 @@
}
.div1 {
width: 100%;
height: 70px;
height: 65px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
......@@ -227,31 +230,30 @@
}
.content {
width: 100%;
height: 725px;
.div3 {
width: 100%;
height: 130px;
height: 117px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
padding-top: 8px;
.line {
height: 40px;
height: 30px;
}
}
.div2 {
width: 100%;
height: 90px;
height: 85px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 10px 20px 0 25px;
}
.line {
height: 35px;
height: 30px;
}
}
.div1 {
width: 100%;
height: 70px;
height: 65px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
......@@ -283,4 +285,4 @@
}
}
}
}
\ No newline at end of file
}
src/views/login/modules/AccountsLogin.vue
......@@ -108,6 +108,7 @@ export default {
if (res.data.code === "200") {
localStorage.setItem("token", res.data.token);
localStorage.setItem("userName", res.data.userName);
localStorage.setItem("userInfor", JSON.stringify(res.data.userInfo));
this.$message.success(userinfo.userName + "登录成功！");
this.$router.push("/Home/Home");
} else {
......
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