domain获取逻辑调整

.env

@@ -3,5 +3,4 @@ VUE_APP_DOMAIN=
 VUE_APP_TIMEOUT=600000
 VUE_APP_PAGE_SIZE=10
 VUE_APP_AUTH_TIMEOUT=72000000
-VUE_APP_SELF_DEFINE_DOMAIN=true
 VUE_APP_DEV_PROXY=http://test-school-2.teach-cloud-test.com/

src/constants/app.js

@@ -5,30 +5,24 @@ const MD5 = require("js-md5");
 // domain
 export function getOrgCode() {
   let domain;
-  if (process.env.VUE_APP_SELF_DEFINE_DOMAIN === "true") {
-    domain = window.localStorage.getItem("domain_in_url");
+  // const ipFormat = new RegExp(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/);
+  // const hostname = window.location.hostname;
+  const paramCode =
+    parseHrefParam(window.location.href, "code") ||
+    window.sessionStorage.getItem("paramDomainCode");
+  if (paramCode) {
+    domain = paramCode;
+    window.sessionStorage.setItem("paramDomainCode", domain);
+    return domain;
   }
-  if (!domain) {
-    const ipFormat = new RegExp(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/);
-    const hostname = window.location.hostname;
-    const paramCode = parseHrefParam(window.location.href, "code");
 
-    if (ipFormat.test(hostname) || paramCode) {
-      domain = paramCode || window.sessionStorage.getItem("ipDomainCode");
-      if (domain) {
-        window.sessionStorage.setItem("ipDomainCode", domain);
-      }
-    } else {
-      domain = hostname.split(".")[0];
-    }
-  }
-  console.log(domain);
+  domain = window.localStorage.getItem("domain_in_url");
+  if (domain) return domain;
+
+  domain = hostname.split(".")[0];
   return domain;
 }
 
-const ADMIN_CODE = "admin";
-export const IS_ADMIN_SYSTEM = ADMIN_CODE === getOrgCode();
-
 export const PLATFORM = "WEB";
 
 if (!localStorage.getItem("deviceId")) {

src/modules/login/views/Login.vue

@@ -187,6 +187,7 @@ export default {
     };
   },
   mounted() {
+    window.sessionStorage.removeItem("paramDomainCode");
     this.$ls.clear();
     this.setWaitingTime();
     this.getSchool();

src/modules/stmms/views/UploadStructure.vue

@@ -4,7 +4,12 @@
       <el-form ref="FilterForm" label-position="left" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期：">
-            <semester-select v-model="filter.semesterId"></semester-select>
+            <semester-select
+              v-model="filter.semesterId"
+              default-select
+              :clearable="false"
+              @default-selected="getList"
+            ></semester-select>
           </el-form-item>
           <el-form-item label="考试：">
             <exam-select

src/plugins/axios.js

@@ -178,9 +178,11 @@ const errorDataCallback = response => {
         }
 
         Vue.ls.clear();
-        const ipDomainCode = window.sessionStorage.getItem("ipDomainCode");
-        if (ipDomainCode) {
-          router.push({ name: "Login", query: { code: ipDomainCode } });
+        const paramDomainCode = window.sessionStorage.getItem(
+          "paramDomainCode"
+        );
+        if (paramDomainCode) {
+          router.push({ name: "Login", query: { code: paramDomainCode } });
         } else {
           router.push({ name: "Login" });
         }

src/router.js

@@ -101,9 +101,9 @@ router.beforeEach((to, from, next) => {
     }
 
     Vue.ls.clear();
-    const ipDomainCode = window.sessionStorage.getItem("ipDomainCode");
-    if (ipDomainCode) {
-      next({ name: "Login", query: { code: ipDomainCode } });
+    const paramDomainCode = window.sessionStorage.getItem("paramDomainCode");
+    if (paramDomainCode) {
+      next({ name: "Login", query: { code: paramDomainCode } });
     } else {
       next({ name: "Login" });
     }

src/views/Home.vue

@@ -396,9 +396,9 @@ export default {
       }
 
       this.$ls.clear();
-      const ipDomainCode = window.sessionStorage.getItem("ipDomainCode");
-      if (ipDomainCode) {
-        this.$router.push({ name: "Login", query: { code: ipDomainCode } });
+      const paramDomainCode = window.sessionStorage.getItem("paramDomainCode");
+      if (paramDomainCode) {
+        this.$router.push({ name: "Login", query: { code: paramDomainCode } });
       } else {
         this.$router.push({ name: "Login" });
       }