From ec86ce630c3bf6ef4abe5f52ecde21eeda03c5e7 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期二, 15 八月 2023 10:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane
---
src/views/AuthorizationManagement/roleResAuthorization.vue | 79 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index 447ceb2..1ec95b5 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -46,6 +46,7 @@
<el-table-column
align="center"
width="55"
+ row-key="id"
>
<template slot-scope="scope">
<el-radio
@@ -124,11 +125,12 @@
</div>
<el-divider class="divider" />
<el-tree
- ref="tree"
- :props="defaultLayerrops"
- node-key="resid"
- :data="layerData"
+ :data="Layertree"
show-checkbox
+ node-key="layerid"
+ ref="layerFrom"
+ :props="defaultLayerrops"
+ accordion
:default-expanded-keys="[1]"
>
</el-tree>
@@ -204,14 +206,12 @@
import {
queryDepTree,
select_Role_ByPageAndCount,
- roleReselectByPageAndCount,
- roleResDeletes,
- resSelectCountForRole,
+
roleResInserts,
- res_selectAll,
- roleRes_selectResByRole,
- roleRes_inserts,
- roleRes_deletes
+
+ roleLayer_selectResByRole,
+ roleLayer_inserts,
+ roleLayer_deletes
} from '../../api/api';
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -266,7 +266,8 @@
roleid: null,
addmultipleSelection: [],
layerData: [],
- layeroption: []
+ layeroption: [],
+ Layertree: []
};
},
@@ -297,7 +298,7 @@
.catch(() => { });
},
async adduser() {
- var val = this.$refs.tree.getCheckedNodes(false, true); // 鍒╃敤杩欎釜鏂规硶灏卞彲浠ヨ幏鍙栧埌瀛愯妭鐐�+鐖惰妭鐐�)
+ var val = this.$refs.layerFrom.getCheckedNodes(false, true); // 鍒╃敤杩欎釜鏂规硶灏卞彲浠ヨ幏鍙栧埌瀛愯妭鐐�+鐖惰妭鐐�)
var std = [];
for (var i in val) {
@@ -309,7 +310,9 @@
if (std.length == 0) {
return
}
- const data = await roleRes_inserts(std)
+
+ const data = await roleLayer_inserts(std);
+
if (data.code != 200) {
this.$message.error('鎺堟潈澶辫触');
} else {
@@ -324,7 +327,7 @@
},
//鐢ㄦ埛鍒犻櫎
async deletesUser() {
- var val = this.$refs.tree.getCheckedNodes(false, true); // 鍒╃敤杩欎釜鏂规硶灏卞彲浠ヨ幏鍙栧埌瀛愯妭鐐�+鐖惰妭鐐�)
+ var val = this.$refs.layerFrom.getCheckedNodes(false, true); // 鍒╃敤杩欎釜鏂规硶灏卞彲浠ヨ幏鍙栧埌瀛愯妭鐐�+鐖惰妭鐐�)
var std = [];
for (var i in val) {
if (val[i].id > 0) {
@@ -341,7 +344,7 @@
if (arr.length == 0) {
return
}
- const data = await roleRes_deletes({ ids: arr.toString() });
+ const data = await roleLayer_deletes({ ids: arr.toString() });
if (data.code != 200) {
this.$message.error('鎺堟潈澶辫触');
} else {
@@ -422,27 +425,22 @@
},
//鑾峰彇璧勬簮鍒楄〃
async getlayerTree() {
- this.layerData = []
- const data = await res_selectAll();
- if (data.code != 200) {
- return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
- }
- var val = this.setTreeData(data.result);
- val.sort(function (a, b) {
- return a.sort - b.sort
- })
- this.layerData = val
+ // this.layerData = []
+ // const data = await res_selectAll();
+ // if (data.code != 200) {
+ // return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
+ // }
+ // var val = this.setTreeData(data.result);
+ // val.sort(function (a, b) {
+ // return a.sort - b.sort
+ // })
+ // this.layerData = val
},
setTreeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
return cloneData.filter((father) => {
// 寰幆鎵�鏈夐」
- let branchArr = cloneData.filter((child) => father.resid == child.pid);
- if (branchArr.length > 0) {
- branchArr.sort(function (a, b) {
- return a.sort - b.sort
- })
- }
+ let branchArr = cloneData.filter((child) => father.layerid == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
// 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭ｄ箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭ｄ箞 a.c.d 涔熸槸=2锛�
// 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋�
@@ -512,26 +510,25 @@
},
// 鐢ㄦ埛琛ㄨ姹�
async getuserList() {
- this.layerData = [];
+ this.Layertree = [];
this.layeroption = [];
- const data = await roleRes_selectResByRole({ roleid: this.userlistData.roleid });
+ const data = await roleLayer_selectResByRole({ roleid: this.userlistData.roleid });
if (data.code !== 200) {
return this.$message.error('鏍规嵁ID鏌ヨ璧勬簮澶辫触');
}
var std = [];
this.layeroption = data.result;
for (var i in data.result) {
- if (data.result[i].id > 0 && data.result[i].type != 1) {
- std.push(data.result[i].resid)
+ if (data.result[i].id > 0 && data.result[i].isLayer != 0) {
+ std.push(data.result[i].layerid)
}
}
var val = this.setTreeData(data.result);
- val.sort(function (a, b) {
- return a.sort - b.sort
- })
- this.layerData = val
- this.$refs.tree.setCheckedKeys(std);
+
+
+ this.Layertree = val
+ this.$refs.layerFrom.setCheckedKeys(std);
},
// 瑙掕壊琛ㄨ姹�
async getRole() {
--
Gitblit v1.9.3