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

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/208

src/stores/permisstion.js

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

src/views/system/role/index.vue

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