优化完成设备管理和培训模块的加入到devlopment

src/apis/bussiness/bussiness.ts

@@ -44,17 +44,7 @@ export function getFilesApi(folderId: string) {
   })
 }
 
-// 获取文件夹列表
+
-export function getFolderListApi(params: { page: number; pageSize: number; folderName?: string }) {
-  return request<{
-    list: KnowledgeFolder[]
-    total: number
-  }>({
-    url: '/knowledge/folder-list',
-    method: 'get',
-    params,
-  })
-}
 
 // 创建文件夹
 export function createFolderApi(data: { name: string; parentId?: string }) {

src/layout/components/Menu/MenuItem.vue

@@ -11,8 +11,7 @@
     >
       <template #icon>
         <MenuIcon
-          :svg-icon="onlyOneChild?.meta?.svgIcon || item?.meta?.svgIcon"
+          :icon="onlyOneChild?.meta?.svgIcon || onlyOneChild?.meta?.icon || item?.meta?.svgIcon || item?.meta?.icon"
-          :icon="onlyOneChild?.meta?.icon || item?.meta?.icon"
         />
       </template>
       <a-tooltip :content="onlyOneChild?.meta?.title" position="right">
@@ -22,7 +21,7 @@
 
     <a-sub-menu v-else v-bind="attrs" :key="item.path" :title="item?.meta?.title">
       <template #icon>
-        <MenuIcon :icon="item?.meta?.icon" />
+        <MenuIcon :icon="item?.meta?.svgIcon || item?.meta?.icon" />
       </template>
       <MenuItem v-for="child in item.children" :key="child.path" :item="child"></MenuItem>
     </a-sub-menu>

src/types/auto-imports.d.ts

@@ -70,6 +70,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }