Merge branch 'all-v4-liufei' into 'all-v4'

1. 更新前端路由表 2. 菜单权限分配”系统管理“可见 3. 主控台路由链接更新

See merge request skyeye/skyeye_frontend/skyeye-admin!229

src/api/camera/camera-preview.ts

@@ -35,7 +35,7 @@ export interface CameraQueryForm {
 /** 获取摄像头所在的树状结构 */
 export const getCameraTree = (param?: CameraQueryForm) => {
   return http.request<CameraTree[]>({
-    url: '/cameraPreview/queryCameraListByCondition',
+    url: '/admin/cameraPreview/queryCameraTreeByCondition',
     method: 'post',
     data: param,
   });
@@ -92,7 +92,7 @@ export interface AlgoItem {
 /** 查询所有的算法 */
 export const getAllAlgosApi = () => {
   return http.request<AlgoItem[]>({
-    url: '/cameraPreview/getAlgoList',
+    url: '/admin/algo/queryAlgoInfo',
     method: 'get',
   });
 };

src/router/full-routes.ts

@@ -130,20 +130,20 @@ const fullRoutes: AppRouteRecordRaw[] = [
         // 公司场景布局入口页，选择PC端还是手机端
         path: 'scene',
         name: 'LayoutScene',
-        component: '/page-config/PageConfig',
+        component: '/page-config/PageScene',
         meta: { 
           icon: '',
           title: '场景布局', 
         },
       },
       {
-        // 公司场景布局卡片列表 
+        // 公司场景布局卡片列表。菜单不可见
         path: 'scene-list',
         name: 'LayoutSceneList',
-        component: '/page-config/PageSceneLayout',
+        component: '/page-config/PageSceneList',
         meta: {
           icon: '',
-          title: '场景布局列表'
+          title: '场景布局列表(菜单不可见)'
         }
       },
       {
@@ -157,14 +157,34 @@ const fullRoutes: AppRouteRecordRaw[] = [
         }
       },
       {
-        // 相机布局
+        // 相机布局入口页，选择PC端还是手机端
         path: 'camera',
         name: 'LayoutCamera',
-        component: '/map-config/mini-map/MiniMapConfig',
+        component: '/page-config/PageCamera',
         meta: { 
           icon: '',
           title: '相机布局',
         }
+      },
+      {
+        // 相机布局卡片列表。 菜单不可见
+        path: 'camera-list',
+        name: 'LayoutCameraList',
+        component: '/page-config/PageCameraList',
+        meta: { 
+          icon: '',
+          title: '相机布局列表(菜单不可见)',
+        }
+      },
+      {
+        // 相机布局配置
+        path: 'camera-config',
+        name: 'LayoutCameraConfig',
+        component: '/map-config/mini-map/MiniMapConfig',
+        meta: { 
+          icon: '',
+          title: '相机布局配置(菜单不可见)',
+        }
       }
     ]
   },
@@ -547,12 +567,6 @@ const fullRoutes: AppRouteRecordRaw[] = [
 ] as const;
 
 
-/**
- * 仅超级管可见的路由。 一级路由 name
- */
-export const ROUTE_ONLY_TO_SUPER_ADMIN: string[] = ['System', 'Exception'];
-
-
 /**
  * 类型定义。避免与已有的定义冲突，避免与 vue-router的类型定义冲突，前面加 _ 前缀
  */

src/store/modules/user.ts

@@ -142,9 +142,15 @@ export const useUserStore = defineStore({
       return Promise.resolve('');
     },
 
+    /**
+     * 用户是否有某个权限
+     * @param permission 
+     * @returns 
+     */
     checkPermission(permission: string) {
-      return this.permissions.find((x) => x.value === permission);
+      return this.permissions.find((x) => x.code === permission);
     },
+    
   },
 });
 

src/views/dashboard/home/components/QuickAction.vue

@@ -27,10 +27,10 @@
   const quickList = ref([
     // { name: '相机配置', img: CameraConfig, address: '/cameras/overview' },
     // { name: '相机回放', img: CameraPlayback, address: '' },
-    { name: '相机预览', img: CameraPreview, address: '/cameras/preview' },
+    { name: '相机预览', img: CameraPreview, address: '/algorithm/config' },
     // { name: '算法管理', img: AlgoManage, address: '/cameras/algo-manager' },
-    { name: '用户管理', img: UserManage, address: '/auth/user' },
-    { name: '组织管理', img: OrgaManage, address: '/auth/dept' },
+    { name: '用户管理', img: UserManage, address: '/user/account' },
+    { name: '组织管理', img: OrgaManage, address: '/user/department' },
   ]);
 
   const goPage = (address) => {

src/views/system/permission/PagePermission.vue

@@ -193,6 +193,7 @@ import { ElMessage } from 'element-plus';
     isEditing.value = false;
     treeItemTitle.value = '';
     selectedPermissionId.value = null;
+    expandedKeys.value = [];
   }
 
   /**

src/views/system/role/hooks/useMenuPermissionTree.ts

@@ -2,14 +2,11 @@ import { shallowRef, onMounted } from 'vue';
 import { queryOwnedMenuTree } from "@/api/system/menu";
 import { PermissionViewTree } from "@/types/permission/type";
 import { transformToViewTree } from '../utils/tree';
-import { ROUTE_ONLY_TO_SUPER_ADMIN} from '@/router/full-routes';
 export default function useMenuPermissionTree() {
   const menuPermTreeData = shallowRef<PermissionViewTree>([]);
   const buildPermissionTree = async () => {
     try {
       let result = await queryOwnedMenuTree();
-      // 去除仅超管可见的一级菜单，其不可在菜单权限分配中可见
-      result = result.filter(item => !ROUTE_ONLY_TO_SUPER_ADMIN.includes(item.routeName));
       menuPermTreeData.value = transformToViewTree(result, 'menuName', 'id');
     } catch (e) {
       console.error(e);