ソースを参照

feat: 登录地址去除orgId参数

zhangjie 7 ヶ月 前
コミット
3497dcb840

+ 2 - 2
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecs-web-admin",
-  "version": "1.2.6",
+  "version": "1.3.4",
   "private": true,
   "scripts": {
     "start": "vue-cli-service serve --port 7006",
@@ -66,4 +66,4 @@
       "git add"
     ]
   }
-}
+}

+ 0 - 2
src/modules/portal/views/Login.vue

@@ -207,7 +207,6 @@ export default {
   },
   watch: {
     $route(to) {
-      this.loginInfo.rootOrgId = to.query.orgId;
       this.loginInfo.code = to.query.code;
     },
   },
@@ -220,7 +219,6 @@ export default {
     sessionStorage.clear();
     var params = this.$route.query;
 
-    this.loginInfo.rootOrgId = params.orgId;
     this.loginInfo.code = params.code;
   },
   methods: {

+ 1 - 1
src/modules/questions/views/ImportPaperInfo.vue

@@ -247,7 +247,7 @@ export default {
           callback: () => {
             this.$router.push({
               name: "Login",
-              query: { orgId: this.user.rootOrgId },
+              query: { code: this.user.rootOrgCode },
             });
           },
         });

+ 6 - 6
src/plugins/axios.js

@@ -58,13 +58,13 @@ const noauthUrls = [
  * */
 
 let wk_token;
-let wk_orgId;
+let wk_orgCode;
 
 function getRootOrgId() {
   if (location.hostname.includes("qmth.com.cn")) {
     return "";
   } else {
-    return "?orgId=" + (wk_orgId === undefined ? "" : wk_orgId);
+    return "?code=" + (wk_orgCode === undefined ? "" : wk_orgCode);
   }
 }
 
@@ -95,7 +95,7 @@ _$httpWith500Msg.interceptors.request.use(
               confirmButtonText: "确定",
               callback: () => {
                 // if (process.env.NODE_ENV !== "production") {
-                //   router.push("/login/" + "?orgId=" + wk_orgId);
+                //   router.push("/login/" + "?orgId=" + wk_orgCode);
                 // } else {
                 //   router.push("/login");
                 // }
@@ -108,7 +108,7 @@ _$httpWith500Msg.interceptors.request.use(
         }
         // wk_token = user.token;
         // wk_key = user.key;
-        wk_orgId = user.rootOrgId;
+        wk_orgCode = user.rootOrgCode;
       }
       if (wk_token && config.headers.common["token"] == null) {
         // config.headers.common["token"] = wk_token;
@@ -156,7 +156,7 @@ _$http.interceptors.request.use(
         }
         // wk_token = user.token;
         // wk_key = user.key;
-        wk_orgId = user.rootOrgId;
+        wk_orgCode = user.rootOrgCode;
       }
       if (wk_token && config.headers.common["token"] == null) {
         // config.headers.common["token"] = wk_token;
@@ -386,7 +386,7 @@ _$httpWithoutBar.interceptors.request.use(
         }
         // wk_token = user.token;
         // wk_key = user.key;
-        wk_orgId = user.rootOrgId;
+        wk_orgCode = user.rootOrgCode;
       }
       if (wk_token && config.headers.common["token"] == null) {
         // config.headers.common["token"] = wk_token;