院校库详情

src/api/webApi/professlib.js

@@ -49,11 +49,12 @@ export function getProfesslibDetails(params) {
 }
 
 // 获取推荐志愿
-export function getRecommendVoluntary(data) {
+export function getRecommendVoluntary(data,params) {
   return request({
     url: 'front/syzy/zytb/getRecommendVoluntary',
     method: 'post',
-    data:data
+    data:data,
+    params:params,
   })
 }
 
@@ -62,6 +63,6 @@ export function getVoluntaryMarjors(data) {
   return request({
     url: 'front/syzy/zytb/getVoluntaryMarjors',
     method: 'post',
-    data:data
+    data:data,
   })
 }

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

@@ -1,19 +1,10 @@
 <template>
   <div class="subject-page">
-    <el-card class="mt20 mb20" >
-      <el-breadcrumb separator="/">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/career/plan/index' }"
-        >生涯·志愿1
-        </el-breadcrumb-item
-        >
-        <el-breadcrumb-item :to="{ path: '/career/subject/index' }"
-        >选科查询
-        </el-breadcrumb-item
-        >
-        <el-breadcrumb-item>由科目选专业</el-breadcrumb-item>
-      </el-breadcrumb>
-    </el-card>
+    <evaluation-title class="mt20 mb20 box-card"
+                      navBackButton
+                      title="由科目选专业"
+                      :navAction="back"
+    ></evaluation-title>
     <el-card>
       <subject-choice></subject-choice>
     </el-card>
@@ -29,6 +20,11 @@ export default {
     return{
 
     }
+  },
+  methods:{
+    back() {
+      this.$router.go(-1)
+    }
   }
 }
 </script>

src/views/career/subject/majorChoice.vue

@@ -1,17 +1,10 @@
 <template>
   <div class="major-page">
-    <div class="breadcrumb">
-      <el-breadcrumb separator="/">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/career/plan/index' }"
-          >生涯·志愿</el-breadcrumb-item
-        >
-        <el-breadcrumb-item :to="{ path: '/career/subject/index' }"
-          >选科查询</el-breadcrumb-item
-        >
-        <el-breadcrumb-item>由专业选科目</el-breadcrumb-item>
-      </el-breadcrumb>
-    </div>
+      <evaluation-title class="mt10  box-card"
+                        navBackButton
+                        title="由专业选科目"
+                        :navAction="back"
+      ></evaluation-title>
     <div class="content-box">
       <div class="xkcx-input-box">
         <div>
