From f6c09fd8be4d671b13e673a49e5af9c19710e464 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 23 八月 2023 10:51:02 +0800
Subject: [PATCH] 1.权限分配
---
src/views/basicSettings/powerDivider.vue | 300 ++++---------------------------------------------
src/views/basicSettings/roleList.vue | 20 +-
src/layout/components/Navbar.vue | 2
3 files changed, 39 insertions(+), 283 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 65f97ef..8c36bd9 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -71,7 +71,7 @@
</el-badge>
</el-tooltip>
- <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA;cursor: pointer">
+ <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA;cursor: pointer;margin-right:5px">
{{ stu_torgname }}
<!-- <el-dropdown v-if="stu_torgname.toString().length>0" class="avatar-container" trigger="hover">-->
diff --git a/src/views/basicSettings/powerDivider.vue b/src/views/basicSettings/powerDivider.vue
index 3fe1ff7..eabdde9 100644
--- a/src/views/basicSettings/powerDivider.vue
+++ b/src/views/basicSettings/powerDivider.vue
@@ -17,9 +17,9 @@
<div style="margin-left: 8px;">瑙掕壊鍚嶇О</div>
</div>
- <div style="margin-right:10px">
- <i class="el-icon-plus" style="cursor: pointer;color: #999" @click="rolePlusClick" />
- </div>
+ <!-- <div style="margin-right:10px">-->
+ <!-- <i class="el-icon-plus" style="cursor: pointer;color: #999" @click="rolePlusClick" />-->
+ <!-- </div>-->
</div>
@@ -33,42 +33,14 @@
:props="defaultPropsLeft"
:default-expand-all="true"
:expand-on-click-node="false"
- draggable
- :allow-drop="treeLeftAllowDrop"
@node-click="treeLeftNodeClick"
- >
- <span slot-scope="{ node, data }" class="custom-tree-node">
- <span v-if="!data.isEdit">{{ node.label }}</span>
- <input
- v-if="data.isEdit"
- :ref="data.code"
- v-model="data.name"
- type="text"
- @click.stop
- @blur="roleSave(data)"
- @keyup.enter="roleSave(data)"
- >
-
- <span v-if="!data.isEdit&&data.identifying!=='0'&&data.identifying!=='1'">
- <i
- v-if="data.code!=='000'"
- class="el-icon-edit"
- style="margin-right:10px;color: #999"
- @click.stop="val=>roleEditClick(val,node,data)"
- />
- <i
- v-if="data.code!=='000'"
- class="el-icon-delete"
- style="margin-right: 4px;color: #999"
- @click.stop="val=>roleDeleteClick(val,node,data)"
- />
- </span>
- </span>
- </el-tree>
+ />
+ <!-- draggable-->
+ <!-- :allow-drop="treeLeftAllowDrop"-->
</div>
<div
- style="margin-left: 10px;width:100%;position: relative"
+ style="margin-left: 10px;width: calc(100% - 300px);position: relative"
>
<el-button
@@ -81,10 +53,9 @@
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="PC绔�" name="PC">
<div style="display: flex;">
-
<div
ref="scrollLeft"
- style="border-right: 1px solid rgba(0,0,0,0.2);width: 200px;
+ style="border-right: 1px solid rgba(0,0,0,0.2);width: 220px;
overflow-y: auto;overflow-x:hidden;"
:style="{height:(tableHeight-40)+'px'}"
@scroll="scrollLeftScroll()"
@@ -108,10 +79,9 @@
@node-click="getLeftTreeNode"
/>
</div>
-
<div
ref="scrollCenter"
- style="border-right: 1px solid rgba(0,0,0,0.2);width: 660px;padding-left: 10px;overflow-y: auto"
+ style="width: 660px;padding-left: 10px;overflow-y: auto"
:style="{height:(tableHeight-40)+'px'}"
@scroll="scrollCenterScroll()"
@mouseover="isScroll='center'"
@@ -123,7 +93,7 @@
<el-checkbox
v-model="buttonIsChecked"
style="height: 26px;display:flex;align-items: center;margin-top:10px;width:200px"
- @change="val=>handleCheckAllChange(val,'button')"
+ @change=" handleCheckAllChange "
>鍏ㄩ��
</el-checkbox>
@@ -141,7 +111,7 @@
:key="it.menucode"
v-model="it.buttonChecked"
style="margin-left: 40px;height:26px;display: flex;"
- @change="val=>handleCheckedButtonChange(val,index,it.menucode,it.buttonChecked)"
+ @change="val=>handleCheckedButtonChange(val,it.menucode,it.buttonChecked)"
>
<el-checkbox
@@ -157,56 +127,9 @@
</div>
</div>
-
- <div
- ref="scrollRight"
- style="width: 360px;padding-left: 10px;overflow-y: auto"
- :style="{height:(tableHeight-40)+'px',}"
- @scroll="scrollRightScroll()"
- @mouseover="isScroll='right'"
- >
- <div style=" ">
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 鏁版嵁鏉冮檺
- </div>
-
- <el-checkbox
- v-model="dataIsChecked"
- style="height: 26px;display:flex;align-items: center;margin-top:10px;width:200px"
- @change="val=>handleCheckAllChange(val,'data')"
- >鍏ㄩ��
- </el-checkbox>
-
- <div v-if="treeCenter.length>0">
- <div v-for="item in treeCenter[0].children" :key="item.menucode">
- <div
- v-if="!item.datacodelist"
- style="margin-left: 40px;height:26px;display: flex;"
- />
-
- <el-radio-group
- v-for="it in item.children"
- v-if="item.expanded"
- :key="it.menucode"
- v-model="it.dataChecked"
- style="margin-left: 40px;height:26px;display: flex"
- @change="val=>handleCheckedDataChange(val,it.menucode)"
- >
- <el-radio
- v-for="i in it.datacodelist"
- :key="i"
- style="display:flex;align-items: center"
- :label="i"
- />
- </el-radio-group>
- </div>
-
- </div>
-
- </div>
-
</div>
</el-tab-pane>
- <el-tab-pane label="APP绔�" name="APP">澶уぇ</el-tab-pane>
+ <el-tab-pane label="APP绔�" name="APP">APP绔�</el-tab-pane>
<el-tab-pane label="宸ユ帶绔�" name="宸ユ帶绔�">宸ユ帶绔�</el-tab-pane>
</el-tabs>
@@ -222,15 +145,12 @@
<script>
import waves from '@/directive/waves'
import {
- RoleAddUpdateSava, RoleDeleteSava,
RolePermissionSava,
RolePermissionSearchRole,
RolePermissionSearchRoleMenu,
RolePermissionSearchRoleMenuButton
} from '@/api/basicSettings'
import arrayToTree from 'array-to-tree'
-import { throttle } from '@/utils/debounceAndThrottle'
-import { DataPermissions } from '@/api/GeneralBasicData'
export default {
name: 'RoleList',
@@ -253,30 +173,13 @@
activeName: 'PC',
buttonIsChecked: false,
- dataIsChecked: false,
menuCheckedCodeArr: [], // 鑿滃崟鏉冮檺鏁扮粍閫変腑鐨�
allButtonData: [], // 鎵�鏈夎彍鍗曞搴旂殑鎸夐挳鏉冮檺鍔犳暟鎹潈闄�
- isScroll: 'left',
+ isScroll: 'left'
- dataKeyValue: []// 鏁版嵁鏉冮檺閿�煎
-
- }
- },
- watch: {
- treeLeft: {
- handler(newValue, oldValue) {
- newValue[0].roles.forEach(i => {
- if (i.isEdit) {
- this.$nextTick(() => {
- this.$refs[i.code].focus()
- })
- }
- })
- },
- deep: true
}
},
@@ -293,28 +196,19 @@
// 鑾峰彇瑙掕壊鏉冮檺鏌ヨ瑙掕壊
async getRolePermissionSearchRole() {
const { data: res } = await RolePermissionSearchRole()
- res[0].roles.forEach(i => {
- i.isEdit = false
- })
-
this.treeLeft = res
if (res && res.length > 0) {
this.$nextTick(() => { // 榛樿閫変腑绗竴涓�
- this.$refs.treeLeftRef.setCurrentKey(res[0].roles[0].code) // 榛樿閫変腑鑺傜偣绗竴涓�
+ this.$refs.treeLeftRef.setCurrentKey(res[0].code) // 榛樿閫変腑鑺傜偣绗竴涓�
})
- await this.getDataPermissions()// 鑾峰彇鏁版嵁鏉冮檺閿�煎
- await this.getRolePermissionSearchRoleMenuButton(res[0].roles[0].code)// 鐢ㄤ簬鏁版嵁鍥炴樉
+ await this.getRolePermissionSearchRoleMenuButton(res[0].code)// 鐢ㄤ簬鏁版嵁鍥炴樉
- await this.getRolePermissionSearchRoleMenu(res[0].roles[0].code)// 鐢ㄤ簬娓叉煋椤甸潰
+ await this.getRolePermissionSearchRoleMenu(res[0].code)// 鐢ㄤ簬娓叉煋椤甸潰
} else {
this.$notify.error('璇峰厛寤虹浉瀵瑰簲鐨勮鑹诧紒')
}
- },
- async getDataPermissions() {
- const { data: res } = await DataPermissions()
- this.dataKeyValue = res
},
// 鑾峰彇鑿滃崟鏉冮檺瀵瑰簲鐨勬寜閽�
@@ -348,13 +242,6 @@
it.buttoncodelist = it.buttoncodelist.map(j => j.buttonname)
}
-
- it.datacodelist = it.datacodelist ? it.datacodelist.split(',') : []
- if (it.datacodelist && it.datacodelist.length > 0) {
- it.datacodelist = this.dataKeyValue.filter(j =>
- it.datacodelist.includes(j.datacode)
- ).map(j => j.dataname)
- }
})
item.expanded = true
@@ -381,15 +268,11 @@
it.buttonChecked.push(j.buttonname)
}
})
-
- const datacode = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].datacode : ''
- it.dataChecked = datacode ? this.dataKeyValue.find(j => j.datacode === datacode).dataname : '' // 鏁版嵁鍥炴樉
})
}
})
- this.handleCheckedButtonChange('', '', '', '', true)
- this.handleCheckedDataChange('', '', true)
+ this.handleCheckedButtonChange('', '', '', true)
// this.$forceUpdate()
},
@@ -397,25 +280,17 @@
scrollLeftScroll() {
if (this.isScroll === 'left') {
this.$refs.scrollCenter.scrollTop = this.$refs.scrollLeft.scrollTop
- this.$refs.scrollRight.scrollTop = this.$refs.scrollLeft.scrollTop
}
},
// 涓棿杈规粴鍔ㄦ潯婊戝姩鏃�
scrollCenterScroll() {
if (this.isScroll === 'center') {
this.$refs.scrollLeft.scrollTop = this.$refs.scrollCenter.scrollTop
- this.$refs.scrollRight.scrollTop = this.$refs.scrollCenter.scrollTop
}
},
- // 鍙充晶婊氬姩鏉℃粦鍔ㄦ椂
- scrollRightScroll() {
- if (this.isScroll === 'right') {
- this.$refs.scrollLeft.scrollTop = this.$refs.scrollRight.scrollTop
- this.$refs.scrollCenter.scrollTop = this.$refs.scrollRight.scrollTop
- }
- },
+
// 鍏ㄩ�夋敼鍙�
- handleCheckAllChange(val, belong) {
+ handleCheckAllChange(val) {
const checkedKeys = this.$refs.treeCenterRef.getCheckedKeys()
if (val) {
@@ -423,12 +298,7 @@
if (item.children && item.children.length) {
item.children.forEach(it => {
if (checkedKeys.includes(it.menucode)) {
- if (belong === 'button') {
- it.buttonChecked = it.buttoncodelist
- }
- if (belong === 'data') {
- it.dataChecked = '鍏ㄩ儴'
- }
+ it.buttonChecked = it.buttoncodelist
}
})
}
@@ -438,12 +308,7 @@
if (item.children && item.children.length) {
item.children.forEach(it => {
if (checkedKeys.includes(it.menucode)) {
- if (belong === 'button') {
- it.buttonChecked = []
- }
- if (belong === 'data') {
- it.dataChecked = ''
- }
+ it.buttonChecked = []
}
})
}
@@ -451,17 +316,14 @@
}
},
// 鍗曚釜鎸夐挳鏀瑰彉
- handleCheckedButtonChange(oldValue, index, code, newValue, flag) {
- // console.log(oldValue, index, code, newValue, 2)
+ handleCheckedButtonChange(oldValue, code, newValue, flag) {
+ // console.log(oldValue, code, newValue, 2)
// 鍒ゆ柇鏄惁鍖呭惈鍦ㄥ唴
if (!flag) {
if (!this.menuCheckedCodeArr.includes(code) && oldValue.length === 0 && newValue.length === 1) { // 鍚�
this.menuCheckedCodeArr.push(code)
} else if (this.menuCheckedCodeArr.includes(code) && oldValue.length === 1 && newValue.length === 0) { // 鏄�
- // 褰撴暟鎹潈闄愭湭鍕鹃�夋椂鍒欒繃婊ゆ帀鐩稿搴旂殑鑿滃崟
- if (this.treeCenter[0].children[index].children.find(i => i.menucode === code).dataChecked.toString().length < 1) {
- this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== code)
- }
+ this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== code)
}
this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
}
@@ -504,7 +366,6 @@
if (checkedKeys.length === 0) { // 鏍戝舰鑿滃崟鍏ㄤ笉閫夌殑鎯呭喌涓�
this.buttonIsChecked = false
- this.dataIsChecked = false
this.menuCheckedCodeArr = []
} else {
if (checkedKeys.includes(obj.menucode)) { // 鍒ゆ柇鏄惁鍖呭惈鍦ㄥ唴 //鏄�
@@ -520,7 +381,6 @@
if (!selfChildrenTreeCheck) {
if (!selfChecked) { // 浠庨�変腑鍒颁笉閫変腑
obj.buttonChecked = []
- obj.dataChecked = ''
this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== obj.menucode)
}
if (selfChecked) { // 浠庝笉閫変腑鍒伴�変腑
@@ -539,112 +399,23 @@
this.$forceUpdate()
}
},
- // 鍗曢�夋鎸夐挳鏀瑰彉
- handleCheckedDataChange(value, code, flag) {
- // console.log(value, code)
- if (!flag) {
- this.menuCheckedCodeArr.push(code)
- this.menuCheckedCodeArr = [...new Set(this.menuCheckedCodeArr)]
- this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
- }
- // 杩欓噷鏄垽鏂叏閫塺adio 鏄惁閫変腑
- let count = 0
- let childrenLength = 0
- this.treeCenter[0].children.forEach(item => {
- if (item.children && item.children.length) {
- item.children.forEach(it => {
- if (it.dataChecked.length > 0 && it.datacodelist.length > 0) {
- count++
- }
- // console.log(it.dataChecked, 234)
- if (it.datacodelist.length > 0) {
- childrenLength++
- }
- })
- }
- })
- // console.log(count, childrenLength, 123)
- this.dataIsChecked = count === childrenLength
- this.$forceUpdate()
- },
// 瑙掕壊鍒囨崲
async treeLeftNodeClick(obj, Node, VueComponent) {
if (obj.code !== '000') {
await this.getRolePermissionSearchRoleMenuButton(obj.code)
- // await this.getRolePermissionSearchRoleMenu(obj.code)
this.handleData()
}
},
- // 瑙掕壊鍚嶇О鏂板
- rolePlusClick() {
- this.treeLeft[0].roles.push({ code: '', name: '', isEdit: true })
- },
- // 瑙掕壊鍚嶇О淇敼
- roleEditClick(self, node, data) {
- // console.log(self, node, data)
- this.treeLeft[0].roles.forEach(i => {
- i.isEdit = false
- })
- data.isEdit = !data.isEdit
- },
- // 瑙掕壊鍚嶇О鍒犻櫎
- roleDeleteClick(self, node, data) {
- // console.log(self, node, data)
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- const D = {
- rolecode: data.code,
- rolename: data.name,
- type: this.activeName
- }
- RoleDeleteSava(D).then(res => {
- if (res.code === '200') {
- this.$notify.success('瑙掕壊鍒犻櫎鎴愬姛锛�')
- }
- this.getRolePermissionSearchRole()
- })
- }).catch(() => {
- this.$notify.info('宸插彇娑堝垹闄�')
- })
- },
- // 瑙掕壊鍚嶇О淇濆瓨 閲囩敤闃叉姈褰㈠紡
- roleSave: throttle(function(val) {
- val.isEdit = false
-
- if (val.name.trim().length === 0) {
- this.getRolePermissionSearchRole()
- return this.$notify.info('鏃犳晥淇濆瓨锛�')
- }
-
- const data = {
- rolecode: val.code,
- rolename: val.name,
- type: val.code === '' ? 'Add' : 'Update'
- }
- console.log(data, '鎵ц浜嗭紒')
- RoleAddUpdateSava(data).then(res => {
- if (res.code === '200') {
- this.$notify.success(val.code === '' ? '瑙掕壊鏂板鎴愬姛锛�' : '瑙掕壊淇敼鎴愬姛锛�')
- }
- })
- this.getRolePermissionSearchRole()
- }, 1000, true),
-
// 椤甸潰鍕鹃�夊ソ淇濆瓨浜嬩欢
async saveClick() {
+ const rolecode = this.$refs.treeLeftRef.getCurrentKey()
+ const datacode = this.treeLeft.find(i => i.code === rolecode).datarange !== 'CUSTOM' ? this.treeLeft.find(i => i.code === rolecode).datarange : this.treeLeft.find(i => i.code === rolecode).datapermissions
const menuKeyArr = this.$refs.treeCenterRef.getCheckedKeys()
const arr = []
this.treeCenter[0].children.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach(it => {
if (menuKeyArr.includes(it.menucode)) {
- if (it.buttoncodelist.length > 0 && it.buttoncodelist && it.dataChecked && it.dataChecked.toString().length > 0) { // 鏁版嵁鏉冮檺宸插嬀閫�
- it.dataCheckedCode = this.dataKeyValue.find(i => i.dataname === it.dataChecked).datacode
- }
-
if (it.buttonChecked && it.buttonChecked.length > 0) { // 宸查�夎彍鍗�
it.buttonCheckedCode = this.$ButtonData.filter(i =>
it.buttonChecked.includes(i.buttonname)
@@ -652,18 +423,16 @@
}
arr.push({
menucode: it.menucode,
- datacode: it.dataCheckedCode !== undefined ? it.dataCheckedCode : '',
+ datacode,
buttoncode: it.buttonCheckedCode ? it.buttonCheckedCode.join(',') : ''
})
}
})
}
})
-
- const rolecode = this.$refs.treeLeftRef.getCurrentKey()
const res = await RolePermissionSava(JSON.stringify(arr), rolecode, this.activeName)
if (res.code === '200') {
- const rolename = this.treeLeft[0].roles.find(i => i.code === rolecode).name
+ const rolename = this.treeLeft.find(i => i.code === rolecode).name
this.$notify.success(rolename + '鐨勮鑹叉潈闄愭彁浜ゆ垚鍔燂紒')
await this.getRolePermissionSearchRoleMenuButton(rolecode)
}
@@ -691,20 +460,7 @@
</script>
<style scoped lang="scss">
-.custom-tree-node {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-size: 14px;
- padding-right: 8px;
-}
-
::v-deep .el-checkbox__label {
width: 55px;
-}
-
-.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
- color: #000 !important;
}
</style>
diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index 61812af..4548745 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -178,9 +178,9 @@
>
<el-option
v-for="item in datacodeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ :key="item.datacode"
+ :label="item.dataname"
+ :value="item.datacode"
/>
</el-select>
</el-form-item>
@@ -245,7 +245,7 @@
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
-import { PrentOrganization } from '@/api/GeneralBasicData'
+import { DataPermissions, PrentOrganization } from '@/api/GeneralBasicData'
import arrayToTree from 'array-to-tree'
export default {
@@ -277,12 +277,7 @@
datapermissions: '', // 鏁版嵁鏉冮檺
status: 'Y'// 鐘舵��
},
- datacodeArr: [
- { code: 'ALL', name: '鍏ㄩ儴' },
- { code: 'CUSTOM', name: '鑷畾涔�' },
- { code: 'LEVEL', name: '鏈骇' },
- { code: 'PERSON', name: '鏈汉' }
- ],
+ datacodeArr: [],
checkboxGroupSelected: ['灞曞紑/鎶樺彔', '鐖跺瓙鑱斿姩'],
checkboxGroup: ['灞曞紑/鎶樺彔', '鍏ㄩ��/鍏ㄤ笉閫�', '鐖跺瓙鑱斿姩'],
operation: '',
@@ -310,6 +305,7 @@
this.getHeight()
this.getPrentOrganization()
+ this.getDataPermissions()
},
methods: {
async getRoleData() {
@@ -317,6 +313,10 @@
this.tableData = res.data
this.total = res.count
},
+ async getDataPermissions() {
+ const { data: res } = await DataPermissions()
+ this.datacodeArr = res
+ },
// 缁勭粐鏋舵瀯绾ц仈閫夋嫨鍣�
async getPrentOrganization() {
const { data: res } = await PrentOrganization()
--
Gitblit v1.9.3