From 79d9fc857559982b00b68b2d709807bdc4cd286f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 10:58:17 +0800
Subject: [PATCH] minio 地址修改
---
src/views/system/user.vue | 340 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 202 insertions(+), 138 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 3e43dd0..fe5c521 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -14,8 +14,14 @@
</div>
</el-col>
<el-col :span="sizes[1]">
- <basic-container>
+ <basic-container
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
<avue-crud
+ class="tablesss"
:option="option"
:search.sync="search"
:table-loading="loading"
@@ -194,9 +200,9 @@
add,
grant,
resetPassword,
- getJurisdiction,
+ getJurisdiction
} from "@/api/system/user";
-import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
+import { getSecurityDeptTree, getDeptLazyTree } from "@/api/system/dept";
import { getRoleTree } from "@/api/system/role";
import { getPostList } from "@/api/system/post";
import { mapGetters } from "vuex";
@@ -242,19 +248,21 @@
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize
},
platformPage: {
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize
},
init: {
roleTree: [],
- deptTree: [],
+ deptTree: []
},
props: {
label: "title",
- value: "key",
+ value: "key"
},
roleGrantList: [],
roleTreeObj: [],
@@ -262,7 +270,8 @@
treeData: [],
treeOption: {
nodeKey: "id",
- defaultExpandAll:true,
+ defaultExpandedKeys: [],
+ // defaultExpandAll:true,
// lazy: false,
// treeLoad: "", //处理权限 在created中
// function (node, resolve) {
@@ -287,8 +296,8 @@
labelText: "标题",
label: "title",
value: "value",
- children: "children",
- },
+ children: "children"
+ }
},
// treeOption:{
// nodeKey: "id",
@@ -323,35 +332,36 @@
viewBtn: true,
//dialogType: 'drawer',
dialogClickModal: false,
+ ...this.$store.state.control.clearOtherBut,
column: [
{
label: "登录账号",
prop: "account",
search: true,
width: 190,
- display: false,
+ display: false
},
{
label: "所属组织机构",
prop: "deptName",
slot: true,
overHidden: true,
- display: false,
+ display: false
},
{
label: "用户姓名",
prop: "realName",
search: true,
width: 90,
- display: false,
+ display: false
},
{
label: "所属角色",
prop: "roleName",
slot: true,
width: 130,
- display: false,
- },
+ display: false
+ }
],
group: [
{
@@ -364,13 +374,13 @@
label: "所属组织机构",
prop: "deptId",
type: "tree",
- defaultExpandAll:true,
+ defaultExpandAll: true,
// dicUrl: "/api/blade-system/dept/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
- dicData:[],
+ dicData: [],
// hide: !website.tenantMode,
// addDisplay: website.tenantMode,
// editDisplay: website.tenantMode,
@@ -379,10 +389,10 @@
{
required: true,
message: "所属组织机构",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- span: 12,
+ span: 12
},
{
label: "登录账号",
@@ -391,9 +401,9 @@
{
required: true,
message: "请输入登录账号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "密码",
@@ -404,8 +414,8 @@
viewDisplay: false,
span: 12,
rules: [
- { required: true, validator: validatePass, trigger: "blur" },
- ],
+ { required: true, validator: validatePass, trigger: "blur" }
+ ]
},
{
label: "确认密码",
@@ -416,10 +426,10 @@
editDisplay: false,
viewDisplay: false,
rules: [
- { required: true, validator: validatePass2, trigger: "blur" },
- ],
- },
- ],
+ { required: true, validator: validatePass2, trigger: "blur" }
+ ]
+ }
+ ]
},
{
label: "详细信息",
@@ -434,14 +444,14 @@
{
required: true,
message: "请输入用户姓名",
- trigger: "blur",
+ trigger: "blur"
},
{
min: 2,
max: 5,
- message: "姓名长度在2到5个字符",
- },
- ],
+ message: "姓名长度在2到5个字符"
+ }
+ ]
},
{
label: "所属角色",
@@ -450,7 +460,7 @@
type: "tree",
dicData: [],
props: {
- label: "title",
+ label: "title"
},
checkStrictly: true,
slot: true,
@@ -458,9 +468,9 @@
{
required: true,
message: "请选择所属角色",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "警号",
@@ -470,9 +480,9 @@
{
required: true,
message: "请输入警号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "身份证号码",
@@ -482,14 +492,14 @@
{
required: true,
message: "请输入身份证号码",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "手机号码",
prop: "phone",
- overHidden: true,
+ overHidden: true
},
{
label: "用户性别",
@@ -498,26 +508,25 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
- },
+ value: 2
+ }
],
hide: true,
rules: [
{
required: true,
message: "请选择性别",
- trigger: "blur",
- },
- ],
- },
-
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
+ }
+ ]
},
data: [],
platformQuery: {},
@@ -540,25 +549,25 @@
label: "登录账号",
prop: "account",
search: true,
- display: false,
+ display: false
},
{
label: "所属单位",
prop: "tenantName",
slot: true,
- display: false,
+ display: false
},
{
label: "用户姓名",
prop: "realName",
search: true,
- display: false,
+ display: false
},
{
label: "用户平台",
prop: "userTypeName",
slot: true,
- display: false,
+ display: false
},
{
label: "用户平台",
@@ -566,7 +575,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
search: true,
@@ -577,9 +586,9 @@
{
required: true,
message: "请选择用户平台",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "用户拓展",
@@ -589,9 +598,9 @@
span: 24,
overHidden: true,
row: true,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
excelForm: {},
excelOption: {
@@ -606,10 +615,10 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-user",
+ action: "/api/blade-user/import-user"
},
{
label: "数据覆盖",
@@ -620,12 +629,12 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
value: 0,
slot: true,
@@ -633,18 +642,18 @@
{
required: true,
message: "请选择是否覆盖",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
- },
+ span: 24
+ }
+ ]
+ }
};
},
watch: {
@@ -661,7 +670,7 @@
const column = this.findObject(this.excelOption.column, "excelFile");
column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
}
- },
+ }
},
computed: {
...mapGetters(["userInfo", "permission"]),
@@ -670,7 +679,7 @@
addBtn: this.vaildData(this.permission.user_add, false),
viewBtn: this.vaildData(this.permission.user_view, false),
delBtn: this.vaildData(this.permission.user_delete, false),
- editBtn: this.vaildData(this.permission.user_edit, false),
+ editBtn: this.vaildData(this.permission.user_edit, false)
};
},
platformPermissionList() {
@@ -678,25 +687,28 @@
addBtn: false,
viewBtn: false,
delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false),
+ editBtn: this.vaildData(this.permission.user_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
created() {
- console.log(this.userInfo.role_name);
- if (this.userInfo.role_name == "保安公司管理员") {
+ // console.log(this.userInfo.role_name);
+ if (
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
+ ) {
this.deptids = this.userInfo.dept_id;
this.sizes = [0, 24];
this.isguanli = false;
this.option.group[0].column[0]["value"] = this.userInfo.dept_id;
- this.option.group[0].column[0]["disabled"] = true;
+ // this.option.group[0].column[0]["disabled"] = true;
// this.option.group[2].column[1]["disabled"] = true;
} else {
this.deptids = null;
@@ -705,11 +717,15 @@
var that = this;
//公安局进入
- if (this.userInfo.role_name == "公安管理员") {
- var parentId = this.userInfo.dept_id;
- var userId = this.userInfo.Id;
- getDeptLazyTree(parentId, userId).then((res) => {
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
+ var parentId = this.userInfo.dept_id;
+ var userId = this.userInfo.Id;
+ getDeptLazyTree(parentId, userId).then(res => {
that.treeData = res.data.data;
+ that.treeOption.defaultExpandedKeys = [];
+ res.data.data.forEach(item => {
+ that.treeOption.defaultExpandedKeys.push(item.id);
+ });
});
} else {
// this.treeOption.treeLoad = function (node, resolve) {
@@ -725,10 +741,13 @@
// );
// });
// };
- getDeptLazyTree(0).then((res) => {
+ getDeptLazyTree(0).then(res => {
that.treeData = res.data.data;
});
- this.treeOption.defaultExpandAll = false;
+ // var parentId1 = this.userInfo.dept_id;
+ // getSecurityDeptTree(null,null,this.userInfo.dept_id).then((res) => {
+ // that.treeData = res.data.data;
+ // });
}
},
mounted() {
@@ -736,6 +755,7 @@
if (!website.tenantMode) {
this.initData(website.tenantId, this.userInfo.role_name);
}
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
nodeClick(data) {
@@ -748,44 +768,86 @@
this.onLoad(this.page);
},
initData(tenantId, d) {
- getRoleTree(tenantId).then((res) => {
+ getRoleTree(tenantId).then(res => {
const column = this.findObject(this.option.group, "roleId");
var k = res.data.data;
var b = [];
if (d == "保安公司管理员") {
// console.log(k);
for (var n in k) {
- if (k[n].title == "保安" || k[n].title == "保安公司管理员") {
+ if (
+ k[n].title == "保安" ||
+ k[n].title == "保安公司管理员" ||
+ k[n].title == "分公司管理员"
+ ) {
b.push(k[n]);
}
}
column.dicData = b;
- } else if(d == "公安管理员"){
+ } else if (d == "分公司管理员") {
+ for (var j in k) {
+ if (k[j].title == "分公司管理员" || k[j].title == "保安") {
+ b.push(k[j]);
+ }
+ if (k[j].children) {
+ for (var h in k[j].children) {
+ if (
+ k[j].children[h].title == "分公司管理员" ||
+ k[j].children[h].title == "保安"
+ ) {
+ b.push(k[j].children[h]);
+ }
+ }
+ }
+ }
+ column.dicData = b;
+ } else if (d == "公安管理员") {
for (var i in k) {
- if (k[i].title == "公安管理员") {
+ if (k[i].title == "公安管理员" || k[i].title == "民警") {
b.push(k[i]);
}
}
column.dicData = b;
- }else {
+ }else if (d == "民警") {
+ for (var z in k) {
+ if (k[z].title == "民警") {
+ b.push(k[z]);
+ }
+ if (k[z].children) {
+ for (var ff in k[z].children) {
+ if (
+ k[z].children[ff].title == "民警"
+ ) {
+ b.push(k[z].children[ff]);
+ }
+ }
+ }
+ }
+ column.dicData = b;
+ } else {
column.dicData = k;
}
});
-
+ // this.userInfo.role_name == "保安公司管理员"
//公安局进入
- if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "保安公司管理员") {
- var parentId = this.userInfo.dept_id;
- var userId = this.userInfo.Id;
- getDeptLazyTree(parentId, userId).then((res) => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
- });
- } else {
- getDeptLazyTree(0).then((res) => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
- });
- }
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
+ var parentId = this.userInfo.dept_id;
+ var userId = this.userInfo.Id;
+ getDeptLazyTree(parentId, userId).then(res => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ });
+ } else if (this.userInfo.role_name == "administrator") {
+ getDeptLazyTree(0).then(res => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ });
+ } else {
+ getSecurityDeptTree(null, null, this.userInfo.dept_id).then(res => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ });
+ }
// getDeptTree(tenantId).then((res) => {
// const column = this.findObject(this.option.group, "deptId");
// column.dicData = res.data.data;
@@ -801,7 +863,7 @@
this.roleBox = false;
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoad(this.page);
});
@@ -810,9 +872,9 @@
row.deptId = row.deptId;
row.roleId = row.roleId.join(",");
var params = {
- deptname: row.$deptId,
+ deptname: row.$deptId
};
- getJurisdiction(params).then((res) => {
+ getJurisdiction(params).then(res => {
if (res.data.msg != "暂无承载数据") {
row.jurisdiction = res.data.data;
} else {
@@ -824,11 +886,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -847,11 +909,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -861,7 +923,7 @@
this.$confirm("确定将选择用户注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -870,7 +932,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -900,7 +962,7 @@
this.$confirm("确定将选择用户注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -909,7 +971,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -922,7 +984,7 @@
this.$confirm("确定将选择账号密码重置为123456?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return resetPassword(this.ids);
@@ -930,7 +992,7 @@
.then(() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -944,7 +1006,7 @@
if (this.selectionList.length === 1) {
this.roleTreeObj = this.selectionList[0].roleId.split(",");
}
- getRoleTree().then((res) => {
+ getRoleTree().then(res => {
this.roleGrantList = res.data.data;
this.roleBox = true;
});
@@ -965,7 +1027,7 @@
this.$confirm("是否导出用户数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
window.open(
`/api/blade-user/export-user?${
@@ -985,12 +1047,12 @@
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- if(this.userInfo.role_name!="公安管理员"){
+ if (this.userInfo.role_name != "公安管理员" && this.userInfo.role_name != "民警") {
const column = this.findObject(this.option.group, "code");
column.display = false;
}
-
- getUser(this.form.id).then((res) => {
+
+ getUser(this.form.id).then(res => {
this.form = res.data.data;
if (this.form.hasOwnProperty("deptId")) {
this.form.deptId = this.form.deptId;
@@ -1004,7 +1066,7 @@
});
}
if (["add"].includes(type)) {
- if(this.userInfo.role_name!="公安管理员"){
+ if (this.userInfo.role_name != "公安管理员" && this.userInfo.role_name !== "民警") {
const column = this.findObject(this.option.group, "code");
column.display = false;
}
@@ -1025,7 +1087,7 @@
this.loading = true;
var deptid = this.deptids == null ? this.treeDeptId.id : this.deptids;
//公安局进入
- if (this.userInfo.role_name == "公安管理员") {
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
params["jurisdiction"] = this.userInfo.jurisdiction;
params["roleId"] = "1";
}
@@ -1041,11 +1103,12 @@
Object.assign(params, this.query),
deptid,
jurisdiction
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -1055,11 +1118,11 @@
this.platformOnLoad(this.platformPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -1067,7 +1130,7 @@
},
platformBeforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getUserPlatform(this.platformForm.id).then((res) => {
+ getUserPlatform(this.platformForm.id).then(res => {
this.platformForm = res.data.data;
});
}
@@ -1109,21 +1172,22 @@
Object.assign(params, this.query),
deptid,
jurisdiction
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.platformPage.total = data.total;
this.platformData = data.records;
this.platformLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
<style>
.box {
- height: 800px;
+ height: auto;
}
.el-scrollbar {
--
Gitblit v1.9.3