增加学生端工作台跳转兼容 优化退出逻辑

src/http/common/base.js

@@ -3,6 +3,6 @@ const base = {
   prefix: process.env.NODE_ENV == "production"?process.env.VUE_APP_BASE_API:"",
   prefix1: process.env.NODE_ENV == "production"?process.env.VUE_APP_BASE:"",
   baseUrl:process.env.VUE_APP_BASE_API,
-  STUDENT_LOGIN:process.env.NODE_ENV == "production"?process.env.VUE_APP_STUDENT_LOGIN:'https://dev3.k12100.net'
+  STUDENT_LOGIN:process.env.NODE_ENV == "production"?process.env.VUE_APP_STUDENT_LOGIN:'https://index.k12100.net'
 }
 export default base

src/router/index.js

@@ -23,6 +23,13 @@ let constantRoutes = [
             title: "login",
         },
     },
+    {
+        path: "/logins",
+        component: () => import("@/views/login/logins.vue"),
+        meta: {
+            title: "logins",
+        },
+    },
     // 个人中心
     {
         path: "/userInfo",

src/store/modules/user.js

@@ -163,7 +163,11 @@ const actions = {
         commit('SET_TOKEN', '')
         removeToken()
         localStorage.clear();//清楚本地所有缓存
-        window.location.href = base.STUDENT_LOGIN;//跳转到教师端登录页面
+        //学生退出地址 到考阅登录页
+        let url=base.STUDENT_LOGIN+'/marking/#/';
+
+        console.log("打印退出地址",url);
+        // window.location.href = url;//跳转到教师端登录页面
         resolve()
        
       }).catch(error => {

src/views/layout/components/Header.vue

@@ -293,21 +293,24 @@ export default {
     },
     UserCommand(command) {
       if (command == "logout") {
-        this.logout();
+        this.Logout();
       } else if (command == "setPassWord") {
         this.OpenUpdatePassWord();
       } else if (command == "bindUserEmail") {
         this.setBindEmail();
       }
     },
-    logout() {
-      this.$store.dispatch("user/logout");//暂不调用退出接口，直接跳转到登录页面
-      // window.location.href = `${process.env.VUE_APP_BASE}`;
-      // 跳出 iframe，跳转到顶级窗口
-      // window.top.location.href = `${process.env.VUE_APP_BASE}`;
+
+    // 退出登录
+    Logout() {
+   
       sessionStorage.clear();
       removeToken();
-      window.parent.location.href = `${process.env.VUE_APP_BASE}`;
+      let url=process.env.VUE_APP_BASE+'/marking/#/login';//退出到考阅登录页
+      console.log('退出登录',url);
+      // window.location.href = url;
+      window.location.replace(url)
+      window.parent.location.href = `${process.env.VUE_APP_BASE}/marking/#/login`;//兼容父级iframe
     },
 
     //打开修改密码弹窗

src/views/login/login_ruoyan.vue

@@ -459,7 +459,8 @@ export default {
         user
           .studentLogin({
             password: encrypt(this.passWord.trim()),
-            username: this.userName.trim()
+            username: this.userName.trim(),
+            deviceType: 'PC'
           })
           .then(res => {
             this.loadingLogin = false
@@ -472,9 +473,8 @@ export default {
               this.$store.dispatch('user/SET_SCHOOL_LOGO', userInfo.schoolLogoUrl) //设置学校logo
               this.$store.dispatch('user/SET_SCHOOL_WEB_SITE_ID', userInfo.cloudMonitorSiteId || '') //设置学校网站id
               this.$store.dispatch('user/getUserInfoByToken') //获取用户登录信息
-
-              const directUrl = '/studentAnalysisReport/list'
-              this.$router.push({ path: directUrl })
+              this.$router.push("/jointStudentAnalysisReport/list");
+            
             } else {
               this.$message({
                 message: res.msg,

src/views/login/logins.vue

@@ -0,0 +1,49 @@
+<template>
+
+</template>
+<script>
+// 工作台过来的登录
+import user from '@/http/api/user'
+import { setToken,getToken } from '@/utils/auth'
+
+export default {
+  data() {
+    return {}
+  },
+  mounted() {
+
+    this.GetUserInfo()
+  },
+  methods: {
+
+
+    //获取用户信息
+    GetUserInfo() {
+
+          
+        const token=localStorage.getItem('token');//获取token
+        setToken(token);
+        this.$store.dispatch('user/getUserInfoByToken').then(user => {
+
+         
+            sessionStorage.setItem('schoolType', 2) //1:单校 2:联校// 暂时写死单校   线上还是单校的
+
+            let userInfos = this.$store.state.user.userInfo
+            if (userInfos.phone) {
+              const directUrl = '/jointStudentAnalysisReport/list'
+
+              this.$router.push({ path: directUrl })
+            } else {
+              this.$router.push({ path: '/userInfo/personInfo' })
+            
+            }
+        }) //获取用户登录信息
+       
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@use '@/styles/login.scss';
+</style>