Domů Procházet Nápověda
Registrovat se Přihlásit se
xiaxing
/
hlt_gis_admin
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

修改了浏览权限验证

sujunling před 1 rokem
rodič
79f547ace6
revize
73c90991b7
8 změnil soubory, kde provedl 82 přidání a 56 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 19 12
      public/mapsee.html
  2. 18 12
      public/mapview.html
  3. 18 11
      public/sceneview.html
  4. 13 8
      src/router/guard/permissionGuard.ts
  5. 8 7
      src/store/modules/user.ts
  6. 2 2
      src/views/assembly/item/AssemblyData.vue
  7. 1 1
      src/views/assembly/item/child/DetailModal.vue
  8. 3 3
      src/views/resource/examine/check.vue

+ 19 - 12
public/mapsee.html
Zobrazit soubor 

@@ -57,20 +57,27 @@
 
         // setInterval(check, 1000);
 
 
         window.onload = function () {
 
-            var obj = JSON.parse(JSON.stringify(window.location.href));
 
-            var arr = obj.split("?")
 
-            if (arr.length && arr[1]) {
 
-                if (arr[1].indexOf("onlineIde_") > -1) {
 
-                    // creteIframe(`http://106.12.170.138:4001/examples/online.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    creteIframe(`http://192.168.193.88:8080/examples/webgl/online.html#${arr[1].replace("onlineIde_", "")}`)
 
-                } else {
 
-                    // creteIframe(arr[1])
 
-                    // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
-                    // creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
+            var t1 = sessionStorage.getItem('tokenSpace');
 
+            var t2 = sessionStorage.getItem('tokenV2');
 
+            if (t1 && t2) {
 
+                var obj = JSON.parse(JSON.stringify(window.location.href));
 
+                var arr = obj.split("?")
 
+                if (arr.length && arr[1]) {
 
+                    if (arr[1].indexOf("onlineIde_") > -1) {
 
+                        // creteIframe(`http://106.12.170.138:4001/examples/online.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        creteIframe(`http://192.168.193.88:8080/examples/webgl/online.html#${arr[1].replace("onlineIde_", "")}`)
 
+                    } else {
 
+                        // creteIframe(arr[1])
 
+                        // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
+                        // creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
+                    }
 
                 }
 
+            } else {
 
+                window.location.href = '/#/login'
 
             }
 
+
 
         }
 
 
         function creteIframe(url) {

+ 18 - 12
public/mapview.html
Zobrazit soubor 

@@ -30,19 +30,25 @@
 
 <body>
 
     <script>
 
         window.onload = function () {
 
-            var obj = JSON.parse(JSON.stringify(window.location.href));
 
-            var arr = obj.split("?")
 
-            if (arr.length && arr[1]) {
 
-                if (arr[1].indexOf("onlineIde_") > -1) {
 
-                    // creteIframe(`http://106.12.170.138:4001/examples/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                } else {
 
-                    // creteIframe(arr[1])
 
-                    // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
-                    // creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
+            var t1 = sessionStorage.getItem('tokenSpace');
 
+            var t2 = sessionStorage.getItem('tokenV2');
 
+            if (t1 && t2) {
 
+                var obj = JSON.parse(JSON.stringify(window.location.href));
 
+                var arr = obj.split("?")
 
+                if (arr.length && arr[1]) {
 
+                    if (arr[1].indexOf("onlineIde_") > -1) {
 
+                        // creteIframe(`http://106.12.170.138:4001/examples/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                    } else {
 
+                        // creteIframe(arr[1])
 
+                        // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
+                        // creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
 
+                    }
 
                 }
 
+            } else {
 
+                window.location.href = '/#/login'
 
             }
 
         }

+ 18 - 11
public/sceneview.html
Zobrazit soubor 

@@ -30,19 +30,26 @@
 
 <body>
 
     <script>
 
         window.onload = function () {
 
-            var obj = JSON.parse(JSON.stringify(window.location.href));
 
-            var arr = obj.split("?")
 
-            if (arr.length && arr[1]) {
 
-                if (arr[1].indexOf("onlineIde_") > -1) {
 
-                    // creteIframe(`http://106.12.170.138:4001/examples/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                    creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
-                } else {
 
-                    // creteIframe(arr[1])
 
-                    creteIframe(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${arr[1]}`)
 
-                    // creteIframe(`http://106.12.170.138:8080/onemapV5.0/sceneview.html?${arr[1]}`)
 
+            var t1 = sessionStorage.getItem('tokenSpace');
 
+            var t2 = sessionStorage.getItem('tokenV2');
 
+            if (t1 && t2) {
 
+                var obj = JSON.parse(JSON.stringify(window.location.href));
 
+                var arr = obj.split("?")
 
+                if (arr.length && arr[1]) {
 
+                    if (arr[1].indexOf("onlineIde_") > -1) {
 
+                        // creteIframe(`http://106.12.170.138:4001/examples/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                        creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
 
+                    } else {
 
+                        // creteIframe(arr[1])
 
+                        creteIframe(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${arr[1]}`)
 
+                        // creteIframe(`http://106.12.170.138:8080/onemapV5.0/sceneview.html?${arr[1]}`)
 
+                    }
 
                 }
 
+            } else {
 
+                window.location.href = '/#/login'
 
             }
 
+
 
         }
 
 
         function creteIframe(url) {

+ 13 - 8
src/router/guard/permissionGuard.ts
Zobrazit soubor 

@@ -19,9 +19,9 @@ export async function createPermissionGuard(router: Router) {
 
   const userStore = useUserStoreWithOut();

   const permissionStore = usePermissionStoreWithOut();

   const userStore2 = useUserStore();

-  var token = session.getItem('tokenSpace')

-  var tokenV2 = session.getItem('tokenV2')

-  if ((location.href.indexOf('refreshToken') > -1) && (!token || !tokenV2)) {

+  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({

@@ -64,8 +64,12 @@ export async function createPermissionGuard(router: Router) {
 
             next((to.query?.redirect as string) || '/');

             return;

           }

-        } catch { }

-      } else if (to.path == LOGIN_PATH && !(location.href.indexOf('127.0.0.1') > -1) && !(location.href.indexOf('localhost') > -1)) {

+        } 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';//地灾项目使用这个

@@ -95,7 +99,8 @@ export async function createPermissionGuard(router: Router) {
 
         };

       }

       console.log('redirectData', redirectData);

-

+      sessionStorage.clear();

+      localStorage.clear();

       next(redirectData);

       return;

     }

@@ -155,11 +160,11 @@ export async function createPermissionGuard(router: Router) {
 
 

     if (to.name === PAGE_NOT_FOUND_ROUTE.name) {

       // 动态添加路由后，此处应当重定向到fullPath，否则会加载404页面内容

-      var tk = session.getItem("tokenV2");

+      var tk = session.getItem('tokenV2');

       if (tk && token) {

         next({ path: to.fullPath, replace: true, query: to.query });

       } else {

-        userStore.setToken(undefined)

+        userStore.setToken(undefined);

         window.localStorage.clear();

         window.sessionStorage.clear();

         next({ path: PageEnum.BASE_LOGIN, replace: true, query: to.query });

+ 8 - 7
src/store/modules/user.ts
Zobrazit soubor 

@@ -202,7 +202,7 @@ export const useUserStore = defineStore({
 
           window.localStorage.setItem('entityId', JSON.stringify(entityId));

           window.sessionStorage.setItem('entityId', JSON.stringify(entityId));

         }

-      } catch { }

+      } catch {}

       return userInfo;

     },

     /**

@@ -224,16 +224,16 @@ export const useUserStore = defineStore({
 
       let addRecordParam = {

         systemLog: {

           cjrq: moment().format('YYYY-MM-DD HH:mm:ss'),

-          czsm: "退出操作",

-          opt: "logout",

+          czsm: '退出操作',

+          opt: 'logout',

           sfcg: 1,

           userid: userInfo?.info?.EMPLOYEE_MIS.EMPLOYEE_ID,

-          username: userInfo?.info?.EMPLOYEE.NAME

-        }

-      }

+          username: userInfo?.info?.EMPLOYEE.NAME,

+        },

+      };

       if (goLogin) {

         //插入退出日志记录

-        defHttp.post({ url: '/base-center/syslog/AddLogin', params: addRecordParam })

+        defHttp.post({ url: '/base-center/syslog/AddLogin', params: addRecordParam });

       }

 

       this.setToken(undefined);

@@ -242,6 +242,7 @@ export const useUserStore = defineStore({
 
       this.setUserInfo(null);

       goLogin && router.push(PageEnum.BASE_LOGIN);

       window.localStorage.clear();

+      window.sessionStorage.clear();

       window.localStorage.removeItem('updateUserInfo');

     },

+ 2 - 2
src/views/assembly/item/AssemblyData.vue
Zobrazit soubor 

@@ -10,8 +10,8 @@
 
             <div><img :src="i.url" srcset=""></div>

             <b>{{ i.servicename }}</b>

             <p class="bottomBut">

-              <span><a :href="[`./map${i.SFJRSQK == '审核通过' ? 'view' : 'see'}.html?onlineIde_${i.servicealiasname}`]"

-                  target="_blank" rel="noopener noreferrer">浏览</a></span>

+              <span><a rel="opener" style="color: rgb(45, 116, 231);" :href="[`./map${i.SFJRSQK == '审核通过' ? 'view' : 'see'}.html?onlineIde_${i.servicealiasname}`]"

+                  target="_blank">浏览</a></span>

               <!-- <span @click="showDrawer(i)">详细</span> -->

               <span @click="handleDetailInfo(i)" style="color: #2D74E7;">详细</span>

               <span @click="applyWay(i)" v-if="i.SFJRSQK == '未加入'">加入申请库</span>

+ 1 - 1
src/views/assembly/item/child/DetailModal.vue
Zobrazit soubor 

@@ -17,7 +17,7 @@
 
                         <!-- <a :href="[`./mapview.html?onlineIde_${baseInfo.servicealiasname}`]" target="_blank"
 
                             rel="noopener noreferrer">浏览</a> -->
 
                         <a :href="[`./map${baseInfo.SFJRSQK == '审核通过' ? 'view' : 'see'}.html?onlineIde_${baseInfo.servicealiasname}`]"
 
-                            target="_blank" rel="noopener noreferrer">浏览</a>
 
+                            target="_blank" rel="opener">浏览</a>
 
                     </div>
 
                 </div>
 
             </div>

+ 3 - 3
src/views/resource/examine/check.vue
Zobrazit soubor 

@@ -88,9 +88,9 @@ export default defineComponent({
 
           return false
 
         }
 
       } finally {
 
-        setTimeout(() => {
 
-          setModalProps({ confirmLoading: false });
 
-        }, 300);
 
+        // setTimeout(() => {
 
+        //   setModalProps({ confirmLoading: false });
 
+        // }, 300);
 
       }
 
     }