Browse Source

logo配置修改

tongshangming 11 months ago
parent
commit
c6aaa3b9c7

+ 4 - 4
.env.development

@@ -1,4 +1,4 @@
-NODE_ENV = 'development'
-
-VITE_BASE_API = /mbwb/api
-VITE_BASE_PATH = http://10.0.0.154:30701
+NODE_ENV = 'development'
+
+VITE_BASE_API = /admin
+VITE_BASE_PATH = http://10.0.0.154:30701

+ 4 - 4
.env.production

@@ -1,4 +1,4 @@
-NODE_ENV = 'production'
-
-VITE_BASE_API = /apiSys
-VITE_BASE_PATH = 
+NODE_ENV = 'production'
+
+VITE_BASE_API = /admin
+VITE_BASE_PATH = 

+ 1 - 1
src/api/user.ts

@@ -35,5 +35,5 @@ export function checkLoginName(data: any) {
 
 // 获取用户菜单列表
 export function getMenuList(data?: any) {
-  return request.get('/sys/user/menu', data)
+  return request.get('/sys/menu/treeData', data)
 }

+ 1 - 1
src/components/core/GlobalAside.vue

@@ -34,7 +34,7 @@ const logoStyle = computed(() => {
     :style="logoStyle"
     @click="handleLogoClick"
   >
-    <img :src="config.logo" class="h-36px" />
+    <img src="/logo.png" class="h-36px" />
     <div class="ml-2 line2" :class="{ hidden: collapse }">{{ config.title }}</div>
   </div>
   <global-menu />

+ 0 - 1
src/config/defaultSetting.ts

@@ -1,6 +1,5 @@
 export default {
   title: '方是科技管理系统',
-  logo: '/logo.png',
   homeRouteName: 'home',
   themeColor: '#1890ff',
   themeStyle: 'nav-light', // nav-dark  nav-light  header-dark

+ 6 - 2
src/utils/dynamicRouter.ts

@@ -3,7 +3,7 @@ const modules = import.meta.glob('../views/**/*.vue')
 const dynamicImport = (modules: any, component: string) => {
   const keys = Object.keys(modules)
   const matchKey = keys.find(key => {
-    const k = key.replace('../views/', '')
+    const k = '/' + key.replace('../views/', '')
     return k === component
   })
   return matchKey && modules[matchKey]
@@ -12,10 +12,14 @@ const dynamicImport = (modules: any, component: string) => {
 export const generatorDynamicRouter = (dynamicRouter: Array<any>) => {
   dynamicRouter.forEach((item: any) => {
     if (item.component) {
-      item.component = dynamicImport(modules, item.component)
+      item.component = dynamicImport(modules, item.component + '.vue')
     } else {
       delete item['component']
     }
+    if (item.name) {
+      item.meta = {}
+      item.meta.title = item.name
+    }
     if (item.children) {
       generatorDynamicRouter(item.children)
     }

+ 1 - 1
src/views/user/Login.vue

@@ -53,7 +53,7 @@ const handleSubmit = () => {
         @keyup.enter="handleSubmit"
       >
         <div class="flex items-center justify-center mb-50px">
-          <img :src="config.logo" alt="logo" class="w-60px mr-2" />
+          <img src="/logo.png" alt="logo" class="w-60px mr-2" />
           <h1>{{ config.title }}</h1>
         </div>
         <!-- <div class="text-24px mb-4">登录</div> -->