From b6c6217cda7658912e58c2e7813f2f86f1c769df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com>
Date: Sat, 4 Sep 2021 16:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dvite=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/chooseImg/index.vue             |  2 +-
 web/src/components/dashbordCharts/echartsLine.vue  |  2 +-
 web/src/utils/asyncRouter.js                       |  7 +++----
 web/src/view/example/upload/upload.vue             |  2 +-
 web/src/view/layout/aside/asideComponent/index.vue |  4 ++--
 web/src/view/layout/aside/index.vue                |  2 +-
 web/src/view/layout/index.vue                      | 14 +++++++-------
 web/src/view/person/person.vue                     |  4 ++--
 web/src/view/superAdmin/authority/authority.vue    |  6 +++---
 web/src/view/superAdmin/menu/menu.vue              |  2 +-
 web/src/view/superAdmin/user/user.vue              |  4 ++--
 11 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/web/src/components/chooseImg/index.vue b/web/src/components/chooseImg/index.vue
index b4075df7..bb57996f 100644
--- a/web/src/components/chooseImg/index.vue
+++ b/web/src/components/chooseImg/index.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-const path = import.meta.env.VITE_BASE_API
+const path = process.env.VUE_APP_BASE_API
 import { getFileList } from '@/api/fileUploadAndDownload'
 export default {
   props: {
diff --git a/web/src/components/dashbordCharts/echartsLine.vue b/web/src/components/dashbordCharts/echartsLine.vue
index e3511a3e..cc35da4a 100644
--- a/web/src/components/dashbordCharts/echartsLine.vue
+++ b/web/src/components/dashbordCharts/echartsLine.vue
@@ -9,7 +9,7 @@
 </template>
 <script>
 import echarts from 'echarts'
-require('echarts/theme/macarons')
+import 'echarts/theme/macarons'
 
 var dataAxis = []
 for (var i = 1; i < 21; i++) {
diff --git a/web/src/utils/asyncRouter.js b/web/src/utils/asyncRouter.js
index 923aea65..c2def1db 100644
--- a/web/src/utils/asyncRouter.js
+++ b/web/src/utils/asyncRouter.js
@@ -1,4 +1,4 @@
-const modules = import.meta.glob('../../view/**/*.vue')
+const modules = import.meta.glob('../view/**/*.vue')
 
 export const asyncRouterHandle = (asyncRouter) => {
   asyncRouter.map(item => {
@@ -20,11 +20,10 @@ function dynamicImport(
 ) {
   const keys = Object.keys(dynamicViewsModules)
   const matchKeys = keys.filter((key) => {
-    let k = key.replace('../../view', '')
-    const lastIndex = k.lastIndexOf('.')
-    k = k.substring(0, lastIndex)
+    const k = key.replace('../', '')
     return k === component
   })
   const matchKey = matchKeys[0]
+
   return dynamicViewsModules[matchKey]
 }
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index be2f9eaa..5aa89bca 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -72,7 +72,7 @@ import { mapGetters } from 'vuex'
 import infoList from '@/mixins/infoList'
 import { getFileList, deleteFile } from '@/api/fileUploadAndDownload'
 import { downloadImage } from '@/utils/downloadImg'
-import CustomPic from '@/components/customPic'
+import CustomPic from '@/components/customPic/index.vue'
 import UploadImage from '@/components/upload/image.vue'
 export default {
   name: 'Upload',
diff --git a/web/src/view/layout/aside/asideComponent/index.vue b/web/src/view/layout/aside/asideComponent/index.vue
index 98be93f5..03e50582 100644
--- a/web/src/view/layout/aside/asideComponent/index.vue
+++ b/web/src/view/layout/aside/asideComponent/index.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-import MenuItem from './menuItem'
-import AsyncSubmenu from './asyncSubmenu'
+import MenuItem from './menuItem.vue'
+import AsyncSubmenu from './asyncSubmenu.vue'
 
 export default {
   name: 'AsideComponent',
diff --git a/web/src/view/layout/aside/index.vue b/web/src/view/layout/aside/index.vue
index a0dad43f..d12a843e 100644
--- a/web/src/view/layout/aside/index.vue
+++ b/web/src/view/layout/aside/index.vue
@@ -24,7 +24,7 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import AsideComponent from '@/view/layout/aside/asideComponent'
+import AsideComponent from '@/view/layout/aside/asideComponent/index.vue'
 import { emitter } from '@/utils/bus.js'
 
 export default {
diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
index fa3c75f9..1a762a3d 100644
--- a/web/src/view/layout/index.vue
+++ b/web/src/view/layout/index.vue
@@ -100,14 +100,14 @@
 </template>
 
 <script>
-import Aside from '@/view/layout/aside'
-import HistoryComponent from '@/view/layout/aside/historyComponent/history'
-import Screenfull from '@/view/layout/screenfull'
-import Search from '@/view/layout/search/search'
-import BottomInfo from '@/view/layout/bottomInfo/bottomInfo'
+import Aside from '@/view/layout/aside/index.vue'
+import HistoryComponent from '@/view/layout/aside/historyComponent/history.vue'
+import Screenfull from '@/view/layout/screenfull/index.vue'
+import Search from '@/view/layout/search/search.vue'
+import BottomInfo from '@/view/layout/bottomInfo/bottomInfo.vue'
 import { mapGetters, mapActions } from 'vuex'
-import CustomPic from '@/components/customPic'
-import Setting from './setting'
+import CustomPic from '@/components/customPic/index.vue'
+import Setting from './setting/index.vue'
 import { setUserAuthority } from '@/api/user'
 import { emitter } from '@/utils/bus.js'
 export default {
diff --git a/web/src/view/person/person.vue b/web/src/view/person/person.vue
index b14b002d..e567ea6e 100644
--- a/web/src/view/person/person.vue
+++ b/web/src/view/person/person.vue
@@ -102,8 +102,8 @@
 </template>
 
 <script>
-import ChooseImg from '@/components/chooseImg'
-import { setUserInfo, changePassword } from '@/api/user'
+import ChooseImg from '@/components/chooseImg/index.vue'
+import { setUserInfo, changePassword } from '@/api/user.js'
 
 import { mapGetters, mapMutations } from 'vuex'
 const path = import.meta.env.VITE_BASE_API
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index 6586bd9d..8e61de35 100644
--- a/web/src/view/superAdmin/authority/authority.vue
+++ b/web/src/view/superAdmin/authority/authority.vue
@@ -99,9 +99,9 @@ import {
   copyAuthority
 } from '@/api/authority'
 
-import Menus from '@/view/superAdmin/authority/components/menus'
-import Apis from '@/view/superAdmin/authority/components/apis'
-import Datas from '@/view/superAdmin/authority/components/datas'
+import Menus from '@/view/superAdmin/authority/components/menus.vue'
+import Apis from '@/view/superAdmin/authority/components/apis.vue'
+import Datas from '@/view/superAdmin/authority/components/datas.vue'
 
 import infoList from '@/mixins/infoList'
 export default {
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index 35f97e3b..b6a74782 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -193,7 +193,7 @@ import {
   getBaseMenuById
 } from '@/api/menu'
 import infoList from '@/mixins/infoList'
-import icon from '@/view/superAdmin/menu/icon'
+import icon from '@/view/superAdmin/menu/icon.vue'
 export default {
   name: 'Menus',
   components: {
diff --git a/web/src/view/superAdmin/user/user.vue b/web/src/view/superAdmin/user/user.vue
index e7cb34bf..5ac6c90b 100644
--- a/web/src/view/superAdmin/user/user.vue
+++ b/web/src/view/superAdmin/user/user.vue
@@ -106,8 +106,8 @@ import {
 import { getAuthorityList } from '@/api/authority'
 import infoList from '@/mixins/infoList'
 import { mapGetters } from 'vuex'
-import CustomPic from '@/components/customPic'
-import ChooseImg from '@/components/chooseImg'
+import CustomPic from '@/components/customPic/index.vue'
+import ChooseImg from '@/components/chooseImg/index.vue'
 export default {
   name: 'Api',
   components: { CustomPic, ChooseImg },