From a2187812970446b4773a3d96c69412f43b99da82 Mon Sep 17 00:00:00 2001 From: ZhouYi Date: Mon, 8 Jan 2024 14:24:17 +0800 Subject: [PATCH] modified theme , add animation --- ms-web/components.d.ts | 4 + ms-web/index.html | 3 + ms-web/mock/router/index.js | 4 +- ms-web/package.json | 3 + ms-web/src/config/appconfig.js | 73 --------- ms-web/src/config/index.ts | 1 + ms-web/src/config/map-sdk.ts | 10 ++ ms-web/src/icons/tick.svg | 1 + ms-web/src/layouts/Layout.vue | 2 - ms-web/src/layouts/MainView.vue | 35 +---- ms-web/src/layouts/setting/SystemSet.vue | 80 +++++++++- ms-web/src/main.ts | 1 + ms-web/src/store/modules/setting.ts | 1 + ms-web/src/styles/common.scss | 29 +--- ms-web/src/styles/global.scss | 28 ++++ ms-web/src/styles/index.ts | 2 + ms-web/src/styles/transition.scss | 82 ++++++++++ ms-web/src/typings/package.d.ts | 2 + ms-web/src/utils/gloComponents.ts | 2 - ms-web/src/views/Console.vue | 13 -- ms-web/src/views/HelloWorld.vue | 0 ms-web/src/views/SystemManage.vue | 13 -- ms-web/src/views/UserManage.vue | 13 -- .../exception/components/ExceptionStatus.vue | 143 +++++++++--------- ms-web/src/views/map/baidu-map.vue | 34 +++++ ms-web/src/views/map/gaode-map.vue | 33 ++++ 26 files changed, 368 insertions(+), 244 deletions(-) delete mode 100644 ms-web/src/config/appconfig.js create mode 100644 ms-web/src/config/index.ts create mode 100644 ms-web/src/config/map-sdk.ts create mode 100644 ms-web/src/icons/tick.svg create mode 100644 ms-web/src/styles/global.scss create mode 100644 ms-web/src/styles/transition.scss create mode 100644 ms-web/src/typings/package.d.ts delete mode 100644 ms-web/src/views/Console.vue delete mode 100644 ms-web/src/views/HelloWorld.vue delete mode 100644 ms-web/src/views/SystemManage.vue delete mode 100644 ms-web/src/views/UserManage.vue create mode 100644 ms-web/src/views/map/baidu-map.vue create mode 100644 ms-web/src/views/map/gaode-map.vue diff --git a/ms-web/components.d.ts b/ms-web/components.d.ts index 4c6ab4d..4505498 100644 --- a/ms-web/components.d.ts +++ b/ms-web/components.d.ts @@ -16,6 +16,8 @@ declare module 'vue' { ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] ElCol: typeof import('element-plus/es')['ElCol'] + ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] + ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] @@ -27,11 +29,13 @@ declare module 'vue' { ElInput: typeof import('element-plus/es')['ElInput'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElOption: typeof import('element-plus/es')['ElOption'] ElProgress: typeof import('element-plus/es')['ElProgress'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElSelect: typeof import('element-plus/es')['ElSelect'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] diff --git a/ms-web/index.html b/ms-web/index.html index d580870..5ea0048 100644 --- a/ms-web/index.html +++ b/ms-web/index.html @@ -4,6 +4,9 @@ + %VITE_APP_NAME% diff --git a/ms-web/mock/router/index.js b/ms-web/mock/router/index.js index b980081..aa0fbef 100644 --- a/ms-web/mock/router/index.js +++ b/ms-web/mock/router/index.js @@ -303,12 +303,12 @@ export const adminRoutes = [ children: [ { parentPath: '/map', - menuUrl: '/map/gaode', + menuUrl: '/map/gaode-map', menuName: '高德地图', }, { parentPath: '/map', - menuUrl: '/map/baidu', + menuUrl: '/map/baidu-map', menuName: '百度地图', }, ], diff --git a/ms-web/package.json b/ms-web/package.json index 2d8d914..e1a7506 100644 --- a/ms-web/package.json +++ b/ms-web/package.json @@ -9,8 +9,11 @@ "build": "vite build" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", + "@amap/amap-jsapi-types": "^0.0.13", "@element-plus/icons-vue": "^2.1.0", "@vue/tsconfig": "^0.4.0", + "@vueuse/core": "^10.7.1", "axios": "^1.5.0", "echarts": "^5.4.3", "element-plus": "^2.3.12", diff --git a/ms-web/src/config/appconfig.js b/ms-web/src/config/appconfig.js deleted file mode 100644 index f750ece..0000000 --- a/ms-web/src/config/appconfig.js +++ /dev/null @@ -1,73 +0,0 @@ -let test_menu = [ - { - name: "首页", - path: "/home", - component: "Home", - localFilePath: "views/Home", - icon: "HomeFilled", - isSingle: true, - children: [ - { - name: "控制台", - path: "console", - toPath: "/home/console", - component: "Console", - localFilePath: "views/Console", - icon: "Odometer", - }, - ], - }, - { - name: "系统管理", - path: "/systemManage", - component: "SystemManage", - localFilePath: "views/SystemManage", - icon: "Setting", - children:[ - { - name:"用户管理", - path:"userManage", - toPath:"/systemManage/userManage", - component:"UserManage", - localFilePath:"views/UserManage", - icon:"User", - }, - ] - }, - { - name: "下一页", - path: "/test4", - component: "NextPage", - localFilePath: "views/NextPage", - icon: "Grid", - children: [ - { - name: "测试4", - path: "test41", - component: "NextPage", - localFilePath: "views/NextPage", - icon: "Grid", - }, - { - name: "测试5", - path: "test42", - component: "NextPage", - localFilePath: "views/NextPage", - icon: "Grid", - children: [ - { - name: "测试6", - path: "test43", - component: "NextPage", - localFilePath: "views/NextPage", - icon: "Grid", - }, - ], - }, - ], - }, -] - -export default { - routes: test_menu, -} diff --git a/ms-web/src/config/index.ts b/ms-web/src/config/index.ts new file mode 100644 index 0000000..b7230fb --- /dev/null +++ b/ms-web/src/config/index.ts @@ -0,0 +1 @@ +export * from "./map-sdk" diff --git a/ms-web/src/config/map-sdk.ts b/ms-web/src/config/map-sdk.ts new file mode 100644 index 0000000..7475dce --- /dev/null +++ b/ms-web/src/config/map-sdk.ts @@ -0,0 +1,10 @@ +/** 百度地图sdk地址 */ +export const BAIDU_MAP_SDK_URL = `https://api.map.baidu.com/api?v=1.0&type=webgl&ak=Z83GdVKY62Tb30whnRRQnGGcCj3NnQbb` + +/** 高德地图sdk地址 */ +export const AMAP_SDK_URL = "https://webapi.amap.com/maps?v=2.0&key=6aa0c6346fa679fe22baa6072268ea54" + +/** 腾讯地图sdk地址 */ +export const TENCENT_MAP_SDK_URL = + "https://map.qq.com/api/gljs?v=1.exp&key=A6DBZ-KXPLW-JKSRY-ONZF4-CPHY3-K6BL7" + diff --git a/ms-web/src/icons/tick.svg b/ms-web/src/icons/tick.svg new file mode 100644 index 0000000..c583e0d --- /dev/null +++ b/ms-web/src/icons/tick.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ms-web/src/layouts/Layout.vue b/ms-web/src/layouts/Layout.vue index d62f58d..6c1c746 100644 --- a/ms-web/src/layouts/Layout.vue +++ b/ms-web/src/layouts/Layout.vue @@ -2,11 +2,9 @@ import ClassicTheme from "@/layouts/themes/ClassicTheme.vue" import TopBLayout from "@/layouts/themes/TopBLayout.vue" import { useSettingStore } from "@/store" -console.log("获取面包屑") import { useGetBreadcrumbList } from "@/utils/public/getData" const settingStore = useSettingStore() useGetBreadcrumbList() // 监听路由获取面包屑 -console.log("获取面包屑")