tangning недель назад: 3
Родитель
Сommit
370010f785
2 измененных файлов с 3 добавлено и 4 удалено
  1. 1 1
      src/view/newFireCase/newFireDetails/components/scene.vue
  2. 2 3
      src/view/system/login.vue

+ 1 - 1
src/view/newFireCase/newFireDetails/components/scene.vue

@@ -28,7 +28,7 @@
           >
           >
             <div class="item-main">
             <div class="item-main">
               <div class="title" :title="item.title">{{ item.title }}</div>
               <div class="title" :title="item.title">{{ item.title }}</div>
-              <div class="sub">{{[0, 1, 3, 4, 6].includes(item.sceneType) ? 'mesh场景' : '点云场景' }}</div>
+              <div class="sub">{{[0, 1, 3, 4, 6].includes(item.sceneType) ? 'Mesh场景' : '点云场景' }}</div>
             </div>
             </div>
             <div class="actions" v-show="String(item.sceneNumId) === activeId">
             <div class="actions" v-show="String(item.sceneNumId) === activeId">
               <el-tooltip content="编辑" v-if="editOrShow === 'edit'">
               <el-tooltip content="编辑" v-if="editOrShow === 'edit'">

+ 2 - 3
src/view/system/login.vue

@@ -141,7 +141,7 @@ const submitClick = async () => {
       localStorage.setItem("password", "");
       localStorage.setItem("password", "");
       localStorage.setItem("remember", "0");
       localStorage.setItem("remember", "0");
     }
     }
-
+    const params: any = router.currentRoute.value.query;
     if ("redirect" in params && params.redirect) {
     if ("redirect" in params && params.redirect) {
       const decodeOnce = (s: string): string => {
       const decodeOnce = (s: string): string => {
         try {
         try {
@@ -151,7 +151,6 @@ const submitClick = async () => {
         }
         }
       };
       };
 
 
-      const params: any = router.currentRoute.value.query;
       const rawRedirect = params.redirect as string;
       const rawRedirect = params.redirect as string;
       let resolved = decodeOnce(rawRedirect);
       let resolved = decodeOnce(rawRedirect);
 
 
@@ -168,7 +167,7 @@ const submitClick = async () => {
       url.searchParams.delete("token");
       url.searchParams.delete("token");
       // url.searchParams.append("token", user.value.token);
       // url.searchParams.append("token", user.value.token);
       window.localStorage.setItem("token", user.value.token);
       window.localStorage.setItem("token", user.value.token);
-      if(isHttpHttpsUrl(resolved)){//判断内链还是外链
+      if(isHttpHttpsUrl(resolved)){ //判断内链还是外链
         window.location.replace(url);
         window.location.replace(url);
       }else{
       }else{
         router.push(resolved);
         router.push(resolved);