新高考选科首页

src/assets/styles/common.scss

@@ -758,3 +758,14 @@
 }
 
 
+// 首页内容宽度
+.app-content{
+  width: 1350px;
+  margin: 0 auto;
+  padding-bottom: 20px;
+  margin-top: 20px;
+}
+.app-back{
+  background: #f5f4f9;
+}
+

src/views/career/components/CollegesLine.vue

@@ -75,8 +75,10 @@ import {
   selectMarjorList,
 } from '@/api/webApi/shiftLine'
   import SelectUniversity from '@/views/career/components/SelectUniversity'
+import transferMixin from '@/components/mx-transfer-mixin'
   export default {
     name: "CollegesLine",
+    mixins:[transferMixin],
     components:{SelectUniversity},
     data() {
       return {
@@ -112,7 +114,7 @@ import {
     },
     methods: {
       goDetails(item){
-        this.$router.push({path:'/career/plan/UniversityDetail',query: {code:item.universityCode}})
+        this.transferTo('/career/plan/UniversityDetail',{code:item.universityCode})
       },
       getMarjorList(){
 

src/views/career/components/UniversitiesLineTable.vue

@@ -2,7 +2,7 @@
   <div id="lineTable" >
     <mx-table :prop-defines="propsDefine" :rows="tableList" border>
       <template #temp="{row}">
-        <el-link  :underline="false" @click="goDetails(row)">
+        <el-link  :underline="false" @click="toDetail(row)">
           {{row.collegeCode}}  {{row.universityName}}
         </el-link>
         <p v-if="row.collegeRemark">{{`(${row.collegeRemark})` }}</p>
@@ -15,12 +15,14 @@
 </template>
 <script>
 import MxSearchGroup from '@/components/MxSearch/mx-search-group'
+import transferMixin from '@/components/mx-transfer-mixin'
 
 export default {
   name: 'UniversitiesLineTable',
   components: {
     MxSearchGroup
   },
+  mixins:[transferMixin],
   props: {
     tableList: {
       type: Array,
@@ -63,9 +65,9 @@ export default {
     }
   },
   methods:{
-    goDetails(item){
-      this.$router.push({path:'/career/plan/UniversityDetail',query: {code:item.universityCode}})
-    }
+    toDetail(item) {
+      this.transferTo('/career/plan/UniversityDetail',{code:item.universityCode})
+    },
   }
 }
 </script>

src/views/career/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="app-back">
+    <div class="banner">
+      <el-image style="width: 100vw" :src="require('@/assets/images/zhiyuan_banner.png')" fit="none"></el-image>
+    </div>
+    <div class="app-content">
+      <index-card title="数据查询" class="mb20">
+        <el-row :gutter="20">
+          <el-col class="relative "   :span="4" v-for="item in plan" >
+            <div class="plan_item pointer" @click="$router.push(item.path)">
+              <div class="img-wrap">
+                <img  :src="item.img"/>
+              </div>
+            </div>
+            <p class="bold text-center" >{{ item.title }}</p>
+          </el-col>
+        </el-row>
+      </index-card>
+      <index-card title="模拟志愿" class="mb20">
+        <el-steps :active="0" finish-status="success">
+          <el-step title="选择批次"></el-step>
+          <el-step title="填报批次"></el-step>
+          <el-step title="院校专业"></el-step>
+          <el-step title="保存志愿"></el-step>
+        </el-steps>
+        <el-row :gutter="40" class="mt60">
+          <el-col :span="12" class="text-right">
+           <el-button type="primary" @click="$router.push('/zhiyuan/SimulatedVolunteer')">进入填报</el-button>
+          </el-col>
+          <el-col :span="12" class="text-left">
+            <el-button type="primary" @click="$router.push('/zhiyuan/volunteerList')">我的志愿</el-button>
+          </el-col>
+        </el-row>
+      </index-card>
+      <index-card-news-single type="高考政策" morePath="/fuzhu/newGaokaoNews"  />
+    </div>
+  </div>
+</template>
+<script>
+import IndexCard from '@/views/index/components/index-card.vue'
+import MxImageWrap from '@/views/questioncenter/components/main-card/mx-image-wrap.vue'
+import IndexCardNewsSingle from '@/views/index/components/index-card-news-single'
+export default {
+  components: { IndexCard, MxImageWrap,IndexCardNewsSingle },
+  data() {
+    return {
+      plan: [
+        {
+          title: '批次控制线',
+          img: require('@/assets/images/zhiyuan_batch.png'),
+          path: '/zhiyuan/batch'
+        },
+        {
+          title: '投档线',
+          img: require('@/assets/images/zhiyuan_tdx.png'),
+          path: '/zhiyuan/ShiftLine'
+        },
+        {
+          title: '一分一段',
+          img: require('@/assets/images/zhiyuan_yfyd.png'),
+          path: '/zhiyuan/yfyd'
+        },
+        {
+          title: '招生计划',
+          img: require('@/assets/images/zhiyuan_plan.png'),
+          path: '/zhiyuan/enrollPlan'
+        },
+        {
+          title: '高考政策',
+          img: require('@/assets/images/zhiyuan_gkzc.png'),
+          path: '/fuzhu/newGaokaoNews'
+        },
+        {
+          title: '院校查询',
+          img: require('@/assets/images/zhiyuan_yxcx.png'),
+          path: '/new-gaokao/three/UniversitiesColleges'
+        },
+      ]
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped lang="scss">
+.plan_item{
+  padding: 20px;
+  border: 1px solid #C5C5C5;
+  margin-bottom: 20px;
+  border-radius: 4px;
+  height: 134px;
+  .img-wrap{
+    width: 100%;
+    height: 100%;
+    text-align: center;
+  }
+  &:hover{
+    background: #00CCB4;
+    border: 1px solid #00CCB4;
+  }
+}
+</style>

src/views/career/main.vue

@@ -17,7 +17,7 @@
           </div>
         </div>
       </index-card>
-      <index-news-single-wrapper class="mb20 index-block"/>
+      <index-card-news-single type="单招志愿" morePath="/fuzhu/volunteering_single"  />
     </div>
   </div>
 </template>
@@ -29,9 +29,10 @@ import IndexNewsSingleWrapper from '@/views/index/components/index-news-single-w
 import IndexCardGksp from '@/views/index/components/index-card-gksp'
 import IndexCardGktf from '@/views/index/components/index-card-gktf'
 import { list } from '@/api/webApi/career-other'
+import IndexCardNewsSingle from '@/views/index/components/index-card-news-single'
 
 export default {
-  components: { IndexCard, MxImageWrap, IndexNewsTopWrapper, IndexCardGksp, IndexCardGktf,IndexNewsSingleWrapper },
+  components: { IndexCard, MxImageWrap, IndexNewsTopWrapper, IndexCardGksp, IndexCardGktf,IndexCardNewsSingle },
   created() {
     list().then(res => {
         this.nounList.map(item => {

src/views/career/plan/UniversitiesDetail.vue

@@ -181,10 +181,12 @@
 <script>
 import EnrollList from './compoents/EnrollList'
 import UniversityStyle from './compoents/UniversityStyle'
-import { evaluateType, saveUniversitiesHits, selectUniversityDetail } from '@/api/webApi/career-course'
+import { evaluateType, selectUniversityDetail } from '@/api/webApi/career-course'
+import transferMixin from '@/components/mx-transfer-mixin'
 
 export default {
   name: 'UniversityDetail',
+  mixins: [transferMixin],
   components: { EnrollList, UniversityStyle },
   data() {
     return {
@@ -245,7 +247,7 @@ export default {
     }
   },
   created() {
-    this.code = this.$route.query.code
+    this.code = this.prevData.code
     // this.getHit()
     this.getDetail()
     this.getEvaluateType()

src/views/career/plan/compoents/AllUniversity.vue

@@ -44,7 +44,9 @@
 import FilterForm from '@/views/career/components/FilterForm';
 import { selectUniversityList } from '@/api/webApi/career-course'
 import MxSearchGroup from '@/components/MxSearch/mx-search-group'
+import transferMixin from '@/components/mx-transfer-mixin'
 export default {
+  mixins:[transferMixin],
   components: { MxSearchGroup,FilterForm },
   data() {
     return {
@@ -78,8 +80,7 @@ export default {
   },
   methods: {
     toDetail(item) {
-      console.log(item)
-      this.$router.push({path:'/career/plan/UniversityDetail',query: {code:item.code}})
+      this.transferTo('/career/plan/UniversityDetail',{code:item.code})
     },
     onChangePage(page) {
       this.pageForm.pageSize = page.limit

src/views/career/plan/compoents/OpenCollege.vue

@@ -48,7 +48,9 @@
 import FilterForm from '@/views/career/components/FilterForm';
 import { getUniversityByCode } from '@/api/webApi/career-course'
 import MxSearchGroup from '@/components/MxSearch/mx-search-group'
+import transferMixin from '@/components/mx-transfer-mixin'
 export default {
+  mixins:[transferMixin],
   components: { MxSearchGroup,FilterForm },
   props:{
     code:{
@@ -91,8 +93,7 @@ export default {
       this.filter_form.name = this.collegeName
     },
     toDetail(item) {
-      console.log(item)
-      this.$router.push({path:'/career/plan/UniversityDetail',query: {code:item.university.code}})
+      this.transferTo('/career/plan/UniversityDetail',{code:item.university.code})
     },
     getUniversityByCode() {
       getUniversityByCode({...this.filter_form,code:this.code,...this.pageForm}).then(res =>{

src/views/career/plan/compoents/RankUniversity.vue

@@ -65,7 +65,9 @@
 import { mapState } from 'vuex';
 import { rankingFilter,universitiesRanking } from '@/api/webApi/career-course'
 import MxSearchGroup from '@/components/MxSearch/mx-search-group'
+import transferMixin from '@/components/mx-transfer-mixin'
 export default {
+  mixins:[transferMixin],
   components: { MxSearchGroup },
   data() {
     return {
@@ -124,7 +126,7 @@ export default {
     },
     toDetail(item) {
       console.log(item)
-      this.$router.push({path:'/career/plan/UniversityDetail',query: {code:item.collegeCode}})
+      this.transferTo('/career/plan/UniversityDetail',{code:item.collegeCode})
     },
     onChangePage(page) {
       this.pageForm.pageSize = page.limit

src/views/career/plan/enrollPlan.vue

@@ -36,7 +36,7 @@
             </mx-search-group>
             <mx-table :prop-defines="propDefines" :rows="rows">
               <template #name="{row}">
-                <span class="pointer" @click="$router.push(`/career/plan/UniversityDetail?code=${row.universityCode}`)">{{row.universityName}}</span>
+                <span class="pointer" @click="toDetail(row)">{{row.universityName}}</span>
               </template>
               <template #temp="{row}">
                   <p>{{`[${row.marjorBelongs}]`}}{{row.marjorName}}</p>
@@ -64,7 +64,9 @@ import {
   recruitPlanTypes,
   recruitPlan
 } from '@/api/webApi/shiftLine'
+import transferMixin from '@/components/mx-transfer-mixin'
 export default {
+  mixins:[transferMixin],
   components:{SelectUniversity,MxSearchGroup,MxSelect},
   data(){
     return {
@@ -131,6 +133,9 @@ export default {
     }
   },
   methods:{
+    toDetail(item){
+      this.transferTo('/career/plan/UniversityDetail',{code:item.universityCode})
+    },
     search() {
       if(this.form.universityCode == ''  ) {
         this.$message.warning('请先选择院校')

src/views/elective/main.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="app-back">
+    <div class="banner">
+      <el-image style="width: 100vw" :src="require('@/assets/images/elective_banner.png')" fit="none"></el-image>
+    </div>
+    <div class="app-content">
+      <index-card-subject-query class="mt20 index-block"/>
+      <index-card-elective-test class="mt20 index-block"/>
+      <index-card-career class="mt20 index-block"/>
+      <!--  三库 -->
+      <index-card-colleage class="mt20"></index-card-colleage>
+      <!--  资讯 -->
+      <index-card-news-single class="mt20" type="高考政策" morePath="/fuzhu/newGaokaoNews"  />
+      <!--  大数据选科   -->
+      <index-card-elective class="mt20"></index-card-elective>
+    </div>
+  </div>
+</template>
+<script>
+import IndexCardCareer from '@/views/index/components/index-card-career'
+import IndexCardElectiveTest from '@/views/index/components/index-card-elective-test'
+import IndexCardSubjectQuery from '@/views/index/components/index-card-subject-query'
+import IndexCardNewsSingle from '@/views/index/components/index-card-news-single'
+import IndexCard from '@/views/index/components/index-card'
+import IndexCardColleage from '@/views/index/components/index-card-colleage'
+import IndexCardElective from '@/views/index/components/index-card-elective'
+
+export default {
+  components: {
+    IndexCardNewsSingle,
+    IndexCardElectiveTest,
+    IndexCardSubjectQuery,
+    IndexCardCareer,
+    IndexCard,
+    IndexCardElective,
+    IndexCardColleage
+  },
+  data() {
+    return {
+      plan: [
+        {
+          title: '批次控制线',
+          img: require('@/assets/images/zhiyuan_batch.png'),
+          path: '/zhiyuan/batch'
+        },
+        {
+          title: '投档线',
+          img: require('@/assets/images/zhiyuan_tdx.png'),
+          path: '/zhiyuan/ShiftLine'
+        },
+        {
+          title: '一分一段',
+          img: require('@/assets/images/zhiyuan_yfyd.png'),
+          path: '/zhiyuan/yfyd'
+        },
+        {
+          title: '招生计划',
+          img: require('@/assets/images/zhiyuan_plan.png'),
+          path: '/zhiyuan/enrollPlan'
+        },
+        {
+          title: '高考政策',
+          img: require('@/assets/images/zhiyuan_gkzc.png'),
+          path: '/fuzhu/newGaokaoNews'
+        },
+        {
+          title: '院校查询',
+          img: require('@/assets/images/zhiyuan_yxcx.png'),
+          path: '/new-gaokao/three/UniversitiesColleges'
+        },
+      ]
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped lang="scss">
+.plan_item{
+  padding: 20px;
+  border: 1px solid #C5C5C5;
+  margin-bottom: 20px;
+  border-radius: 4px;
+  height: 134px;
+  .img-wrap{
+    width: 100%;
+    height: 100%;
+    text-align: center;
+  }
+  &:hover{
+    background: #00CCB4;
+    border: 1px solid #00CCB4;
+  }
+}
+</style>

src/views/evaluating/main.vue

@@ -6,7 +6,7 @@
     <div class="content">
       <index-card title="在线试卷" class="mb20">
         <el-row :gutter="20">
-         <el-col :span="8"  v-for="item in onLinePaper" >
+         <el-col :span="8"  v-for="item in onLinePaper">
           <div class="wrap-item fx-row jc-between ai-center">
             <div class="left mr30" >
               <el-image :src="item.img"></el-image>
@@ -18,7 +18,7 @@
               </div>
               <p class="mt20 mb20" style="color:#CECECE">少儿数字内容</p>
               <div>
-                <el-button type="primary">立即查询</el-button>
+                <el-button type="primary" @click="$router.push(item.path)">立即查询</el-button>
               </div>
             </div>
           </div>
@@ -27,7 +27,7 @@
       </index-card>
       <index-card title="学情分析" class="mb20">
         <el-row :gutter="20">
-          <el-col :span="8"  v-for="item in onLinePaper" >
+          <el-col :span="8"  v-for="item in idc" @click="$router.push(item.path)">
             <div class="wrap-item fx-row jc-between ai-center">
               <div class="left mr30" >
                 <el-image :src="item.img"></el-image>
@@ -39,7 +39,7 @@
                 </div>
                 <p class="mt20 mb20" style="color:#CECECE">少儿数字内容</p>
                 <div>
-                  <el-button type="primary">立即查询</el-button>
+                  <el-button type="primary" @click="$router.push(item.path)">立即查询</el-button>
                 </div>
               </div>
             </div>
@@ -66,19 +66,36 @@ export default {
         {
           title: '个人测评',
           img: require('@/assets/images/personal_eval.png'),
-          path: '/personalDatabase/personalResources/index'
+          path: '/daoxue/evaluating/personal/index_3'
         },
         {
           title: '真题测评',
-          img: require('@/assets/images/school_eval.png'),
-          path: '/personalDatabase/schoolResources/index'
+          img: require('@/assets/images/past_eval.png'),
+          path: '/daoxue/evaluating/past/index_5'
         },
         {
           title: '学校测评',
-          img: require('@/assets/images/past_eval.png'),
-          path: '/personalDatabase/cloudTank/index'
+          img: require('@/assets/images/school_eval.png'),
+          path: '/daoxue/evaluating/school/index_1'
         },
       ],
+      idc: [
+        {
+          title: '个人测评',
+          img: require('@/assets/images/personal_idc.png'),
+          path: '/daoxue/idc/eval/index_3'
+        },
+        {
+          title: '真题测评',
+          img: require('@/assets/images/past_idc.png'),
+          path: '/daoxue/idc/eval/index_5'
+        },
+        {
+          title: '学校测评',
+          img: require('@/assets/images/school_idc.png'),
+          path: '/daoxue/idc/eval/school/index_1'
+        },
+      ]
     }
   },
   methods: {

src/views/index/components/index-card-colleage.vue

@@ -0,0 +1,83 @@
+<template>
+  <index-card title="院校排名" more-text="更多" @more="handleMore">
+    <index-card-content :list="list" :line-size="lineSize">
+      <template #default="{item}">
+        <index-image-item v-bind="item" ></index-image-item>
+      </template>
+    </index-card-content>
+  </index-card>
+</template>
+
+<script>
+import IndexCard from '@/views/index/components/index-card'
+import IndexCardContent from '@/views/index/components/index-card-content'
+import IndexImageItem from '@/views/index/components/index-image-item'
+import transferMixin from '@/components/mx-transfer-mixin'
+import loginCheckMixin from '@/views/components/blocks/index-login-interceptor-mixin'
+import { selectUniversityList } from '@/api/webApi/career-course'
+
+export default {
+  mixins: [transferMixin, loginCheckMixin],
+  name: 'index-card-career',
+  components: { IndexImageItem, IndexCardContent, IndexCard },
+  data() {
+    return {
+      morePath: '/new-gaokao/three/UniversitiesColleges',
+      list: [],
+      lineSize: 6,
+      queryParams: {
+        location:'',
+        natureTypeCN:'',
+        type:'',
+        level:'',
+        features:'',
+        name:'',
+        pageNum: 1,
+        pageSize: 12,
+      }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      selectUniversityList({
+        ...this.queryParams
+      }).then(res=>{
+        this.list =res.rows.map((item, idx)  => {
+          const path = '/career/plan/UniversityDetail'
+          const nextParams = {
+            code: item.code,
+          }
+          return {
+            title: item.name,
+            src: item.logo,
+            imgStyle:{
+              width:'130px',
+              height:'130px',
+            },
+            wrapStyle:{
+              display:'flex',
+              alignItems:'center',
+              flexDirection: 'column'
+            },
+            path: path,
+            nextData: nextParams,
+            class: idx >= this.lineSize ? ['mt15'] : [],
+            titleClasses: ['width100','text-center','mt5','f-666', 'pf', 'f14', 'text-ellipsis']
+          }
+        })
+      })
+    },
+    async handleMore() {
+      await this.loginCheck()
+      this.transferTo(this.morePath)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/index/components/index-card-elective.vue

@@ -1,18 +1,107 @@
 <template>
-  <index-card>
-    <div>内容</div>
+  <index-card title="大数据选科" >
+    <index-card-content :list="list" :line-size="lineSize">
+      <template #default="{item}">
+        <index-image-item v-bind="item" ></index-image-item>
+      </template>
+    </index-card-content>
   </index-card>
 </template>
 
 <script>
 import IndexCard from '@/views/index/components/index-card'
 import loginCheckMixin from '@/views/components/blocks/index-login-interceptor-mixin'
+import IndexImageItem from '@/views/index/components/index-image-item'
+import IndexCardContent from '@/views/index/components/index-card-content'
 
 export default {
+  components: { IndexImageItem, IndexCardContent, IndexCard },
   mixins: [loginCheckMixin],
   name: 'index-card-elective',
-  components: { IndexCard },
-  methods: {}
+  methods: {},
+  data() {
+    return {
+      lineSize:4,
+      list:[
+        {
+          title: '智能选科报名',
+          src: require('@/assets/images/elective_apply.png'),
+          desc:'通过意向的院校和专业推荐选科方案',
+          path: '/new-gaokao/bigdataSelectCourse/round-select',
+          titleStyle:{
+            top:'37px',
+            left:'37px',
+            fontSize: '24px',
+            color:"#000"
+          },
+          descStyle:{
+            top:'70px',
+            left:'37px',
+            color:"#000"
+          },
+          titleClasses:['absolute','bold'],
+          descClasses:['absolute','bold','f12']
+        },
+        {
+          title: '个人分班信息',
+          src: require('@/assets/images/elective_dispatch.png'),
+          desc:'通过意向的院校和专业推荐',
+          path: '/new-gaokao/bigdataSelectCourse/personalDivideClass',
+          titleStyle:{
+            top:'37px',
+            left:'37px',
+            fontSize: '24px',
+            color:"#000"
+          },
+          descStyle:{
+            top:'70px',
+            left:'37px',
+            color:"#000"
+          },
+          titleClasses:['absolute','bold'],
+          descClasses:['absolute','bold','f12']
+        },
+        {
+          title: '个人选科报告',
+          src: require('@/assets/images/elective_report.png'),
+          desc:'通过大学/专业维度查询选考科目要求',
+          path: '/new-gaokao/bigdataSelectCourse/personalSelectCourseReport',
+          titleStyle:{
+            top:'37px',
+            left:'37px',
+            fontSize: '24px',
+            color:"#000"
+          },
+          descStyle:{
+            top:'70px',
+            left:'37px',
+            color:"#000"
+          },
+          titleClasses:['absolute','bold'],
+          descClasses:['absolute','bold','f12']
+        },
+        {
+          title: '个人课程表',
+          src: require('@/assets/images/elective_table.png'),
+          desc:'通过意向的院校和专业推荐',
+          path: '',
+          titleStyle:{
+            top:'37px',
+            left:'37px',
+            fontSize: '24px',
+            color:"#000"
+          },
+          descStyle:{
+            top:'70px',
+            left:'37px',
+            color:"#000"
+          },
+          titleClasses:['absolute','bold'],
+          descClasses:['absolute','bold','f12']
+        }
+      ]
+    }
+  }
 }
 </script>
 

src/views/index/components/index-image-item.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="width100 relative pointer" @click="handleItem">
-    <el-image :src="src" fit="contain"/>
+  <div class="width100 relative pointer" :style="wrapStyle" @click="handleItem">
+    <el-image :src="src" fit="contain" :style="imgStyle"/>
     <div :class="titleClasses" :style="titleStyle">
       {{ title }}
     </div>
@@ -44,6 +44,14 @@ export default {
         bottom: '30px'
       })
     },
+    imgStyle:{
+      type: Object,
+      default: () => ({})
+    },
+    wrapStyle:{
+      type: Object,
+      default: () => ({})
+    },
     descClasses: {
       type: Array,
       default: () => ['absolute', 'fx-row', 'fx-cen-cen', 'f-fff', 'pf', 'f24']