Sfoglia il codice sorgente

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao 3 anni fa
parent
commit
d235cd0c0f

+ 1 - 1
src/router/modules/app.center.ts

@@ -25,7 +25,7 @@ const routes: RouteRecordRaw[] = [
         },
       },
       {
-        path: 'app/permit/:id',
+        path: 'app/permit/:appId',
         name: 'appPermit',
         component: () => import('@/views/app_center/permit/index.vue'),
         meta: {

+ 1 - 1
src/views/app_center/app_store/index.vue

@@ -42,7 +42,7 @@ const onAppPermit = (data: any) => {
   tabbar.open({
     name: 'appPermit',
     params: {
-      id: data.appId,
+      appId: data.appId,
     },
   })
 }

+ 3 - 1
src/views/app_center/permit/components/Permit.vue

@@ -83,11 +83,13 @@ function resetFormData() {
 }
 
 defineExpose({
-  showAddModel() {
+  showAddModel(appId: undefined, roleId: undefined) {
     resetFormData()
     state.title = '新增'
     state.actionType = 1
     state.dialogVisible = true
+    state.formData.appId = appId
+    state.formData.roleId = roleId
   },
   showEditModel(appId: number, roleId: number, permitId: number) {
     resetFormData()

+ 9 - 8
src/views/app_center/permit/index.vue

@@ -11,6 +11,7 @@ import useSettingsStore from '@/store/modules/settings'
 
 const settingsStore = useSettingsStore()
 
+const route = useRoute()
 const router = useRouter()
 const tabbar = useTabbar()
 
@@ -54,7 +55,6 @@ const getRoleData = async () => {
   if (data && data.length > 0) {
     state.curRoleId = data[0].roleId
     await getPermitData()
-
     const children: TreeNode[] = []
     data.forEach((item: any) => {
       return children.push({
@@ -72,19 +72,20 @@ const getRoleData = async () => {
       },
     ]
   }
+  nextTick(() => {
+    roleTreeRef.value.setCurrentKey(data[0].roleId)
+  })
 }
 
-const onTreeNodeClick = (node: TreeNode) => {
-  if (node.isLeaf) {
-    state.curRoleId = node.roleId
-    getRoleData()
-  }
+const onTreeNodeClick = async (node: TreeNode) => {
+  state.curRoleId = node.roleId
+  await getPermitData()
 }
 const permitTableRef = ref()
 const permitRef = ref()
 
 const onPermitAdd = () => {
-  permitRef.value.showAddModel()
+  permitRef.value.showAddModel(route.params.appId, state.curRoleId)
 }
 // 返回列表页
 function goBack() {
@@ -139,7 +140,7 @@ onMounted(() => {
       <LayoutContainer hide-left-side-toggle>
         <template #leftSide>
           <el-scrollbar class="tree">
-            <ElTree ref="roleTreeRef" :data="state.roles" default-expand-all @node-click="onTreeNodeClick">
+            <ElTree ref="roleTreeRef" :data="state.roles" default-expand-all node-key="roleId" @node-click="onTreeNodeClick">
               <template #default="{ node, data }">
                 <div class="custom-tree-node">
                   <div class="label" :title="node.label">