学生端添加联考菜单

src/App.vue

@@ -6,22 +6,26 @@
 
 <script>
 import user from "@/http/api/user";
-import { setToken } from "@/utils/auth";
+import { setToken,getToken } from "@/utils/auth";
 import { encrypt } from "@/utils/jsencrypt";
 export default {
     name: "App",
     mounted() {
         // INFO: 本地调试，自动登录
         if (process.env.NODE_ENV === 'development') {
-            this.SubmitLogin();
+            // this.SubmitLogin();
         }
     },
     methods: {
         SubmitLogin() {
             const username = '99689820198805';
             const password = '123456';
-            const type = '2';
-            sessionStorage.setItem('schoolType', type);
+            // const type = '1';
+            const schoolType = sessionStorage.getItem('schoolType');
+            if(getToken() && schoolType){
+                return
+            }
+            sessionStorage.setItem('schoolType', schoolType || 1);
             user.loginEmailPass({
                 username: username,
                 password: encrypt(password),

src/utils/common.js

@@ -263,6 +263,6 @@ export function mmToPx(num) {
   }
   //获取当前接口地址名称
   export function getApiName(){
-    const schoolType = sessionStorage.getItem('schoolType') ?? '1';//1:单校  2:联校
-    return schoolType=='1'?'schoolReport':'jointSchoolReport'
+    const schoolType = sessionStorage.getItem('schoolType') ?? 1;//1:单校  2:联校
+    return schoolType==1?'schoolReport':'jointSchoolReport'
   }

src/views/analysisReport/studentPage/mainPage.vue

@@ -205,7 +205,13 @@ export default {
 
         //返回按钮点击
         GoBack() {
-            this.$router.push("/studentAnalysisReport/list");
+            const schoolType = sessionStorage.getItem('schoolType');
+            if(schoolType == 1){//单校
+                this.$router.push("/studentAnalysisReport/list");
+            }else{//联校
+                this.$router.push("/jointStudentAnalysisReport/list");
+            }    
+            
         },
     },
     watch: {

src/views/layout/components/Header.vue

@@ -140,6 +140,7 @@
 import { mapGetters } from "vuex";
 import bindEmail from "@/views/userInfo/components/userSetting/bindEmail.vue";
 import { encrypt } from "@/utils/jsencrypt";
+import { removeToken } from "@/utils/auth";
 export default {
   computed: {
     ...mapGetters(["userInfo"]),
@@ -299,7 +300,8 @@ export default {
       // window.location.href = `${process.env.VUE_APP_BASE}`;
       // 跳出 iframe，跳转到顶级窗口
       // window.top.location.href = `${process.env.VUE_APP_BASE}`;
-
+      sessionStorage.clear();
+      removeToken();
       window.parent.location.href = `${process.env.VUE_APP_BASE}`;
     },
 

src/views/login/login.vue

@@ -1,7 +1,7 @@
 <template></template>
 <script>
 import user from '@/http/api/user'
-import { setToken } from '@/utils/auth'
+import { setToken,getToken } from '@/utils/auth'
 // import { getToken} from '@/utils/auth';
 import { encrypt } from '@/utils/jsencrypt'
 import base from '@/http/common/base'
@@ -62,17 +62,20 @@ export default {
         console.log('打印父窗口传来的数据', event.data)
         console.log('打印父窗口的源', event.origin)
         console.log('打印当前窗口的源', window.location.origin)
+        const schoolType = sessionStorage.getItem('schoolType');
         //安全检查 验证消息来源
         if (event.origin !== window.location.origin) {
           return
         }
-
+        if(getToken() && schoolType){
+          return
+        }
         if (event.data.type === 'STU_TOKEN') {
           const userInfo = event.data.userInfo
           console.log('打印用户信息', userInfo)
           this.$store.dispatch('user/CLEAR_LOCAL_STORAGE') //清空本地存储
           setToken(userInfo.tokenValue)
-          sessionStorage.setItem('schoolType', 1) //1:单校 2:联校// 暂时写死单校   线上还是单校的
+          sessionStorage.setItem('schoolType', schoolType || 1) //1:单校 2:联校// 暂时写死单校   线上还是单校的
           this.$store.dispatch('user/SET_TOKEN', userInfo.tokenValue)
           this.$store.dispatch('user/SET_SCHOOL_LOGO', userInfo.schoolLogoUrl) //设置学校logo
           this.$store.dispatch('user/SET_SCHOOL_WEB_SITE_ID', userInfo.cloudMonitorSiteId || '') //设置学校网站id