4级路由bug修复，

src/api/webApi/career-other.js

@@ -60,7 +60,7 @@ export function concernedMajors(params) {
 //02 移除关注专业
 export function removeConcernedMajor(params) {
   return request({
-    url: "/front/customer/marjors/list",
+    url: "/front/customer/marjors/remove",
     method: "get",
     params: params
   });

src/router/index.js

@@ -310,7 +310,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/idc/student/index'], resolve),
         name: 'studentIndex',
         meta: {
-          title: '学生单次测评数据'
+          title: '学生单次测评数据',
+          parentPath: '/daoxue/idc/student/index'
         }
       },
       {
@@ -326,7 +327,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/idc/student/ranking'], resolve),
         name: 'studentRanking',
         meta: {
-          title: '学生单次测评数据'
+          title: '学生单次测评数据',
+          parentPath: '/daoxue/idc/student/ranking'
         }
       },
       {
@@ -334,7 +336,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/idc/student/history'], resolve),
         name: 'studentHistory',
         meta: {
-          title: '学生单次测评数据'
+          title: '学生单次测评数据',
+          parentPath: '/daoxue/idc/student/history'
         }
       },
       {
@@ -445,22 +448,14 @@ export const constantRoutes = [{
         title: '竞赛信息'
       }
     },
-      {
-        path: '/video_course/video-course',
-        // component: Layout,
-        hidden: true,
-        component: (resolve) => require(['@/views/videocourse/video_course'], resolve),
-        meta: {
-          title: '视频课程首页'
-        }
-      },
       {
         path: '/video_course/detail',
         // component: Layout,
         hidden: true,
         component: (resolve) => require(['@/views/videocourse/VideoDetail'], resolve),
         meta: {
-          title: '课程详情页'
+          title: '课程详情页',
+          parentPath: '/question-center/video_course'
         }
       },
       {
@@ -469,7 +464,8 @@ export const constantRoutes = [{
         hidden: true,
         component: (resolve) => require(['@/views/questioncenter/practice'], resolve),
         meta: {
-          title: '题库中心-智能练习-试卷'
+          title: '题库中心-智能练习-试卷',
+          parentPath: '/question-center/smartExercise'
         }
       },
       {
@@ -478,7 +474,8 @@ export const constantRoutes = [{
         hidden: true,
         component: (resolve) => require(['@/views/questioncenter/AnswerDetails'], resolve),
         meta: {
-          title: '题库中心-智能练习-试卷结果'
+          title: '题库中心-智能练习-试卷结果',
+          parentPath: '/question-center/smartExercise'
         }
       },
       {
@@ -487,7 +484,8 @@ export const constantRoutes = [{
         hidden: true,
         component: (resolve) => require(['@/views/questioncenter/PaperPreview'], resolve),
         meta: {
-          title: '题库中心精品试卷-预览'
+          title: '题库中心精品试卷-预览',
+          parentPath: '/question-center/bestPaper'
         }
       },
       {
@@ -496,7 +494,8 @@ export const constantRoutes = [{
         hidden: true,
         component: (resolve) => require(['@/views/questioncenter/paper'], resolve),
         meta: {
-          title: '组卷中心生成试卷'
+          title: '组卷中心生成试卷',
+          parentPath: '/question-center/bestPaper'
         }
       }
     ]
@@ -514,52 +513,13 @@ export const constantRoutes = [{
         parentPath: '/new-gaokao/careerVideo' // 用于直接跳转时定位菜单
       }
     },
-      {
-        path: '/career/gkmc/index',
-        component: (resolve) => require(['@/views/career/zhiyuan/gkmc'], resolve),
-        name: 'gkmc',
-        meta: {
-          title: '高考名词'
-        }
-      },
       {
         path: '/career/gkmc/detail',
         component: (resolve) => require(['@/views/career/zhiyuan/gkmcDetail'], resolve),
         name: 'gkmcdetail',
         meta: {
-          title: '高考名词详情'
-        }
-      },
-      {
-        path: '/career/batch',
-        component: (resolve) => require(['@/views/career/zhiyuan/batch'], resolve),
-        name: 'batch',
-        meta: {
-          title: '批次控制线'
-        }
-      },
-      {
-        path: '/career/yfyd',
-        component: (resolve) => require(['@/views/career/zhiyuan/yfyd'], resolve),
-        name: 'yfyd',
-        meta: {
-          title: '一分一段'
-        }
-      },
-      {
-        path: '/career/ShiftLine',
-        component: (resolve) => require(['@/views/career/zhiyuan/ShiftLine'], resolve),
-        name: 'ShiftLine',
-        meta: {
-          title: '投档线'
-        }
-      },
-      {
-        path: '/career/zhiyuan/VolunteerList',
-        component: (resolve) => require(['@/views/career/zhiyuan/components/volunteerList'], resolve),
-        name: 'VolunteerList',
-        meta: {
-          title: '模拟志愿-填报记录'
+          title: '高考名词详情',
+          parentPath: '/fuzhu/words'
         }
       },
       {
@@ -567,7 +527,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/zhiyuan/RecordDetail'], resolve),
         name: 'RecordDetail',
         meta: {
-          title: '模拟志愿-记录详情'
+          title: '模拟志愿-记录详情',
+          parentPath: '/zhiyuan/volunteerList'
         }
       },
       {
@@ -583,7 +544,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/plan/CareerEvaDetail'], resolve),
         name: 'CareerEvaDetail',
         meta: {
-          title: '生涯评测-职业兴趣测评'
+          title: '生涯评测-职业兴趣测评',
+          parentPath: '/new-gaokao/myTest/CareerEva'
         }
       },
       {
@@ -591,7 +553,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/components/CareerHollandReportList'], resolve),
         name: 'CareerHollandReportList',
         meta: {
-          title: '职业兴趣测评-评测列表'
+          title: '职业兴趣测评-评测列表',
+          parentPath: '/new-gaokao/myTest/CareerEva'
         }
       },
       {
@@ -607,7 +570,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/plan/new-major-detail'], resolve),
         name: 'ProfessLibDetail',
         meta: {
-          title: '专业库详情'
+          title: '专业库详情',
+          parentPath: '/new-gaokao/three/ProfessLib'
         }
       },
       {
@@ -651,6 +615,7 @@ export const constantRoutes = [{
         name: 'UniversityDetail',
         meta: {
           title: '生涯评测-院校详情',
+          parentPath: "/new-gaokao/three/UniversitiesColleges"
         }
       },
       {
@@ -666,7 +631,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/vocation/new-detail'], resolve),
         name: 'jobDetail',
         meta: {
-          title: '职业-详情'
+          title: '职业-详情',
+          parentPath: '/new-gaokao/three/Vocation'
         }
       }
     ]
@@ -688,7 +654,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/elective/test/elective-paper'], resolve),
         name: 'ElectivePaper',
         meta: {
-          title: '选科测评试卷'
+          title: '选科测评试卷',
+          parentPath: '/new-gaokao/myTest/testSelectSubject'
         }
       },
       {
@@ -696,7 +663,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/elective/test/elective-report'], resolve),
         name: 'ElectiveReport',
         meta: {
-          title: '选科测评报告'
+          title: '选科测评报告',
+          parentPath: '/new-gaokao/myTest/testSelectSubject'
         }
       },
       {

src/views/accurateTeaching/commonAi/practise/index.vue

@@ -10,7 +10,7 @@
         <mx-search-group  justify="end" :span="6" v-model="sectionName" placeholder="请输入搜索内容" @search="getList">
         </mx-search-group>
       </div>
-      <div v-if="total">
+      <div v-if="total" id="question">
         <div class="que_item" v-for="(item, index) in queList" :key="item.id">
           <div class="que_content">
             <div class="que-content-title">
@@ -43,13 +43,13 @@
               <span>难度： 一般</span>
             </div>
             <div class="operation">
-              <div class="detail" @click="viewDetail(index)">
+              <div class="detail" @click="viewDetail(item)">
                 <img src="@/assets/images/icon_chakan.png" alt="" />
                 <span>查看详情>></span>
               </div>
             </div>
           </div>
-          <div class="pd20" v-show="item.createTime" v-html="item.answer2"></div>
+          <div class="pd20" v-show="item.expand" v-html="item.answer2"></div>
         </div>
         <pagination
           :total="total"
@@ -91,12 +91,8 @@ export default {
     handleInvalidQuery() {
 
     },
-    viewDetail(index) {
-      if (this.queList[index].createTime) {
-        this.queList[index].createTime = false;
-      } else {
-        this.queList[index].createTime = true;
-      }
+    viewDetail(item) {
+      item.expand = !item.expand
     },
     questionOptions(row) {
       return {
@@ -115,7 +111,11 @@ export default {
         ...this.pageForm
       }).then(res => {
         this.total = res.total
-        this.queList = res.rows
+        this.queList = res.rows.map(item => {
+          item.expand= false
+          return item
+        })
+        this.$nextTick(_ => this.mxGlobal.MathQueue('question'))
         this.isSearch = true
       }).finally(_ => {
         this.loading = false

src/views/career/components/CareerHollandReportList.vue

@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="mb10">
-      <el-card style="color: #5E5E5E;" ref="navBar">
-        <el-breadcrumb separator-class="el-icon-arrow-right">
-          <el-breadcrumb-item :to="{ path: '/index' }">首页</el-breadcrumb-item>
-          <el-breadcrumb-item :to="{ path: '/career/plan/CareerEva'}">生涯规划</el-breadcrumb-item>
-          <el-breadcrumb-item>测评记录</el-breadcrumb-item>
-        </el-breadcrumb>
-      </el-card>
-    </div>
+    <evaluation-title class="mb10" title="测评记录" nav-back-button></evaluation-title>
     <el-card>
       <el-table :data="tableData" script border v-loading="loading">
         <el-table-column prop="id" width="100" label="ID" align="center"></el-table-column>

src/views/career/plan/CareerEvaDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- style="padding:24px 12%;background-color:#f7f7f7;" -->
-  <div>
+  <div class="app-container">
     <div style="background-color:#fff;">
       <el-image style="width:100%;" :src="require('@/assets/images/career/career_banner.png')"></el-image>
       <div v-if="flag===false" style="padding:10px 72px;">
@@ -35,7 +35,7 @@
         </div>
       <el-row style="margin-top: 56px;margin-bottom: 60px;">
         <el-button style="background-color: #47C6A2;color: #ffffff;" @click="flag=true">开始测试</el-button>
-        <el-button style="color: #979797;">查询记录</el-button>
+        <el-button style="color: #979797;" @click="$router.push('/career/components/CareerHollandReportList')">查询记录</el-button>
       </el-row>
       </div>
       <div v-if="cereerType === 'HOLLAND' && flag===true ">

src/views/career/subject/choose-subject.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="subject-page">
+  <div class="app-container">
     <evaluation-title class="mt20 mb20 box-card"
                       navBackButton
                       title="由科目选专业"
@@ -29,7 +29,4 @@ export default {
 }
 </script>
 <style scoped>
-.subject-page {
-  padding: 0 100px;
-}
 </style>

src/views/career/subject/majorChoice.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="major-page">
+  <div class="app-container">
     <evaluation-title class="mt10  box-card"
                       navBackButton
                       title="由专业选科目"
@@ -351,15 +351,6 @@ export default {
 
 
 <style scoped>
-.breadcrumb {
-  padding: 15px 30px;
-  margin: 15px 0;
-  border-bottom: 1px solid #eee;
-  border-radius: 2px;
-  background-color: #fff;
-  box-shadow: 0 1px 2px 0 rgb(0 0 0);
-}
-
 .content-box {
   padding: 10px 40px 10px 50px;
 }

src/views/career/zhiyuan/RecordDetail.vue

@@ -1,6 +1,12 @@
 <template>
-  <div>
-    <zhiyuan-list @expand="expand" :tableList="rows" :loading="loading" :cols="cols" readonly></zhiyuan-list>
+  <div class="app-container" style="margin:0 10%">
+    <evaluation-title
+      navBackButton
+      title="志愿详情"
+    ></evaluation-title>
+    <el-card class="box-card">
+      <zhiyuan-list @expand="expand" :tableList="rows" :loading="loading" :cols="cols" readonly></zhiyuan-list>
+    </el-card>
   </div>
 </template>
 <script>

src/views/career/zhiyuan/components/volunteerList.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="mt20">
     <evaluation-title
-      navBackButton
       title="志愿填报记录"
-      :navAction="backIndex"
     ></evaluation-title>
     <mx-table :rows="tableData" :propDefines="propDefines" style="min-height: 400px;border:1px solid #f2f2f2">
       <template #temp="{row}">
@@ -80,9 +78,6 @@ export default {
     this.getZytbRecord()
   },
   methods: {
-    backIndex() {
-      this.$router.go(-1)
-    },
     goDetails(data) {
       this.$router.push({ name: 'RecordDetail', query: { data:  JSON.stringify(data) } })
     },

src/views/elective/test/elective-paper.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="fx-column">
+  <div class="fx-column app-container">
     <evaluation-title title="选科测评" nav-back-button></evaluation-title>
     <mx-paper :options="options" class="pl20 pr20 pt20 pb40"></mx-paper>
   </div>

src/views/elective/test/elective-report.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="fx-column">
+  <div class="fx-column app-container">
     <evaluation-title :title="testTypeOptions.title+'报告'" nav-back-button></evaluation-title>
     <test-report v-if="latestTestResult" :category="prevData.category" :source="latestTestResult"></test-report>
   </div>

src/views/questioncenter/components/collect.vue

@@ -108,7 +108,7 @@
                   <span>收藏</span>
                 </div>
               </div>
-              <div class="detail" @click="viewDetail(index)">
+              <div class="detail" @click="viewDetail(item)">
                 <img src="@/assets/images/icon_chakan.png" alt=""/>
                 <span>查看解析>></span>
               </div>
@@ -116,7 +116,7 @@
           </div>
           <div
             class="parse"
-            v-show="item.createTime"
+            v-show="item.expand"
             v-html="item.parse"
           ></div>
         </div>
@@ -220,7 +220,10 @@ export default {
         pageSize: this.pageForm.pageSize
       }).then((res) => {
         this.pageForm.total = res.total
-        this.collectQue = res.rows
+        this.collectQue = res.rows.map(item => {
+          item.expand = false
+          return item
+        })
         this.$nextTick(_ => this.mxGlobal.MathQueue('collect-question'))
         console.log(res)
       })
@@ -254,12 +257,8 @@ export default {
       this.pageForm.pageNum = 1
       this.getFavQuestions()
     },
-    viewDetail(index) {
-      if (this.collectQue[index].createTime) {
-        this.collectQue[index].createTime = false
-      } else {
-        this.collectQue[index].createTime = true
-      }
+    viewDetail(item) {
+      item.expand = !item.expand
     },
     // 收藏涉及的学科
     getSubjects() {
@@ -341,7 +340,7 @@ export default {
 }
 
 .parse {
-  padding: 0 30px;
+  padding: 15px 30px;
 }
 
 .que_item {

src/views/questioncenter/components/learn-record.vue

@@ -13,7 +13,7 @@
         <div class="count_item">
           <img src="" alt="" />
           <div class="count_intro">
-            <p style="color: #89928a">{{ learnInfo.videoMinutes }}</p>
+            <p style="color: #89928a">{{ formatMinute(learnInfo.videoMinutes) }}</p>
             <p class="gary">共看完视频时长（分钟）</p>
           </div>
         </div>
@@ -397,7 +397,6 @@ export default {
     }
   },
   mounted() {
-    this.getSummary();
     this.searchData();
   },
   methods:{
@@ -407,6 +406,10 @@ export default {
         console.log(res);
       });
     },
+    formatMinute(second) {
+        if(!second) return 0
+        return Math.round(second/60)
+    },
     // 数据统计-做题数量-按天
     getQuestionStatsByDay() {
       questionStatsByDay({
@@ -432,7 +435,7 @@ export default {
         let arr = [];
         const kesArr = Object.keys(res.data).sort();
         for (const key of kesArr) {
-          arr.push(res.data[key]);
+          arr.push(this.formatMinute(res.data[key]));
         }
         this.videoCount = arr;
       });
@@ -449,7 +452,7 @@ export default {
           console.log(res);
           let objArr = [];
           for (const key in res.data) {
-            objArr.push({ name: key, value: res.data[key] });
+            objArr.push({ name: key, value: this.formatMinute(res.data[key]) });
           }
           this.vidSubCount= objArr;
         } else {
@@ -519,18 +522,15 @@ export default {
       });
     },
     searchData() {
-      console.log(this.dateForm);
+      this.getSummary()
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.getQuestionStatsByDay();
           this.getVideoStatsByDay();
           this.getQuestionStatsBySubject();
           this.getVideoStatsBySubject();
-
           this.getVideoRecord();
           this.getKnowRecords();
-          /* this.getVideoStatsByDay();
-          this.getQuestionStatsBySubject(); */
         } else {
           console.log("error submit!!");
           return false;

src/views/questioncenter/components/mistake.vue

@@ -48,7 +48,7 @@
                   <span>删除错题</span>
                 </div>
               </div>
-              <div class="detail" @click="viewWrongDetail(index)">
+              <div class="detail" @click="viewWrongDetail(item)">
                 <img src="@/assets/images/icon_chakan.png" alt="" />
                 <span>查看解析>></span>
               </div>
@@ -56,7 +56,7 @@
           </div>
           <div
             class="parse"
-            v-show="item.createTime"
+            v-show="item.expand"
             v-html="item.parse"
           ></div>
         </div>
@@ -97,12 +97,8 @@ export  default {
     }
   },
   methods:{
-    viewWrongDetail(index) {
-      if (this.wrongList[index].createTime) {
-        this.wrongList[index].createTime = false;
-      } else {
-        this.wrongList[index].createTime = true;
-      }
+    viewWrongDetail(item) {
+      item.expand = !item.expand
     },
     onChangePage(page) {
       this.pageForm.pageSize = page.limit
@@ -126,7 +122,10 @@ export  default {
         pageSize: this.pageForm.pageSize,
         pageNum: this.pageForm.pageNum,
       }).then((res) => {
-        this.wrongList = res.rows;
+        this.wrongList = res.rows.map(item => {
+          item.expand = false
+          return item
+        });
         this.total = res.total;
         this.$nextTick(_=>this.mxGlobal.MathQueue('wrong-question'))
       });
@@ -139,7 +138,7 @@ export  default {
 </script>
 <style scoped>
 .parse {
-  padding: 0 30px;
+  padding: 15px 30px;
 }
 .option {
   padding-left: 33px;

src/views/questioncenter/operationVideo.vue

@@ -24,7 +24,7 @@ export default {
   methods: {
     getOperationManual(){
       getOperationManual({
-        nameType:6
+        nameType:1
       }).then(res => {
         conole.log(res)
       })