sujunling 1 年間 前
コミット
10aa696f2d

+ 4 - 1
src/components/Application/src/AppLogo.vue

@@ -6,7 +6,10 @@
       style="width: 52px;height: 30px;filter: brightness(0) invert(1) grayscale(1);" /> -->
     <div class="headerName ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
       <!-- {{ getTitle }} -->
-      空间数据管理平台
+      <!-- 小浪底 -->
+      <!-- 空间数据管理平台 -->
+      <!-- 地灾 -->
+      地灾GIS支撑中心
     </div>
   </div>
   <!-- <div class="logo"></div> -->

+ 12 - 12
src/enums/cacheEnum.ts

@@ -1,37 +1,37 @@
 // token key
-export const TOKEN_KEY = 'TOKEN__';
+export const TOKEN_KEY = 'TOKEN___SPACE';
 
 export const JWT_TOKEN_KEY = 'JWT_TOKEN_SPACE';
 
-export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
+export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN_SPACE';
 
-export const LOCALE_KEY = 'LOCALE__';
+export const LOCALE_KEY = 'LOCALE___SPACE';
 
 // user info key
-export const USER_INFO_KEY = 'USER__INFO__';
+export const USER_INFO_KEY = 'USER__INFO___SPACE';
 
 // role info key
-export const ROLES_KEY = 'ROLES__KEY';
+export const ROLES_KEY = 'ROLES__KEY_SPACE';
 
 // project config key
 export const PROJ_CFG_KEY = 'PROJ__CFG__KEY__NEW';
 
 // lock info
-export const LOCK_INFO_KEY = 'LOCK__INFO__KEY__';
+export const LOCK_INFO_KEY = 'LOCK__INFO__KEY___SPACE';
 
-export const MULTIPLE_TABS_KEY = 'MULTIPLE_TABS__KEY__';
+export const MULTIPLE_TABS_KEY = 'MULTIPLE_TABS__KEY___SPACE';
 
-export const APP_DARK_MODE_KEY_ = '__APP__DARK__MODE__';
+export const APP_DARK_MODE_KEY_ = '__APP__DARK__MODE___SPACE';
 
 // base global local key
-export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__';
+export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY___SPACE';
 
 // base global session key
-export const APP_SESSION_CACHE_KEY = 'COMMON__SESSION__KEY__';
+export const APP_SESSION_CACHE_KEY = 'COMMON__SESSION__KEY___SPACE';
 
-export const PLATFORM = 'PLATFORM';
+export const PLATFORM = 'PLATFORM_SPACE';
 
-export const MENU_LIST = 'MENU_LIST';
+export const MENU_LIST = 'MENU_LIST_SPACE';
 export enum CacheTypeEnum {
   SESSION,
   LOCAL,

+ 2 - 1
src/enums/pageEnum.ts

@@ -4,7 +4,8 @@ export const PageEnum = {
   BASE_LOGIN: '/login',
   // basic home path
   // BASE_HOME: isDolang.value == '/dashboard/workbench' ? '/dashboard/workbench' : isDolang.value,
-  BASE_HOME: '/dashboard/workbench',
+  // BASE_HOME: '/dashboard/workbench',//小浪底
+  BASE_HOME: '/twoThree/index',//地灾
   // error page path
   ERROR_PAGE: '/exception',
   // error log page path

+ 6 - 3
src/layouts/default/header/index.vue

@@ -27,22 +27,25 @@
 
       <HelpDoc />
 
-      <div class="header-tips">
+      <!-- 地灾需要去掉下面的 -->
+
+      <!-- <div class="header-tips">
         <div @click="openTips" class="tips-icon">
           <div class="icon"></div>
           <div class="msg-num">{{ tipsNum }}</div>
         </div>
         <div id="tips-container" class="tips-container" v-show="ifShowTips"></div>
-      </div>
+      </div> -->
 
       <!-- <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" /> -->
+
       <div class="header-setting" @click="gotoSysManage">
         <img :src="settingImg" style="width: 26px;height: 26px;">
       </div>
 
 
       <!-- <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" /> -->
-      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false"/>
+      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" />
 
       <UserDropDown :theme="getHeaderTheme" />
       <img :src="outSys" alt="" srcset="" class="outSys" @click="outSysWay">

+ 5 - 3
src/router/guard/permissionGuard.ts

@@ -53,9 +53,11 @@ export async function createPermissionGuard(router: Router) {
             return;
           }
         } catch { }
-      } else {
-        // window.location.href = '/admin/index.html';//地灾项目使用这个
-        // return;
+      } else if (to.path == LOGIN_PATH) {
+        sessionStorage.clear();//地灾项目使用这个
+        localStorage.clear();//地灾项目使用这个
+        window.location.href = '/admin/index.html';//地灾项目使用这个
+        return;
       }
       next();
       return;

+ 2 - 1
src/views/sys/login/Login.vue

@@ -58,7 +58,8 @@
           </div>
         </div> -->
         <div class="logo-title-box" style="margin-top: 8%;margin-bottom: 7%;">
-          <img :src="logoBg" alt="">
+          <!-- 地灾去掉下面的 -->
+          <!-- <img :src="logoBg" alt=""> -->
         </div>
         <div class="login-box" style="width: 380px;height: 420px;padding: 56px 40px;">
           <LoginForm />