@@ -47,14 +47,15 @@ export default {
default: () => {
return [{ required: true, message: '密码不能为空', trigger: 'blur' }];
}
- },
- // 验证码规则
- codedRules: {
- type: Array,
- default: () => {
- return [{ required: true, message: '验证码不能为空', trigger: 'blur' }];
- }
}
+ // ,
+ // // 验证码规则
+ // codedRules: {
+ // type: Array,
+ // default: () => {
+ // return [{ required: true, message: '验证码不能为空', trigger: 'blur' }];
+ // }
+ // }
},
data() {
return {
@@ -63,7 +64,7 @@ export default {
formData: {
code: '',
codeUuid: '',
- loginName: 'demo',
+ loginName: 'sa',
loginPwd: '123456'
},
codeUrl: ''
@@ -79,7 +80,7 @@ export default {
}
},
mounted() {
- this.verificationCode();
+ // this.verificationCode();
},
methods: {
// 获取验证码
@@ -125,9 +126,9 @@ export default {
//TODO zhuoda sentry
console.error(e);
this.btnLoading = false;
- this.verificationCode();
+ //this.verificationCode();
}
}
}
};
-
\ No newline at end of file
+
diff --git a/smart-admin-web/src/views/login/login.less b/smart-admin-web/src/views/login/login.less
index d1d6fc2b..82a52efc 100644
--- a/smart-admin-web/src/views/login/login.less
+++ b/smart-admin-web/src/views/login/login.less
@@ -26,7 +26,7 @@
width: 424px;
background: #fff;
padding: 32px 32px;
- border-radius: 0 8px 8px 0;
+ border-radius: 8px;
.ivu-input {
border: 1px solid #E8E8EE;
border-radius: 4px;
diff --git a/smart-admin-web/src/views/support/task/task-list.vue b/smart-admin-web/src/views/support/task/task-list.vue
index 9175a359..d73e96be 100644
--- a/smart-admin-web/src/views/support/task/task-list.vue
+++ b/smart-admin-web/src/views/support/task/task-list.vue
@@ -365,6 +365,7 @@ export default {
} catch (e) {
//TODO zhuoda sentry
console.error(e);
+ } finally {
this.loading = false;
}
},
@@ -400,33 +401,52 @@ export default {
},
// 删除任务
async deleteTask(id) {
- let result = await taskApi.deleteTask(id);
- this.$Message.success('删除任务成功!');
- this.getTaskList();
+ this.$Spin.show();
+ try{
+ let result = await taskApi.deleteTask(id);
+ this.$Message.success('删除任务成功!');
+ this.getTaskList();
+ } catch (error) {
+ console.error(e);
+ } finally {
+ this.$Spin.hide();
+ }
},
// 操作任务
async controlTask(type, id) {
this.$Spin.show();
- switch (type) {
- case 'RUN':
- await taskApi.updateTaskRun(id);
- break;
- case 'PAUSE':
- await taskApi.updateTaskPause(id);
- break;
- case 'RESUME':
- await taskApi.updateTaskResume(id);
- break;
+ try{
+ switch (type) {
+ case 'RUN':
+ await taskApi.updateTaskRun(id);
+ break;
+ case 'PAUSE':
+ await taskApi.updateTaskPause(id);
+ break;
+ case 'RESUME':
+ await taskApi.updateTaskResume(id);
+ break;
+ }
+ this.$Message.success('操作成功');
+ this.getTaskList();
+ } catch (error) {
+ console.error(e);
+ } finally {
+ this.$Spin.hide();
}
- this.$Spin.hide();
- this.$Message.success('操作成功');
- this.getTaskList();
},
// 触发更新
handleUpdate() {
this.$refs['updateRef'].validate(valid => {
if (valid) {
- this.updateTask();
+ this.$Spin.show();
+ try{
+ this.updateTask();
+ } catch (error) {
+ console.error(e);
+ } finally {
+ this.$Spin.hide();
+ }
} else {
this.$Message.success('验证信息不通过');
}
@@ -444,6 +464,7 @@ export default {
} catch (e) {
//TODO zhuoda sentry
console.error(e);
+ } finally {
this.updateLoading = false;
}
},
@@ -464,6 +485,7 @@ export default {
} catch (e) {
//TODO zhuoda sentry
console.error(e);
+ } finally {
this.saveLoading = false;
}
},
diff --git a/smart-admin-web/src/views/system/employee/role/components/role-tree/role-tree.vue b/smart-admin-web/src/views/system/employee/role/components/role-tree/role-tree.vue
index 9721599d..fe4eec67 100644
--- a/smart-admin-web/src/views/system/employee/role/components/role-tree/role-tree.vue
+++ b/smart-admin-web/src/views/system/employee/role/components/role-tree/role-tree.vue
@@ -21,19 +21,19 @@
{{module.name}}
+ @click.prevent.native="selectCheckbox(module)"
+ >{{module.name}}
{{childrenModule.name}}
@@ -46,23 +46,56 @@
{{pages.name}}
-
+
+
- {{page.name}}
+
+
+
+
+
{{page.name}}
+
+
+
+ {{fiveLevelFunction.name}}
+
+
+
+
+
@@ -101,6 +134,8 @@ export default {
return {
// 权限数据
tree: [],
+ //权限铺平的map
+ treeMap: null,
loading: false,
// 提交保存数据
rolePower: {
@@ -133,118 +168,95 @@ export default {
activated() {},
methods: {
// 勾选权限
- selectCheckbox(
- currentModuleList,
- moduleIndex,
- upOneModuleList,
- upTwoModuleList
- ) {
- let module = currentModuleList[moduleIndex];
+ selectCheckbox(module) {
// 是否勾选
let findIndex = this.checkedData.indexOf(module.key);
if (findIndex !== -1) {
- this.spliceCheck(module);
- // 取消的上级ID
- // 判断同级是否全部已取消勾选
- let currentLevelAllUnchecked = this.isUnCheckedThisLevel(
- currentModuleList
- );
- if (currentLevelAllUnchecked && upOneModuleList) {
- // 判断上级是否全部已取消勾选
- let upOneLevelAllUnchecked = this.isUnCheckedThisLevel(
- upOneModuleList
- );
- if (upOneLevelAllUnchecked && upTwoModuleList) {
- // 判断上上级是否全部已取消勾选
- this.isUnCheckedThisLevel(upTwoModuleList);
+ //取消自己和孩子
+ this.removeCheckAndChidlrenCheck(module);
+ //判断父级及其以上是否有重复
+ if (module.parentKey) {
+ let parentPrivilege = this.treeMap.get(module.parentKey);
+ if (parentPrivilege) {
+ this.unCheckedParent(parentPrivilege);
}
}
} else {
// 选中子级所有checkBox
- this.addCheck(module);
- // 选中上级组件
- if (module.parentKey) {
- if (
- this.checkedData.findIndex(val => val === module.parentKey) === -1
- ) {
- this.checkedData.push(module.parentKey);
- }
- }
- // 选中上上级组件
- if (upOneModuleList) {
- let upOneFindIndex = upOneModuleList.findIndex(
- e => e.key === module.parentKey
- );
- let upOneFind =
- upOneFindIndex === -1 ? null : upOneModuleList[upOneFindIndex];
- if (
- upOneFind &&
- upOneFind.parentKey &&
- this.checkedData.findIndex(val => val === upOneFind.parentKey) ===
- -1
- ) {
- this.checkedData.push(upOneFind.parentKey);
- }
- // 选中上上上级组件
- if (upTwoModuleList) {
- console.log(1111, upTwoModuleList, upOneFind);
- let upTwoFindIndex = upTwoModuleList.findIndex(
- e => e.key === upOneFind.parentKey
- );
- let upTwoFind =
- upTwoFindIndex === -1 ? null : upTwoModuleList[upTwoFindIndex];
- if (
- upTwoFind &&
- upTwoFind.parentKey &&
- this.checkedData.findIndex(val => val === upTwoFind.parentKey) ===
- -1
- ) {
- this.checkedData.push(upTwoFind.parentKey);
+ this.addCheckAndChildrenCheck(module);
+ // 父类集合选中
+ let parentKey = module.parentKey;
+ while (parentKey != null) {
+ let parentPrivilege = this.treeMap.get(parentKey);
+ if (parentPrivilege) {
+ let findIndex = this.checkedData.findIndex(val => val == parentKey);
+ if (findIndex == -1) {
+ this.checkedData.push(parentKey);
}
+ parentKey = parentPrivilege.parentKey;
+ } else {
+ parentKey = null;
}
}
}
},
- // 判断同级是否全部已取消勾选
- isUnCheckedThisLevel(moduleList) {
- let thisLevelAllUnchecked = true;
- moduleList.forEach(e => {
- let brotherIndex = this.checkedData.findIndex(val => val == e.key);
- if (brotherIndex != -1) {
- thisLevelAllUnchecked = false;
- }
- });
- if (thisLevelAllUnchecked) {
- let number = this.checkedData.findIndex(
- e => e == moduleList[0].parentKey
- );
- if (number != -1) {
- this.checkedData.splice(number, 1);
+ // 取消父级check
+ unCheckedParent(parentPrivilege) {
+ if (
+ parentPrivilege &&
+ parentPrivilege.children &&
+ parentPrivilege.children.length > 0
+ ) {
+ if (!this.judgeArrayExistCheck(parentPrivilege.children)) {
+ let findIndex = this.checkedData.findIndex(
+ val => val == parentPrivilege.key
+ );
+ if (findIndex != -1) {
+ this.checkedData.splice(findIndex, 1);
+ }
+
+ parentPrivilege = this.treeMap.get(parentPrivilege.parentKey);
+ this.unCheckedParent(parentPrivilege);
}
}
- return thisLevelAllUnchecked;
},
+ //判断权限数组是否有选中的，有返回true,没有任何选中返回false
+ judgeArrayExistCheck(privilegeArray) {
+ if (!privilegeArray) {
+ return false;
+ }
+
+ for (let privilege of privilegeArray) {
+ let findIndex = this.checkedData.findIndex(val => val == privilege.key);
+ if (findIndex != -1) {
+ return true;
+ }
+ }
+ return false;
+ },
+
// 选中子级所有checkBox
- addCheck(module) {
+ addCheckAndChildrenCheck(module) {
let findIndex = this.checkedData.findIndex(val => val == module.key);
if (findIndex == -1) {
this.checkedData.push(module.key);
}
+
if (module.children) {
module.children.forEach(item => {
- this.addCheck(item);
+ this.addCheckAndChildrenCheck(item);
});
}
},
// 取消自己和下级勾选
- spliceCheck(module) {
+ removeCheckAndChidlrenCheck(module) {
let findIndex = this.checkedData.findIndex(val => val == module.key);
if (findIndex != -1) {
this.checkedData.splice(findIndex, 1);
}
if (module.children) {
module.children.forEach(item => {
- this.spliceCheck(item);
+ this.removeCheckAndChidlrenCheck(item);
});
}
},
@@ -272,13 +284,23 @@ export default {
this.$Spin.hide();
}
},
+ //将权限tree 打平成map
+ tree2map(tree) {
+ if (tree) {
+ for (const privilege of tree) {
+ this.treeMap.set(privilege.key, privilege);
+ this.tree2map(privilege.children);
+ }
+ }
+ },
// 获取角色可选的功能权限
async getListPrivilegeByRoleId(id) {
try {
let response = await privilegeApi.getListPrivilegeByRoleId(id);
let datas = response.data;
this.tree = datas.privilege;
- console.log('tree', this.tree);
+ this.treeMap = new Map();
+ this.tree2map(this.tree);
this.checkedData = datas.selectedKey || [];
} catch (e) {
console.error(e);
@@ -360,14 +382,14 @@ export default {
border-bottom: 1px solid rgb(240, 240, 240);
padding: 10px 0;
}
- .level-teo {
+ .level-two {
display: flex;
align-items: center;
margin-left: 4%;
position: relative;
border-bottom: 1px solid rgb(240, 240, 240);
line-height: 40px;
- .level-teo-label {
+ .level-two-label {
width: 12%;
min-width: 120px;
}
@@ -381,15 +403,21 @@ export default {
.isLevel-four {
display: flex;
align-items: center;
+ border-bottom: 1px rgb(240, 240, 240) solid;
.level-three-label {
width: 12%;
min-width: 120px;
}
- .Level-four {
+ .level-four {
padding-left: 4%;
flex: 1;
min-height: 40px;
border-left: 1px rgb(240, 240, 240) solid;
+ .level-five {
+ padding-left: 4%;
+ min-height: 40px;
+ border-left: 1px rgb(240, 240, 240) solid;
+ }
}
}
}
diff --git a/smart-admin-web/src/views/system/system-setting/system-privilege/components/privilege-form.vue b/smart-admin-web/src/views/system/system-setting/system-privilege/components/privilege-form.vue
index 6233c82f..f4454771 100644
--- a/smart-admin-web/src/views/system/system-setting/system-privilege/components/privilege-form.vue
+++ b/smart-admin-web/src/views/system/system-setting/system-privilege/components/privilege-form.vue
@@ -17,7 +17,7 @@
-
+