@@ -217,6 +210,9 @@ export default {
     this.httpGetMarjorsList();
   },
   methods: {
+    back() {
+      this.$router.go(-1)
+    },
     httpGetXkcxYears() {
       xkcxYears().then((res) => {
         this.selected.yearList = res.data || [];

src/views/career/subject/myChoice.vue

@@ -1,17 +1,10 @@
 <template>
   <div class="my-page">
-    <el-card class="mt10 mb20 box-card">
-      <el-breadcrumb separator="/">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/career/plan/index' }"
-          >生涯·志愿</el-breadcrumb-item
-        >
-        <el-breadcrumb-item :to="{ path: '/career/subject/index' }"
-          >选科查询</el-breadcrumb-item
-        >
-        <el-breadcrumb-item>由专业选科目</el-breadcrumb-item>
-      </el-breadcrumb>
-    </el-card>
+      <evaluation-title class="mt10 mb20 box-card"
+        navBackButton
+         title="我的选科方案"
+        :navAction="back"
+      ></evaluation-title>
     <select-subject-report></select-subject-report>
   </div>
 </template>
@@ -32,8 +25,8 @@ export default {
   created() {
   },
   methods: {
-    handleClick() {
-
+    back() {
+      this.$router.go(-1)
     }
   },
 };

src/views/career/zhiyuan/NewSimulatedVolunteer.vue

@@ -27,7 +27,7 @@
       <el-button type="primary" @click="next" v-if="currentStep <= 1">下一步</el-button>
       <el-button type="primary" @click="save" v-if="currentStep > 1">保存志愿</el-button>
     </div>
-    <div :class="{'active':show,'right_cart': true}">
+    <div :class="{'active':show,'right_cart': true}" v-if="currentStep > 1">
       <div class="btn-wrap" @click="show = !show">
         当前志愿表
       </div>

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

@@ -151,18 +151,22 @@ export default {
   },
   methods: {
     expand(item) {
+      console.log(item)
       if(item.isExpand) {
         // 取消
         return
+      }else {
+        item.isExpand = true
+        this.getVoluntaryMarjors(item)
       }
-      this.getVoluntaryMarjors(item)
+
     },
     getList() {
-      const params = {
+      const data = {
         batchName: this.batch.name,
         majors: this.checkedList,
-        mode: this.formSubject.firstSubject,
-        // "mode1": "string",
+        mode: `${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
+        // mode1: string,
         pickType:  this.filter_form.pickType,
         // "rank": 0,
         score: this.formSubject.score,
@@ -177,14 +181,18 @@ export default {
           // "type": "string"
         },
       }
-      getRecommendVoluntary(params).then(res =>{
+      const pageForm = {
+        pageSize: 10,
+        pageNum:1
+      }
+      getRecommendVoluntary({ ...data }, { ...pageForm }).then(res =>{
         console.log(res)
-        const rows = res.data.map(item => {
+        const rows = res.rows.map(item => {
           item.isExpand = false
           item.majors = []
           return item
         })
-        this.rows = rows
+        this.rows = rows.splice(0,1)
       })
     },
     getVoluntaryMarjors(item) {
@@ -220,8 +228,6 @@ export default {
             throw Error('最多选择10个专业')
           }
           if(this.checkedList.findIndex(code => code == item.code) == -1 ){
-
-
             this.checkedList.push(item.code)
           }
         })

src/views/career/zhiyuan/components/zhiyuan-list.vue

@@ -11,7 +11,7 @@
           :data="scope.row.majors"
           :show-header="false"
         >
-          <el-table-column>
+          <el-table-column label="院校" width="200">
                   <template scope="major">
                     <div>
                       <p class="mb10"><span class="pointer">{{major.row.marjorName}}</span></p>
@@ -19,7 +19,7 @@
                     </div>
                   </template>
           </el-table-column>
-          <el-table-column>
+          <el-table-column label="招生计划" width="200"       align="center">
             <template scope="major">
               <div>
                 <p><span class="f18">{{ major.row.planCount || '-'}}</span>人</p>
@@ -27,6 +27,30 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="历年" width="100"   >
+            <template scope="major">
+              <div class="f14">
+                <p>录取人数</p>
+                <p>线差</p>
+                <p>最低分</p>
+                <p>最低位次</p>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            width="150"
+            :label="`${item.year}年 ${item.type}`"
+            v-for="item in tableList.length ?  tableList[0].histories : []"
+          >
+            <template scope="major">
+              <div class="f14">
+                <p>{{ major.row.histories.find(his => his.year == item.year).numReal || '-'}}</p>
+                <p>{{ major.row.histories.find(his => his.year == item.year).lineDiff || '-'}}</p>
+                <p>{{ major.row.histories.find(his => his.year == item.year).score || '-'}}</p>
+                <p>{{ major.row.histories.find(his => his.year == item.year).seat|| '-' }}</p>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
 
       </template>
@@ -44,54 +68,58 @@
 <!--        </div>-->
 <!--      </template>-->
 <!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="院校"-->
-<!--    >-->
-<!--      <template scope="scope">-->
-<!--        <div>-->
-<!--          <p class="mb10"><span class="pointer">{{scope.row.university.name}}</span></p>-->
-<!--          <p class="mb5 f-9b f12">{{scope.row.university.features.split(',').join(' ')}}</p>-->
-<!--          <p class="mb5 f-9b f12">{{scope.row.university.location}} {{scope.row.university.cityName}} 排名{{scope.row.university.ranking}}</p>-->
-<!--          <p class="f-9b f12">代码 {{scope.row.university.code}}</p>-->
-<!--        </div>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="招生计划"-->
-<!--      align="center"-->
-<!--    >-->
-<!--      <template scope="scope">-->
-<!--        <div>-->
-<!--          <p><span class="f18">{{ scope.row.recruitPlan.planCount}}</span>人</p>-->
-<!--          <p class="f-9b f12">{{scope.row.recruitPlan.course}}</p>-->
-<!--        </div>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--      label="历年"-->
-<!--    >-->
-<!--      <template scope="scope">-->
-<!--        <div class="f14">-->
-<!--          <p>录取人数</p>-->
-<!--          <p>线差</p>-->
-<!--          <p>最低分</p>-->
-<!--          <p>最低位次</p>-->
-<!--        </div>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-<!--    <el-table-column-->
-<!--       :label="`${item.year}年 ${item.type}`"-->
-<!--       v-for="item in tableList.length ?  tableList[0].histories : []"-->
-<!--    >-->
-<!--      <template scope="scope">-->
-<!--        <div class="f14">-->
-<!--          <p>{{ scope.row.histories.find(his => his.year == item.year).numReal || '-'}}</p>-->
-<!--          <p>{{ scope.row.histories.find(his => his.year == item.year).lineDiff || '-'}}</p>-->
-<!--          <p>{{ scope.row.histories.find(his => his.year == item.year).score || '-'}}</p>-->
-<!--          <p>{{ scope.row.histories.find(his => his.year == item.year).seat|| '-' }}</p>-->
-<!--        </div>-->
-<!--      </template>-->
-<!--    </el-table-column>-->
+    <el-table-column
+      label="院校"
+      width="200"
+    >
+      <template scope="scope">
+        <div>
+          <p class="mb10"><span class="pointer">{{scope.row.university.name || ''}}</span></p>
+          <p class="mb5 f-9b f12">{{scope.row.university.features.split(',').join(' ')}}</p>
+          <p class="mb5 f-9b f12">{{scope.row.university.location}} {{scope.row.university.cityName}} 排名{{scope.row.university.ranking}}</p>
+          <p class="f-9b f12">代码 {{scope.row.university.code}}</p>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="招生计划"
+      width="200"
+      align="center"
+    >
+      <template scope="scope">
+        <div>
+          <p><span class="f18">{{ scope.row.recruitPlan.planCount}}</span>人</p>
+          <p class="f-9b f12">{{scope.row.recruitPlan.course}}</p>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="历年"
+      width="100"
+    >
+      <template scope="scope">
+        <div class="f14">
+          <p>录取人数</p>
+          <p>线差</p>
+          <p>最低分</p>
+          <p>最低位次</p>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column
+       :label="`${item.year}年 ${item.type}`"
+       v-for="item in tableList.length ?  tableList[0].histories : []"
+       width="150"
+    >
+      <template scope="scope">
+        <div class="f14">
+          <p>{{ scope.row.histories.find(his => his.year == item.year).numReal || '-'}}</p>
+          <p>{{ scope.row.histories.find(his => his.year == item.year).lineDiff || '-'}}</p>
+          <p>{{ scope.row.histories.find(his => his.year == item.year).score || '-'}}</p>
+          <p>{{ scope.row.histories.find(his => his.year == item.year).seat|| '-' }}</p>
+        </div>
+      </template>
+    </el-table-column>
     <el-table-column
     label="填报"
      >
@@ -119,7 +147,7 @@
    computed:{
    },
    methods:{
-     expand(item,expandedRows) {
+     expand(item) {
         this.$emit('expand',item)
      }
    }
@@ -129,4 +157,8 @@
 .f-9b{
   color: #9b9b9b;
 }
+::v-deep .el-table__expanded-cell{
+  padding-top: 0;
+  padding-bottom: 0;
+}
 </style>