From 149fac74481ed59acc1088aa288ad8605baaecb0 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 20 Oct 2023 10:07:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=95=E8=84=9A=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A3=B0=E6=98=8E=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/BasicLayout.vue | 41 +++++++++++++++++++++++++------------ src/store/modules/app.ts | 7 +++++++ src/views/login.vue | 17 +++++---------- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index c5d9f7f9..4de5bbf2 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -13,6 +13,7 @@ import useLayoutStore from '@/store/modules/layout'; import useRouterStore from '@/store/modules/router'; import useTabsStore from '@/store/modules/tabs'; import useAlarmStore from '@/store/modules/alarm'; +import useAppStore from '@/store/modules/app'; import { useRouter } from 'vue-router'; import { MENU_PATH_INLINE } from '@/constants/menu-constants'; const { proConfig, waterMarkContent } = useLayoutStore(); @@ -24,6 +25,7 @@ import { parseDateToStr } from '@/utils/date-utils'; const { t } = useI18n(); const routerStore = useRouterStore(); const tabsStore = useTabsStore(); +const appStore = useAppStore(); const router = useRouter(); /**菜单面板 */ @@ -121,7 +123,7 @@ tabsStore.clear(); // onMounted(() => { fnGetServerTime(); - useAlarmStore().fnGetActiveAlarmInfo() + useAlarmStore().fnGetActiveAlarmInfo(); }); // ==== 服务器时间显示 start @@ -166,7 +168,7 @@ document.addEventListener('visibilitychange', function () { if (document.visibilityState == 'visible') { //切换到该页面时执行 fnGetServerTime(); - useAlarmStore().fnGetActiveAlarmInfo() + useAlarmStore().fnGetActiveAlarmInfo(); } }); // ==== 服务器时间显示 end @@ -236,15 +238,14 @@ document.addEventListener('visibilitychange', function () { @@ -267,8 +268,22 @@ document.addEventListener('visibilitychange', function () { width: 180px; } -.footer-time { - color: #00000075; - transition: all 0.3s; +.footer { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + z-index: 16; + margin: 0px; + padding: 4px 16px; + width: auto; + background: #fff; + box-shadow: 0 1px 4px #0015291f; + transition: background 0.3s, width 0.2s; + + &-time { + color: #00000085; + transition: all 0.3s; + } } diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index eb6d7b2a..367b1768 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -8,6 +8,8 @@ type AppStore = { appCode: string; /**应用版本 */ appVersion: string; + /**应用版权声明 */ + copyright: string; }; const useAppStore = defineStore('app', { @@ -15,6 +17,7 @@ const useAppStore = defineStore('app', { appName: import.meta.env.VITE_APP_NAME, appCode: import.meta.env.VITE_APP_CODE, appVersion: import.meta.env.VITE_APP_VERSION, + copyright: 'Copyright ©2023 For AGrand 千通科技', }), actions: { /**设置网页标题 */ @@ -25,6 +28,10 @@ const useAppStore = defineStore('app', { document.title = this.appName; } }, + /**设置版权声明 */ + setCopyright(text: string) { + this.copyright = text; + }, }, }); diff --git a/src/views/login.vue b/src/views/login.vue index 7b9e0f06..a3e219a9 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -3,12 +3,14 @@ import { GlobalFooter } from '@ant-design-vue/pro-layout'; import { message } from 'ant-design-vue/lib'; import { reactive, onMounted } from 'vue'; import useUserStore from '@/store/modules/user'; +import useAppStore from '@/store/modules/app'; import { getCaptchaImage } from '@/api/login'; import { useRouter, useRoute } from 'vue-router'; import useI18n from '@/hooks/useI18n'; import { toRaw } from 'vue'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; const { t, changeLocale } = useI18n(); +const appStore = useAppStore(); const router = useRouter(); const route = useRoute(); @@ -20,9 +22,9 @@ let state = reactive({ /**表单属性 */ from: { /**账号 */ - username: '', + username: 'AGrand', /**密码 */ - password: '', + password: 'AGrand@1234', /**验证码 */ code: '', /**验证码uuid */ @@ -251,16 +253,7 @@ function fnChangeLocale(e: any) { - - +