Ver Fonte

去掉导航分析报告8.0 默认跳转联考报告

liurongli há 3 meses atrás
pai
commit
d80a56b3ec
3 ficheiros alterados com 15 adições e 13 exclusões
  1. 2 2
      src/App.vue
  2. 10 8
      src/views/layout/components/Header.vue
  3. 3 3
      src/views/login/login.vue

+ 2 - 2
src/App.vue

@@ -25,7 +25,7 @@ export default {
             if(getToken() && schoolType){
                 return
             }
-            sessionStorage.setItem('schoolType', schoolType || 1);
+            sessionStorage.setItem('schoolType', schoolType || 2);
             user.loginEmailPass({
                 username: username,
                 password: encrypt(password),
@@ -37,7 +37,7 @@ export default {
                     this.$store.dispatch("user/SET_SCHOOL_LOGO", res.data.schoolLogoUrl);//设置学校logo
                     this.$store.dispatch("user/SET_SCHOOL_WEB_SITE_ID", res.data.cloudMonitorSiteId || '');//设置学校网站id
                     this.$store.dispatch("user/getUserInfoByToken");//获取用户登录信息
-                    this.$router.push("/studentAnalysisReport/list");
+                    this.$router.push("/jointStudentAnalysisReport/list");
                 }
             });
         },

+ 10 - 8
src/views/layout/components/Header.vue

@@ -113,8 +113,10 @@
               v-for="(item, index) in menuList"
               :class="{report:item.versions}"
               :key="index"
-              ><span class="menuName">{{ item.menuName }}</span><div class="versions" v-if="item.versions"><span>V</span><span>{{ item.versions }}</span></div></el-menu-item
-            >
+              >
+              <span class="menuName">{{ item.menuName }}</span>
+              <!-- <div class="versions" v-if="item.versions"><span>V</span><span>{{ item.versions }}</span></div> -->
+            </el-menu-item>
           </el-menu>
         </div>
       </div>
@@ -201,15 +203,15 @@ export default {
 
     //学生端默认 个人中心 和分析报告两个菜单
     this.menuList = [
-      {
-        menuName: "分析报告",
-        externalLink: "/studentAnalysisReport/list",
-        versions:'8.0'
-      },
+      // {
+      //   menuName: "分析报告",
+      //   externalLink: "/studentAnalysisReport/list",
+      //   versions:'8.0'
+      // },
       {
         menuName: "分析报告",
         externalLink: "/jointStudentAnalysisReport/list",
-        versions:'8.1'
+        // versions:'8.1'
       },
       {
         menuName: "个人中心",

+ 3 - 3
src/views/login/login.vue

@@ -69,7 +69,7 @@ export default {
         }
         if(getToken() && schoolType){
           const currentPath = sessionStorage.getItem('student_currentPath');//获取当前进入的路由
-          const directUrl = currentPath?currentPath:'/studentAnalysisReport/list';
+          const directUrl = currentPath?currentPath:'/jointStudentAnalysisReport/list';
           this.$router.push({ path: directUrl })
           return
         }
@@ -78,7 +78,7 @@ export default {
           console.log('打印用户信息', userInfo)
           this.$store.dispatch('user/CLEAR_LOCAL_STORAGE') //清空本地存储
           setToken(userInfo.tokenValue)
-          sessionStorage.setItem('schoolType', schoolType || 1) //1:单校 2:联校// 暂时写死单校   线上还是单校的
+          sessionStorage.setItem('schoolType', schoolType || 2) //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
@@ -89,7 +89,7 @@ export default {
             // 移除事件监听器,避免重复处理
             window.removeEventListener('message', messageHandler)
             if (userInfos.phone) {
-              const directUrl = '/studentAnalysisReport/list'
+              const directUrl = '/jointStudentAnalysisReport/list'
 
               this.$router.push({ path: directUrl })
             } else {