From 9d0eec83ca9bb5bbc4c59b462f44f731b3446819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Thu, 21 Nov 2024 11:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 4 +-
src/App.vue | 132 +++++++++---------
src/hooks/setting/useProjectSetting.ts | 3 +
.../components/Header/ProjectSetting.vue | 9 ++
src/layout/components/Header/index.vue | 2 +-
src/layout/components/Logo/index.vue | 2 +-
src/settings/projectSetting.ts | 2 +
src/store/modules/projectSetting.ts | 6 +
8 files changed, 91 insertions(+), 69 deletions(-)
diff --git a/.env b/.env
index 9ef2da2..4b3db4b 100644
--- a/.env
+++ b/.env
@@ -2,10 +2,10 @@
VITE_PORT = 8001
# spa-title
-VITE_GLOB_APP_TITLE = AdminPro
+VITE_GLOB_APP_TITLE = 云恒WMS
# spa shortname
-VITE_GLOB_APP_SHORT_NAME = AdminPro
+VITE_GLOB_APP_SHORT_NAME = 云恒WMS
# 生产环境 开启mock
VITE_GLOB_PROD_MOCK = true
diff --git a/src/App.vue b/src/App.vue
index 28cbf21..53d74aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,5 @@
-
+
@@ -12,75 +7,82 @@
+
diff --git a/src/hooks/setting/useProjectSetting.ts b/src/hooks/setting/useProjectSetting.ts
index 0adbb89..b0d1a35 100644
--- a/src/hooks/setting/useProjectSetting.ts
+++ b/src/hooks/setting/useProjectSetting.ts
@@ -26,6 +26,8 @@ export function useProjectSetting() {
const getIsPageAnimate = computed(() => projectStore.isPageAnimate);
+ const getIsWaterMark = computed(() => projectStore.isWaterMark);
+
const getPageAnimateType = computed(() => projectStore.pageAnimateType);
const getIsProjectSetting = computed(() => projectStore.isProjectSetting);
@@ -42,6 +44,7 @@ export function useProjectSetting() {
getCollapsedNav,
getShowFooter,
getIsPageAnimate,
+ getIsWaterMark,
getPageAnimateType,
getIsProjectSetting,
};
diff --git a/src/layout/components/Header/ProjectSetting.vue b/src/layout/components/Header/ProjectSetting.vue
index a927376..6db6fb1 100644
--- a/src/layout/components/Header/ProjectSetting.vue
+++ b/src/layout/components/Header/ProjectSetting.vue
@@ -177,6 +177,15 @@
+
+
+
+
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 1f1f7db..1317e42 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -12,7 +12,7 @@
>
![](~@/assets/images/logo.png)
-
NaiveAdmin
+
云恒WMS
- NaiveAdmin
+ 云恒WMS
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index 5dc08e5..862485e 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -52,6 +52,8 @@ const setting = {
permissionMode: 'BACK',
//是否开启路由动画
isPageAnimate: true,
+ //是否开启水印
+ isWaterMark: true,
//路由动画类型 默认消退
pageAnimateType: 'fade',
//显示项目配置
diff --git a/src/store/modules/projectSetting.ts b/src/store/modules/projectSetting.ts
index 702fe64..95a56ff 100644
--- a/src/store/modules/projectSetting.ts
+++ b/src/store/modules/projectSetting.ts
@@ -20,6 +20,7 @@ const {
crumbsSetting,
permissionMode,
isPageAnimate,
+ isWaterMark,
pageAnimateType,
isProjectSetting,
} = projectSetting;
@@ -35,6 +36,7 @@ interface ProjectSettingState {
crumbsSetting: IcrumbsSetting; //面包屑
permissionMode: string; //权限模式
isPageAnimate: boolean; //是否开启路由动画
+ isWaterMark: boolean; //是否开启水印
pageAnimateType: string; //路由动画类型
isProjectSetting: boolean; //显示项目配置
}
@@ -52,6 +54,7 @@ export const useProjectSettingStore = defineStore({
crumbsSetting,
permissionMode,
isPageAnimate,
+ isWaterMark,
pageAnimateType,
isProjectSetting,
}),
@@ -86,6 +89,9 @@ export const useProjectSettingStore = defineStore({
getIsPageAnimate(): boolean {
return this.isPageAnimate;
},
+ getIsWaterMark(): boolean {
+ return this.isWaterMark;
+ },
getPageAnimateType(): string {
return this.pageAnimateType;
},