From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/authority/role/index.vue | 308 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 269 insertions(+), 39 deletions(-)
diff --git a/src/views/console/authority/role/index.vue b/src/views/console/authority/role/index.vue
index ee46f2c..557a1cc 100644
--- a/src/views/console/authority/role/index.vue
+++ b/src/views/console/authority/role/index.vue
@@ -3,31 +3,64 @@
<div class="roleContainer">
<div class="roleContainer-title">瑙掕壊</div>
<ul>
- <li v-for="(item,index) in tableData" @click="changeLi(index)">
+ <li v-for="(item,index) in tableData" @click="changeTabaleLi(item,index)">
<span :class="{active: item.active}">{{item.roleName}}</span>
<div class="scopeBtn">
- <span style="margin-right: 12px;cursor: pointer;">閲嶅懡鍚�</span>
- <span>鍒犻櫎</span>
+ <span style="margin-right: 12px;cursor: pointer;" @click.stop="table_edit(item, index)">閲嶅懡鍚�</span>
+ <span @click="table_del(item, index)">鍒犻櫎</span>
</div>
</li>
</ul>
<div class="left-panel">
- <el-button type="primary" icon="el-icon-plus" @click="add">娣诲姞瑙掕壊</el-button>
+ <el-button type="primary" icon="el-icon-plus" @click="addRole">娣诲姞瑙掕壊</el-button>
</div>
</div>
- <el-tabs tab-position="top" class="roleTabs">
- <el-tab-pane label="鑿滃崟">
- <div class="treeMain">
- <el-tree ref="menu" node-key="name" :data="menu.list" :props="menu.props" show-checkbox></el-tree>
- </div>
- </el-tab-pane>
- <el-tab-pane label="鍗＄墖">
- <div class="treeMain">
- <el-tree ref="grid" node-key="key" :data="grid.list" :props="grid.props" :default-checked-keys="grid.checked" show-checkbox></el-tree>
- </div>
- </el-tab-pane>
- </el-tabs>
+ <div class="role-main-tabs">
+ <div class="role-main-header">
+ <div class="role-main-title">璐﹀彿</div>
+ <ul>
+ <li v-for="(item,index) in roleHeaderList" @click="changeHeaderLi(item,index)" :class="{titleActive: item.active}">{{item.realName}}</li>
+ <li class="role-header-add" @click="addUser">+ 娣诲姞璐﹀彿</li>
+ </ul>
+ <div class="role-main-title">鏉冮檺绠＄悊</div>
+ </div>
+ <el-tabs tab-position="top">
+ <el-tab-pane label="鑿滃崟">
+ <div class="treeMain">
+ <el-tabs tab-position="left" class="demo-tabs" v-model="menuActiveName" @tab-click="menuHandleClick">
+ <el-tab-pane v-for="item in menuGrantList" :label="item.title" :name="item.title">
+ <el-tree ref="tree" v-if="showtree" :data="treeData" :props="{ label: 'title',children: 'children'}" node-key="id" show-checkbox @check-change="treeHandleCheckChange" :default-checked-keys="treeCheck" default-expand-all />
+ </el-tab-pane>
+ </el-tabs>
+ <div class="roleSubmit"><el-button type="primary" :loading="submitIsSaveing" @click="roleSubmit()">淇� 瀛�</el-button></div>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鍗＄墖">
+ <div class="treeMain">
+ <!-- <el-tree ref="grid" node-key="key" :data="grid.list" :props="grid.props" :default-checked-keys="grid.checked" show-checkbox></el-tree> -->
+ 123
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+ <el-dialog title="浜哄憳閫夋嫨" v-model="userVisible" :width="500" destroy-on-close>
+ <div>
+ <el-table ref="userVisibleRef" :data="userVisibleData" style="width: 100%" @selection-change="userVisibleChange">
+ <el-table-column type="selection" width="55" />
+ <el-table-column label="濮撳悕" prop="realName" />
+ <el-table-column label="褰撳墠瑙掕壊" prop="roleName" />
+ <el-table-column label="鎵嬫満鍙�" prop="phone" />
+ <el-table-column label="閭" prop="email" />
+ </el-table>
+ <el-pagination @current-change="handleCurrentChange" style="margin-top: 12px;" layout="total, prev, pager, next" :total="total" />
+ </div>
+
+ <template #footer>
+ <el-button @click="userVisible=false" >鍙� 娑�</el-button>
+ <el-button type="primary" :loading="isSaveing" @click="userSubmit()">纭� 瀹�</el-button>
+ </template>
+ </el-dialog>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save=false"></save-dialog>
</div>
</template>
@@ -42,6 +75,22 @@
},
data() {
return {
+ showtree: true,
+ treeCheck: [],
+ menuActiveName: "",
+ treeData: [],
+ menuGrantList: [],
+ total: 0,
+ searchData: {
+ current: 1,
+ size: 10
+ },
+ tableLiId: "", //褰撳墠瑙掕壊id
+ isSaveing: false,
+ submitIsSaveing: false,
+ userVisibleData: [],
+ userVisible: false,
+ roleHeaderList: [],
menu: {
list: [],
checked: [],
@@ -69,29 +118,160 @@
},
//apiObj: this.$API.system.role.list,
tableData: "",
- selection: []
+ userSelection: []
}
},
mounted(){
this.getRoleList(); //瑙掕壊鍒楄〃
+ this.getUser(); //鑾峰彇鍏ㄩ儴璐﹀彿
},
methods: {
- changeLi(index) {
- this.tableData.forEach(item=> {
+ roleSubmit() { //淇濆瓨
+ var obj = {
+ apiScopeIds: [],
+ dataScopeIds: [],
+ menuIds: this.$refs.tree[0].getCheckedKeys(),
+ roleIds: [this.tableLiId]
+ }
+ this.isSaveing = true;
+ this.$HTTP.post(`/api/blade-system/role/grant`,obj).then(res=> {
+ this.isSaveing = false;
+ if(res.code == 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }
+ })
+ },
+ menuHandleClick(tab, event) {
+ this.setTreeList(this.menuGrantList,event.target.innerText); //tree
+ },
+ treeHandleCheckChange() {
+
+ },
+ setTreeList(arr,name) {
+ this.treeData = [];
+ arr.forEach(item=> {
+ if(item.title == name) {
+ this.treeData = item.children;
+ }
+ })
+ },
+ extractLastLevelIds(array) { //閫掑綊鑾峰彇children鏈�鍚庝竴绾х殑id鐨勬暟缁�
+ let ids = [];
+ for (let i = 0; i < array.length; i++) {
+ const obj = array[i];
+ if (obj.children) {
+ // 閫掑綊璋冪敤浠ユ彁鍙栨洿娣卞眰绾х殑children涓殑id
+ ids = ids.concat(this.extractLastLevelIds(obj.children));
+ } else {
+ // 濡傛灉娌℃湁children灞炴�э紝鍒欏亣瀹氬綋鍓嶅璞℃槸鏈�鍚庝竴绾�
+ if (obj.id) {
+ ids.push(obj.id);
+ }
+ }
+ }
+ return ids;
+ },
+ findOverlap(array1, array2) { //鎵惧嚭涓や釜鏁扮粍閲嶅悎鐨勯儴鍒�
+ // 鍒涘缓涓�涓泦鍚堬紙Set锛夋潵瀛樺偍绗簩涓暟缁勪腑鐨勫厓绱狅紝浠ヤ究浜庡揩閫熸煡鎵�
+ const set = new Set(array2);
+ // 浣跨敤filter鏂规硶杩囨护鍑虹涓�涓暟缁勪腑鍦ㄩ泦鍚堜腑瀛樺湪鐨勫厓绱�
+ const overlap = array1.filter(item => set.has(item));
+ return overlap;
+ },
+ getSelectTree(res,id,index) {//鑾峰彇宸查�夋暟鎹�
+ this.$HTTP.get(`/api/blade-system/menu/role-tree-keys?roleIds=${id}`).then(resp=> {
+ if(res.code == 200) {
+ this.tableData.forEach(item=> {
+ item.active = false;
+ })
+ this.tableData[index].active = true; //閫変腑
+ this.showtree = false;
+ this.tableLiId = id; //瑙掕壊id
+ this.$nextTick(()=> {
+ this.showtree = true;
+ this.menuGrantList = res.data.menu.filter(item=> { //杩囨护鎺夋病鏈塩hildren鐨�
+ return item.children;
+ });
+ this.menuActiveName = this.menuGrantList[0].title;//榛樿绗竴涓彍鍗�
+ this.setTreeList(this.menuGrantList,this.menuActiveName);//灞曠ず鏍戯紙宸︿晶鑿滃崟list锛屽乏渚ц彍鍗曞悕瀛楋級
+ var lastId = [],idarr = [];
+ var lastId = this.extractLastLevelIds(this.menuGrantList); //鑾峰彇鏈�鍚庝竴绾d
+ var idarr = this.findOverlap(lastId,resp.data.menu); //鎵惧嚭涓や釜鏁扮粍閲嶅悎鐨勯儴鍒�
+ this.treeCheck = idarr; //鑾峰彇閫変腑鏁版嵁
+ })
+ }
+ })
+ },
+ getMenuGrant(row,index) {
+ this.$HTTP.get(`/api/blade-system/menu/grant-tree`).then(res=> {
+ if(res.code == 200) {
+ //鑾峰彇宸查�夋暟鎹� (鏍戠殑鏁版嵁锛岃鑹瞚d)
+ this.getSelectTree(res,row.id,index);
+ }
+ })
+ },
+ userSubmit() {
+ var ids = [];
+ this.userSelection.forEach(item=> {
+ ids.push(item.id);
+ })
+ this.isSaveing = true;
+
+ this.$HTTP.post(`/api/blade-user/${this.tableLiId}/save`,{ids}).then(res=> {
+ this.isSaveing = false;
+ if(res.code == 200) {
+ this.userVisible = false;
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.$HTTP.get(`/api/blade-user/${this.tableLiId}/list`).then(res=> {
+ if(res.code == 200) {
+ this.roleHeaderList = res.data;
+ }
+ })
+ }
+ })
+ },
+ userVisibleChange(selection) {
+ this.userSelection = selection;
+ },
+ addUser() { //娣诲姞璐﹀彿
+ this.userVisible = true;
+ },
+ getUser() { //鑾峰彇鍏ㄩ儴璐﹀彿
+ this.$HTTP.get(`/api/blade-user/page?current=${this.searchData.current}&size=10&deptId=`).then(res=> {
+ if(res.code == 200) {
+ this.userVisibleData = res.data.records;
+ this.total = res.data.total;
+ }
+ })
+ },
+ getBladeList(row,index) { //浜哄憳鍒楄〃
+ this.$HTTP.get(`/api/blade-user/${row.id}/list`).then(res=> {
+ if(res.code == 200) {
+ this.roleHeaderList = res.data;
+ this.getMenuGrant(row,index); //鑾峰彇tree
+ }
+ })
+ },
+ changeHeaderLi(row,index) {
+ this.roleHeaderList.forEach(item=> {
item.active = false;
})
- this.tableData[index].active = true;
+ this.roleHeaderList[index].active = true;
+ },
+ changeTabaleLi(row,index) {
+ this.getBladeList(row,index); //鑾峰彇浜哄憳鍒楄〃
},
getRoleList() {
this.$HTTP.get("/api/blade-system/role/list?current=1&size=1000").then(res=> {
if(res.code == 200) {
res.data[0].active = true;
this.tableData = res.data;
+ this.getBladeList(this.tableData[0],0); //榛樿绗竴涓鑹茶幏
}
})
},
//娣诲姞
- add(){
+ addRole(){
this.dialog.save = true
this.$nextTick(() => {
this.$refs.saveDialog.open()
@@ -101,7 +281,7 @@
table_edit(row){
this.dialog.save = true
this.$nextTick(() => {
- this.$refs.saveDialog.open('edit').setData(row)
+ this.$refs.saveDialog.open('edit').setData(row);
})
},
//鏌ョ湅
@@ -112,15 +292,20 @@
})
},
//鍒犻櫎
- async table_del(row){
- var reqData = {id: row.id}
- var res = await this.$API.demo.post.post(reqData);
- if(res.code == 200){
- this.$refs.table.refresh()
- this.$message.success("鍒犻櫎鎴愬姛")
- }else{
- this.$alert(res.message, "鎻愮ず", {type: 'error'})
- }
+ table_del(row) {
+ var that = this;
+ this.$confirm(`鏄惁鍒犻櫎瑙掕壊-${row.roleName}?`, '', {
+ type: 'warning'
+ }).then(() => {
+ this.$HTTP.post("/api/blade-system/role/remove?ids="+row.id).then(res=> {
+ if(res.code == 200) {
+ that.$message.success("鎿嶄綔鎴愬姛");
+ that.getRoleList(); //瑙掕壊鍒楄〃
+ }
+ })
+ }).catch(() => {
+
+ })
},
//琛ㄦ牸閫夋嫨鍚庡洖璋冧簨浠�
selectionChange(selection){
@@ -154,11 +339,12 @@
},
//鏈湴鏇存柊鏁版嵁
handleSaveSuccess(data, mode){
- if(mode=='add'){
- this.$refs.table.refresh()
- }else if(mode=='edit'){
- this.$refs.table.refresh()
- }
+ this.getRoleList(); //瑙掕壊鍒楄〃
+ },
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`);
+ this.searchData.current = val;
+ this.getUser();
}
}
}
@@ -183,7 +369,7 @@
line-height: 41px;
font-size: 14px;
text-align: center;
- background-color: #3b8e8e;
+ background-color: #409eff;
color: #fff;
}
.rolePage .roleContainer ul {
@@ -203,7 +389,7 @@
}
.rolePage .roleContainer ul li .active {
font-weight: bold;
- color: #3b8e8e;
+ color: #409eff;
}
.rolePage .roleContainer ul li:hover {
background-color: #f5f7fa;
@@ -215,11 +401,55 @@
text-align: center;
margin-top:8px;
}
-.rolePage .roleTabs {
+.rolePage .role-main-tabs {
flex: 1;
background-color: #fff;
padding: 8px;
margin-top:8px;
margin-right:8px;
}
+.role-main-title {
+ padding: 6px 10px;
+ font-size: 14px;
+ background-color: #9dc7f2;
+ margin-bottom: 8px;
+ border-radius: 2px;
+}
+.role-main-header ul {
+ padding: 20px 20px 10px;
+}
+.role-main-header ul li {
+ list-style-type: none;
+ display: inline-block;
+ width: 200px;
+ padding: 8px 20px;
+ margin: 0 10px 10px 0;
+ border: 1px solid #e5e5e5;
+ cursor: pointer;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.role-main-header ul li.titleActive {
+ border: 1px solid #409eff;
+}
+.role-main-header ul li.role-header-add {
+ display: inline-block;
+ border: 1px dashed #e5e5e5;
+}
+.treeMain {
+ position: relative;
+ margin-bottom: 60px;
+}
+.roleSubmit {
+ bottom: 0;
+ position: fixed;
+ width: 100%;
+ text-align: right;
+ right: 0;
+ padding-right: 20px;
+ padding-bottom: 12px;
+ background: #fff;
+ z-index: 11;
+}
</style>
--
Gitblit v1.9.3