yfyd、batch 调整

src/views/career/zhiyuan/yfyd.vue

@@ -20,12 +20,19 @@
     <el-card>
       <mx-search-group class="mb10" justify="end" :span="6" v-model="scoreRank" placeholder="请输入分数或位次" @search="getList"
       ></mx-search-group>
-      <mx-condition ref="condition" :query-params="queryParams" @query="handleQuery"
+      <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
                     @invalid="handleInvalidQuery"
       ></mx-condition>
       <div class="content">
         <div class="table-wrap" v-loading="loading">
-          <mx-table :rows="batchData" :propDefines="propDefines"></mx-table>
+          <mx-table :rows="batchData" :propDefines="propDefines">
+            <template #rank="{row}">
+              <p>{{row.highestRank}}~{{row.lowestRank}}</p>
+            </template>
+            <template #score="{row}">
+              <p>{{row.score}}~{{row.maxScore}}</p>
+            </template>
+          </mx-table>
         </div>
 
         <pagination :total="pageForm.total" :autoScroll="false" @pagination="onChangePage" :page.sync="pageForm.pageNum"
@@ -41,7 +48,7 @@ import { yfydList } from '@/api/webApi/career-other'
 import MxCondition from '@/components/MxCondition/mx-condition'
 import MxSearchGroup from '@/components/MxSearch/mx-search-group'
 import Pagination from '@/components/Pagination'
-
+import { mapGetters } from 'vuex'
 export default {
   components: {
     MxCondition,
@@ -56,6 +63,7 @@ export default {
         yfydYear: '',
         yfydMode: ''
       },
+      requireFields:['yfydYear'],
       pageForm: { pageNum: 1, pageSize: 10, total: 0 },
       backimg:
         'url(' + require('@/assets/images/career/icon_colleges.png') + ')',
@@ -72,16 +80,12 @@ export default {
           label: '科类'
         },
         score: {
-          label: '最低分数'
-        },
-        maxScore: {
-          label: '最高分数'
+          label: '分数',
+          slot:'score'
         },
         lowestRank: {
-          label: '最低位次'
-        },
-        highestRank: {
-          label: '最高位次'
+          label: '位次',
+          slot:'rank'
         },
         num: {
           label: '人数'
@@ -93,6 +97,10 @@ export default {
     }
   },
   created() {
+    this.queryParams.yfydLocation = this.currentUser.provinceName
+  },
+  computed:{
+    ...mapGetters(['currentUser']),
   },
   methods: {
     getList() {

src/views/system/user/profile/round-select.vue

@@ -19,19 +19,22 @@
       </el-row>
     </el-card>
     <!--  自选专业 推荐专业  -->
-    <select-subject class="mt20" :evaluationMajors="evaluationMajors" :optionalMajors="optionalMajors"
-                    :list="activeModel ? activeModel.models : []"></select-subject>
-    <!--  选科报名表  -->
-    <el-card class="box-card mt20" v-if="allowSelect">
-      <template #header>
-        <elective-generation-steps v-if="selectObj" v-model="activeStep" :generation="generation"
-                                   disable-hidden-feature></elective-generation-steps>
-      </template>
-      <report-table v-if="activeModel&&activeModel.models" :generation="generation"
-                    :optional-majors="optionalMajors"></report-table>
-      <evaluation-empty v-else :shadow="false" :title="emptyTitle"></evaluation-empty>
-    </el-card>
-    <evaluation-empty v-else  title="选科未开启"></evaluation-empty>
+    <div v-if="allowSelect" >
+      <select-subject class="mt20" :evaluationMajors="evaluationMajors" :optionalMajors="optionalMajors"
+                      :list="activeModel ? activeModel.models : []"></select-subject>
+      <!--  选科报名表  -->
+      <el-card class="box-card mt20" >
+        <template #header>
+          <elective-generation-steps v-if="selectObj" :generation="generation"
+                                     disable-hidden-feature></elective-generation-steps>
+        </template>
+        <report-table v-if="activeModel&&activeModel.models" :generation="generation"
+                      :optional-majors="optionalMajors"></report-table>
+        <evaluation-empty v-else :shadow="false" :title="emptyTitle"></evaluation-empty>
+      </el-card>
+    </div>
+
+    <evaluation-empty v-else class="mt20" title="选科未开启"></evaluation-empty>
     <el-card class="mt20">
       <template #header>选科报告</template>
       <el-button v-if="false" @click="goReportDemo">选科报告1</el-button>
@@ -152,9 +155,6 @@ export default {
     try {
       this.loading = true
       this.loadStudentSelected()
-      this.loadStudentElectiveModels()
-      this.getOptionalMajors()
-      this.getRecommendMajor()
     } finally {
       this.loading = false
     }
@@ -194,6 +194,11 @@ export default {
         status.preferenceCount = res.data.preferenceCount || 3
         this.selectObj = res.data['selectResult']
         this.allowSelect = res.data.allowSelect
+        if(this.allowSelect){
+          this.loadStudentElectiveModels()
+          this.getOptionalMajors()
+          this.getRecommendMajor()
+        }
       })
     },
     goReportDemo() {