diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index e6f7ac8fcd..a9904e01b5 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -29,7 +29,7 @@
-
+
@@ -73,262 +73,6 @@
:total="total"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{
- // this.$set(this.form, "orgList", response.data);
- // });
- // this.$get("/workspace/list", response => {
- // this.$set(this.form, "wsList", response.data);
- // });
- // if (row.id) {
- // this.$get('/userrole/all/' + encodeURIComponent(row.id), response => {
- // let data = response.data;
- // this.$set(this.form, "roles", data);
- // });
- // }
- // listenGoBack(this.handleClose);
this.$refs.editUser.open("Edit", "修改用户", row);
},
editPassword(row) {
@@ -609,25 +333,18 @@ export default {
})
},
search() {
- // if (!hasRole(ROLE_ADMIN)) {
- // return;
- // }
this.selectRows = new Set();
// this.condition.selectAll = false;
this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
let data = response.data;
this.total = data.itemCount;
this.tableData = data.listObject;
- // let url = "/user/special/user/role";
let url = "/user/special/user/group";
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].id) {
this.$get(url + '/' + encodeURIComponent(this.tableData[i].id), result => {
let data = result.data;
- // let roles = data.roles;
let groups = data.groups;
- // let userRoles = result.userRoles;
- // this.$set(this.tableData[i], "roles", roles);
this.$set(this.tableData[i], "roles", groups);
this.$set(this.tableData[i], "isLocalUser", this.tableData[i].source === 'LOCAL');
});
@@ -694,11 +411,6 @@ export default {
this.$set(this.form, "wsList", response.data);
})
},
- getAllRole() {
- this.$get("/role/all", response => {
- this.userRole = response.data;
- })
- },
importUserDialogOpen(){
this.$refs.userImportDialog.open();
},
@@ -721,32 +433,6 @@ export default {
}
})
},
- removeRole(item) {
- let index = this.form.roles.indexOf(item);
- if (index !== -1) {
- this.form.roles.splice(index, 1)
- }
- if (this.form.roles.length < this.userRole.length) {
- this.btnAddRole = false;
- }
- },
- activeRole(roleInfo) {
- return this.userRole.filter(function (role) {
- let value = true;
- if (!roleInfo.selects) {
- return true;
- }
- if (roleInfo.selects.length === 0) {
- value = true;
- }
- for (let i = 0; i < roleInfo.selects.length; i++) {
- if (role.id === roleInfo.selects[i]) {
- value = false;
- }
- }
- return value;
- })
- },
initWorkspaceBatchProcessDataStruct(isShow){
this.$get("/user/getWorkspaceDataStruct/All", response => {
this.batchAddWorkspaceOptions = response.data;
diff --git a/frontend/src/business/components/settings/system/group/EditPermission.vue b/frontend/src/business/components/settings/system/group/EditPermission.vue
index 24b6e78116..49d6b2642a 100644
--- a/frontend/src/business/components/settings/system/group/EditPermission.vue
+++ b/frontend/src/business/components/settings/system/group/EditPermission.vue
@@ -52,15 +52,11 @@
-
-