浏览代码

token过期去除token

tangning 1 天之前
父节点
当前提交
e7aadad05f
共有 2 个文件被更改,包括 19 次插入6 次删除
  1. 16 1
      src/app.vue
  2. 3 5
      src/sdk/cover/index.js

+ 16 - 1
src/app.vue

@@ -92,10 +92,25 @@ const gotoLogin = () => {
   const params = getAppParam();
   // alert("请登录");/${params.fromRoute}/#/mix3dManager
   const loginHref = `/${params.fromRoute}/#/login`
-  location.href = loginHref + '?redirect=' + escape(`/${params.fromRoute}/#/mix3dManager`)
+  location.href = loginHref + '?redirect=' + escape(removeTokenFromUrl(window.location.href))
   showLogin.value = true;
 };
 
+// 去除URL中的token参数
+function removeTokenFromUrl(url) {
+    // 如果没有传入url,默认使用当前页面的URL
+    const currentUrl = url || window.location.href;
+    
+    // 创建URL对象来解析
+    const urlObj = new URL(currentUrl);
+    
+    // 删除token参数
+    urlObj.searchParams.delete('token');
+    
+    // 返回处理后的完整URL
+    return urlObj.href;
+}
+
 addResErrorHandler((data: any) => {
   data = data?.data;
   const params = getAppParam();

+ 3 - 5
src/sdk/cover/index.js

@@ -176,13 +176,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
     if(window.offline){//离线版 改目录
         viewer.images360.tileDownloader.getTiles = function(d, sceneNum, useV4url, model){ 
             let kankan = !model.isPointcloud //ModelTypes[model.props.fromType].panos4dkk  
+            let ifrmUrl = window.location.pathname.includes('fusion_offline')?`/fusion_offline/${params.caseId}/www`:''
             if(kankan){
-                if(window.location.pathname.includes('fusion_offline')){// 案件多元融合嵌入
-                    return `/fusion_offline/${params.caseId}/www/swkk/${sceneNum}/wwwroot/scene_view_data/${sceneNum}/images/${d}`
-                }
-                return `/swkk/${sceneNum}/wwwroot/scene_view_data/${sceneNum}/images/${d}`
+                return ifrmUrl + `/swkk/${sceneNum}/wwwroot/scene_view_data/${sceneNum}/images/${d}`
             }else{
-                return `/swss/${sceneNum}/www/${sceneNum}/scene_view_data/${sceneNum}/images/${d}`
+                return ifrmUrl + `/swss/${sceneNum}/www/${sceneNum}/scene_view_data/${sceneNum}/images/${d}`
             }  
         } 
     }