odjbin/SmartOpsWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master' (#208) from master into test

Browse Source 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/208
This commit is contained in:
odjbin
2024-11-30 07:09:01 +00:00
parent a3ee331462 839e6fcb0c
commit 39d8d0d2ac
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/stores/permisstion.js
View File

@@ -35,14 +35,14 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
const sRouter = JSON.parse(JSON.stringify(res.data)) const sRouter = JSON.parse(JSON.stringify(res.data))
const mData = JSON.parse(JSON.stringify(res.data)) const mData = JSON.parse(JSON.stringify(res.data))
asyncRouters.value = formatAsyncRouters(sRouter) asyncRouters.value = formatAsyncRouters(sRouter)
let role = await getUser() // let role = await getUser()
if(role){ // if(role){
generateMenu(mData).map(item => { // generateMenu(mData).map(item => {
if (item.path == '/voice/management') { // if (item.path == '/voice/management') {
item.children = item.children.filter(item => item.name !== "Speech") // item.children = item.children.filter(item => item.name !== "Speech")
} // }
}) // })
} // }
menuList.value = [...menuList.value, ...generateMenu(mData)] menuList.value = [...menuList.value, ...generateMenu(mData)]
addAsyncRouters(asyncRouters.value) addAsyncRouters(asyncRouters.value)
isLoadRoutes.value = false isLoadRoutes.value = false

6
src/views/system/role/index.vue
View File

@@ -147,7 +147,7 @@
:props="treeProps" :props="treeProps"
node-key="menuId" node-key="menuId"
ref="tree" ref="tree"
:check-strictly="checkStrictly" :check-strictly="true"
show-checkbox show-checkbox
@check-change="handleCheckChange" @check-change="handleCheckChange"
/> />
@@ -209,7 +209,7 @@ const rules = reactive({
{required: true, message: '请选择显示顺序', trigger: 'blur'}, {required: true, message: '请选择显示顺序', trigger: 'blur'},
] ]
}) })
const checkList = ref(['3']) const checkList = ref([])
const treeProps = { const treeProps = {
value: "menuId", value: "menuId",
label: 'menuName', label: 'menuName',
@@ -372,7 +372,7 @@ const getMenu = async () => {
//多选框事件 //多选框事件
const changeCheckbox = (checked) => { const changeCheckbox = (checked) => {
//父子联动 //父子联动
checkStrictly.value = checked.indexOf("3") === -1; // checkStrictly.value = checked.indexOf("3") === -1;
let nodes = tree.value.store.nodesMap; let nodes = tree.value.store.nodesMap;
console.log('checked',checked) console.log('checked',checked)
//展开/折叠 //展开/折叠