wuhongbo 1 gadu atpakaļ
vecāks
revīzija
2c561384ef

+ 1 - 4
client/.env.base

@@ -16,7 +16,4 @@ VITE_API_BASEPATH=/dev-api
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/
-
-# 系统名称
-VITE_OA_TITLE=浙江万维空间企业管理系统
+VITE_BASE_PATH=/

+ 3 - 3
client/src/views/Login/OALogin.vue

@@ -18,8 +18,10 @@
 <script lang="ts" setup>
 import * as LoginApi from '@/api/login'
 import { useRouter } from 'vue-router'
+import { useAppStore } from '@/store/modules/app'
 defineOptions({ name: 'OALogin' })
-const oaLoginTitle = ref(import.meta.env.VITE_OA_TITLE)
+const appStore = useAppStore()
+const oaLoginTitle = ref(appStore.title)
 const dingCodeLogin = ref()
 const redirect = ref<string>('')
 const { currentRoute, push } = useRouter()
@@ -42,8 +44,6 @@ onMounted(() => {
     iframeZzcShow.value = false
   }
   window.pushWin = function () {
-    console.log(redirect.value)
-
     push({ path: redirect.value || '/oaSystem/home' })
   }
 })

+ 7 - 3
client/src/views/OaSystem/oaLayout/header.vue

@@ -2,7 +2,10 @@
   <div class="header">
     <div class="header-left">
       <img src="@/assets/imgs/OA/zdww.png" alt="" />
-      <p>浙江万维空间MIS <span v-if="menuUlShow">|</span> {{ headerTitleName }}</p>
+      <p
+        >{{ titleName }}
+        <!-- <span v-if="menuUlShow">|</span> {{ headerTitleName }} -->
+      </p>
     </div>
     <div class="header-right">
       <ul class="menuUl" v-if="menuUlShow">
@@ -49,6 +52,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
+import { useAppStore } from '@/store/modules/app'
 defineOptions({ name: 'Header' })
 const { t } = useI18n()
 
@@ -57,7 +61,7 @@ const { wsCache } = useCache()
 const { push, replace } = useRouter()
 
 const userStore = useUserStore()
-
+const appStore = useAppStore()
 const tagsViewStore = useTagsViewStore()
 
 const { getPrefixCls } = useDesign()
@@ -69,7 +73,7 @@ const user = wsCache.get(CACHE_KEY.USER)
 const avatar = user.user.avatar ? user.user.avatar : avatarImg
 
 const userName = user.user.nickname ? user.user.nickname : 'Admin'
-
+const titleName = ref(appStore.title)
 const loginOut = () => {
   ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {
     confirmButtonText: t('common.ok'),