فهرست منبع

恢复小浪底代码

sujunling 1 سال پیش
والد
کامیت
bc3c2eef72

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

@@ -2,14 +2,14 @@
   <div class="anticon" :class="getAppLogoClass" @click="goHome" style="margin-right: 184px;width: 260px !important;">
     <!-- <img v-if="getLogo" :src="getLogo" /> -->
     <!-- 地灾去掉下面的图片 -->
-    <!-- <img src="/src/assets/images/logo.png"
-      style="width: 52px;height: 30px;filter: brightness(0) invert(1) grayscale(1);" /> -->
+    <img src="/src/assets/images/logo.png"
+      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支撑中心
+      <!-- 地灾GIS支撑中心 -->
     </div>
   </div>
   <!-- <div class="logo"></div> -->

+ 2 - 2
src/enums/pageEnum.ts

@@ -4,8 +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: '/twoThree/index',//地灾
+  BASE_HOME: '/dashboard/workbench',//小浪底
+  // BASE_HOME: '/twoThree/index',//地灾
   // error page path
   ERROR_PAGE: '/exception',
   // error log page path

+ 5 - 5
src/layouts/default/header/components/user-dropdown/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`" @click="handleMenuClick2">
+  <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`" @click="handleMenuClick">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
       <!-- <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />  sjl-->
       <img :src="userImg" alt="" srcset="" style="width: 26px;height: 26px;">
@@ -11,13 +11,13 @@
     </span>
 
     <!-- 地灾才使用 -->
-    <template #overlay>
+    <!-- <template #overlay>
       <Menu @click="handleMenuClick2">
         <MenuItem key="personal" text="返回门户" icon="ion:document-text-outline" />
       </Menu>
-    </template>
+    </template> -->
 
-    <!-- <template #overlay>
+    <template #overlay>
       <Menu @click="handleMenuClick">
         <MenuItem key="personal" :text="t('layout.header.dropdownItemPersonal')" icon="ion:document-text-outline" />
         <MenuItem v-if="hasPermission('system:password:view')" key="changePassword"
@@ -28,7 +28,7 @@
           icon="ion:lock-closed-outline" />
         <MenuItem key="logout" :text="t('layout.header.dropdownItemLoginOut')" icon="ion:power-outline" />
       </Menu>
-    </template> -->
+    </template>
   </Dropdown>
   <LockAction @register="register" />
   <!-- <PersonalChild

+ 2 - 2
src/layouts/default/header/index.vue

@@ -29,13 +29,13 @@
 
       <!-- 地灾需要去掉下面的 -->
 
-      <!-- <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`" /> -->
 

+ 20 - 20
src/router/guard/permissionGuard.ts

@@ -22,22 +22,22 @@ export async function createPermissionGuard(router: Router) {
   var token = session.getItem('tokenSpace')
   var tokenV2 = session.getItem('tokenV2')
   if ((location.href.indexOf('refreshToken') > -1) && (!token || !tokenV2)) {
-    var o = session.getItem('loginParams');
-    if (o && o.username) {
-      await userStore2.login({
-        password: 'Tofly@028',
-        username: o.username.toUpperCase(),
-        mode: 'modal'
-      })//地灾使用这个
-      //修改地址栏链接
-      window.history.pushState('', '', location.href.split('?')[0]);
-      window.location.reload();
-      return;
-    } else {
-      sessionStorage.clear();
-      localStorage.clear();
-      window.location.href = '/admin/index.html';
-    }
+    // var o = session.getItem('loginParams');
+    // if (o && o.username) {
+    //   await userStore2.login({
+    //     password: 'Tofly@028',
+    //     username: o.username.toUpperCase(),
+    //     mode: 'modal'
+    //   })//地灾使用这个
+    //   //修改地址栏链接
+    //   window.history.pushState('', '', location.href.split('?')[0]);
+    //   window.location.reload();
+    //   return;
+    // } else {
+    //   sessionStorage.clear();
+    //   localStorage.clear();
+    //   window.location.href = '/admin/index.html';
+    // }
   }
 
   router.beforeEach(async (to, from, next) => {
@@ -66,10 +66,10 @@ export async function createPermissionGuard(router: Router) {
           }
         } catch { }
       } else if (to.path == LOGIN_PATH && !(location.href.indexOf('127.0.0.1') > -1) && !(location.href.indexOf('localhost') > -1)) {
-        sessionStorage.clear();//地灾项目使用这个
-        localStorage.clear();//地灾项目使用这个
-        window.location.href = '/admin/index.html';//地灾项目使用这个
-        return;
+        // sessionStorage.clear();//地灾项目使用这个
+        // localStorage.clear();//地灾项目使用这个
+        // window.location.href = '/admin/index.html';//地灾项目使用这个
+        // return;
       }
       next();
       return;

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

@@ -59,7 +59,7 @@
         </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 />