From b349f3440bc6c5a6785af5d90034a3fdf4057d3c Mon Sep 17 00:00:00 2001 From: MTrun <1262327911@qq.com> Date: Fri, 7 Jan 2022 12:25:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B:=20=E8=A7=A3=E5=86=B3=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=AF=AD=E8=A8=80=E4=B8=8D=E4=BC=9A=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Reload/index.ts | 3 +++ src/components/Reload/index.vue | 20 +++++++++++++++++++ src/enums/pageEnum.ts | 3 +++ src/router/base.ts | 12 ++++++++++- src/router/index.ts | 4 ++-- src/store/modules/langStore/langStore.ts | 3 ++- src/styles/common/mixins/mixins.scss | 7 ------- src/styles/common/style.scss | 2 +- src/utils/page.ts | 8 +++++++- .../chart/components/ContentDetails/index.vue | 1 - .../chart/components/ContentDraw/index.vue | 2 +- src/views/exception/403.vue | 2 -- src/views/exception/404.vue | 2 -- src/views/exception/500.vue | 3 +-- src/views/login/index.vue | 2 -- .../project/items/components/Card/index.vue | 2 +- .../items/components/ModalCard/index.vue | 2 +- .../layout/components/Create/index.vue | 2 +- 18 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 src/components/Reload/index.ts create mode 100644 src/components/Reload/index.vue diff --git a/src/components/Reload/index.ts b/src/components/Reload/index.ts new file mode 100644 index 00000000..dff91516 --- /dev/null +++ b/src/components/Reload/index.ts @@ -0,0 +1,3 @@ +import Reload from './index.vue'; + +export { Reload }; diff --git a/src/components/Reload/index.vue b/src/components/Reload/index.vue new file mode 100644 index 00000000..80f5b1da --- /dev/null +++ b/src/components/Reload/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts index f1e1f562..4019dbdc 100644 --- a/src/enums/pageEnum.ts +++ b/src/enums/pageEnum.ts @@ -14,6 +14,9 @@ export enum PageEnum { //重定向 REDIRECT = '/redirect', REDIRECT_NAME = 'Redirect', + RELOAD = '/reload', + RELOAD_NAME = 'Reload', + // 首页 BASE_HOME = '/project', diff --git a/src/router/base.ts b/src/router/base.ts index 04afcb95..db33b28f 100644 --- a/src/router/base.ts +++ b/src/router/base.ts @@ -2,6 +2,7 @@ import { RouteRecordRaw } from 'vue-router' import type { AppRouteRecordRaw } from '@/router/types'; import { ErrorPage404, ErrorPage403, ErrorPage500, Layout } from '@/router/constant'; import { PageEnum } from '@/enums/pageEnum' +import { Reload } from '@/components/Reload/index' export const LoginRoute: RouteRecordRaw = { @@ -50,8 +51,17 @@ export const ErrorPageRoute: AppRouteRecordRaw = { } }; +export const ReloadRoute: AppRouteRecordRaw = { + path: PageEnum.RELOAD, + name: PageEnum.RELOAD_NAME, + component: Reload, + meta: { + title: PageEnum.RELOAD_NAME, + }, +} + export const RedirectRoute: AppRouteRecordRaw = { - path: '/redirect', + path: PageEnum.REDIRECT, name: PageEnum.REDIRECT_NAME, component: Layout, meta: { diff --git a/src/router/index.ts b/src/router/index.ts index eeccfcd9..6c6d4705 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -3,7 +3,7 @@ import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router' import { RedirectRoute } from '@/router/base' import { createRouterGuards } from './router-guards' import { PageEnum } from '@/enums/pageEnum' -import { HttpErrorPage, LoginRoute } from '@/router/base' +import { HttpErrorPage, LoginRoute, ReloadRoute } from '@/router/base' import { Layout } from '@/router/constant' import modules from '@/router/modules' @@ -26,7 +26,7 @@ const RootRoute: Array = [ ] -export const constantRouter: any[] = [LoginRoute, ...RootRoute, RedirectRoute]; +export const constantRouter: any[] = [LoginRoute, ...RootRoute, RedirectRoute, ReloadRoute]; const router = createRouter({ history: createWebHashHistory(''), diff --git a/src/store/modules/langStore/langStore.ts b/src/store/modules/langStore/langStore.ts index edecc628..960d10d6 100644 --- a/src/store/modules/langStore/langStore.ts +++ b/src/store/modules/langStore/langStore.ts @@ -3,7 +3,7 @@ import { lang } from '@/settings/designSetting' import { LangStateType } from './langStore.d' import { LangEnum } from '@/enums/styleEnum' import i18n from '@/i18n/index' -import { setLocalStorage } from '@/utils' +import { setLocalStorage, reloadRoutePage } from '@/utils' import { GO_LANG_SELECT } from '@/settings/storageConst' export const useLangStore = defineStore({ @@ -21,6 +21,7 @@ export const useLangStore = defineStore({ this.lang = lang i18n.global.locale = lang setLocalStorage(GO_LANG_SELECT, lang) + reloadRoutePage() } } }) diff --git a/src/styles/common/mixins/mixins.scss b/src/styles/common/mixins/mixins.scss index 1041709f..887beeb5 100644 --- a/src/styles/common/mixins/mixins.scss +++ b/src/styles/common/mixins/mixins.scss @@ -52,13 +52,6 @@ } } -//获取斑点渐变颜色 -@mixin background-point($target) { - @include themeify { - background-image: themed($target); - } -} - //获取边框颜色 @mixin filter-border-color($target) { @include themeify { diff --git a/src/styles/common/style.scss b/src/styles/common/style.scss index 7adf0878..94a1ce2a 100644 --- a/src/styles/common/style.scss +++ b/src/styles/common/style.scss @@ -45,7 +45,7 @@ overflow: hidden; } -// 背景斑点需配合 @mixin background-point 使用 +// 背景斑点需配合 @mixin background-image 使用 .go-point-bg { @include fetch-theme('background-color'); background-size: 15px 15px, 15px 15px; diff --git a/src/utils/page.ts b/src/utils/page.ts index 8160e7b1..5596ef36 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -1,6 +1,5 @@ import { ResultEnum } from '@/enums/httpEnum' import { ErrorPageNameMap, PageEnum } from '@/enums/pageEnum' -import { RouteLocation } from 'vue-router' import router from '@/router' import { docPath, giteeSourceCodePath } from '@/settings/pathConst' @@ -87,6 +86,13 @@ export const redirectErrorPage = (code: ResultEnum) => { routerTurnByName(pageName) } +/** + * * 重新加载当前路由页面 + */ +export const reloadRoutePage = () => { + routerTurnByName(PageEnum.RELOAD_NAME) +} + /** * * 退出 */ diff --git a/src/views/chart/components/ContentDetails/index.vue b/src/views/chart/components/ContentDetails/index.vue index 84501a66..9eb182e8 100644 --- a/src/views/chart/components/ContentDetails/index.vue +++ b/src/views/chart/components/ContentDetails/index.vue @@ -43,7 +43,6 @@ $wight: 400px; padding: 10px; .icon-position { padding-top: 2px; - color: #70c0e8; } } diff --git a/src/views/chart/components/ContentDraw/index.vue b/src/views/chart/components/ContentDraw/index.vue index 2ce23ce9..2d5d3f74 100644 --- a/src/views/chart/components/ContentDraw/index.vue +++ b/src/views/chart/components/ContentDraw/index.vue @@ -19,7 +19,7 @@ import { ContentBox } from '../ContentBox/index' diff --git a/src/views/exception/403.vue b/src/views/exception/403.vue index ad40812f..2887a020 100644 --- a/src/views/exception/403.vue +++ b/src/views/exception/403.vue @@ -11,10 +11,8 @@