选科查询动态列

src/common/mx-const.js

@@ -76,6 +76,10 @@ export default {
       scoreByGroup: 'elective:student:apply:scoreByGroup', // 组合成绩
       rankInGroup: 'elective:student:apply:rankInGroup', // 当前组合实时排名
       rankInGrade: 'elective:student:apply:rankInGrade', // 当前组合全校排名
+    },
+    gkSelectType:{
+      towFormFour:1,   // 3+1+2
+      threeFormSix:2        // 6选3
     }
   }
 }

src/views/career/subject/majorChoice.vue

@@ -124,7 +124,7 @@
               src="@/assets/images/subject/icon_shoucang_n.png"
             />
           </template>
-          <template #select="{ row }">
+          <template #isSelectCourse="{ row }">
             <div @click="saveCourseCollect(row)" class="pointer">
               <i class="el-icon el-icon-success"  style="color: #42b983" v-if="row.isSelectCourse"></i>
               <i class="el-icon el-icon-success"  v-else></i>
@@ -177,45 +177,7 @@ export default {
         types: []
       },
       dataList: [],
-      propDefines: {
-        universityName: {
-          label: '院校名称'
-        },
-        marjorName: {
-          label: '专业（类）名称'
-        },
-        marjorBelongs: {
-          label: '专业备注',
-          align: 'left'
-        },
-        level: {
-          label: '专业层次'
-        },
-        courseRemark0: {
-          label: '首选科目范围',
-          align: 'left'
-        },
-        courseRemark1: {
-          label: '再选科目范围',
-          align: 'left'
-        },
-        year: {
-          label: '年份',
-          align: 'left'
-        },
-        collect: {
-          label: '收藏',
-          align: 'left',
-          slot: 'collect',
-          width: '100px'
-        },
-        subjectCollect: {
-          label: "选科收藏",
-          align: "left",
-          slot: "select",
-          width: "100px",
-        },
-      },
+      propDefines: {},
       selectIds: [],
       pageNum: 1,
       pageSize: 10,
@@ -348,9 +310,15 @@ export default {
         pageSize: this.pageSize
       })
         .then((res) => {
+          let propDefines = {}
           this.dataList = res.rows
           this.total = res.total
+          Object.keys(res.header).forEach(item => {
+            propDefines[item] = {label:res.header[item],slot:item}
+          })
+          this.propDefines = propDefines
           this.isShowTable = true
+
         })
         .catch((err) => {
           console.log('请求出错！')

src/views/career/subject/subjectChoice.vue

@@ -36,10 +36,10 @@
 
           </el-row>
           <filter-form :filter="filter_form"></filter-form>
-        </div>
-        <div class="content">
           <mx-search-group class="mb10" justify="end" :span="12" v-model="keyword" placeholder="请输入内容" @search="httpGetXkcxList"
           ></mx-search-group>
+        </div>
+        <div class="content" v-if="Object.keys(propDefines).length">
           <div class="concerned-college-container" v-loading="loading">
             <mx-table :rows="dataList" :propDefines="propDefines">
               <template #collect="{ row }">
@@ -56,7 +56,7 @@
                   src="@/assets/images/subject/icon_shoucang_n.png"
                 />
               </template>
-              <template #select="{ row }">
+              <template #isSelectCourse="{ row }">
                 <div @click="saveCourseCollect(row)">
                   <i class="el-icon el-icon-success"  style="color: #42b983" v-if="row.isSelectCourse"></i>
                   <i class="el-icon el-icon-success"  v-else></i>
@@ -73,6 +73,7 @@
             />
           </div>
         </div>
+       <evaluation-empty v-else shadow title="请先选择科目"></evaluation-empty>
     </div>
   </div>
 </template>
@@ -102,7 +103,6 @@
     },
     data() {
       return {
-        // 初始条件
         form: {
           years: [],
         },
@@ -125,47 +125,7 @@
         // 查询结果
         dataList: [],
         isShowTabl: true,
-        propDefines: {
-          universityName: {
-            label: "院校名称",
-          },
-          marjorName: {
-            label: "专业（类）名称",
-          },
-          marjorBelongs: {
-            label: "专业备注",
-            align: "left",
-          },
-          level: {
-            label: "专业层次",
-          },
-          courseRemark0: {
-            label: "首选科目范围",
-            align: "left",
-          },
-          courseRemark1: {
-            label: "再选科目范围",
-            align: "left",
-          },
-          year: {
-            label: "年份",
-            align: "left",
-          },
-          collect: {
-            hidden: this.readonly,
-            label: "收藏",
-            align: "left",
-            slot: "collect",
-            width: "100px",
-          },
-          subjectCollect: {
-            hidden: this.readonly,
-            label: "选科收藏",
-            align: "left",
-            slot: "select",
-            width: "100px",
-          },
-        },
+        propDefines: {},
       };
     },
     watch:{
@@ -210,8 +170,6 @@
       httpGetXkcxList() {
         const course = [...this.selected.sciences[0],...this.selected.sciences[1]]
         if (course.length<3) return;
-
-        //console.log(this.selected);return;
         this.loading = true
         xkcxlist({
           keyword: this.keyword,
@@ -225,14 +183,16 @@
           pageSize: this.pageSize,
         })
           .then((res) => {
+            let propDefines = {}
             this.dataList = res.rows;
             this.total = res.total;
             this.isShowTable = true;
+            Object.keys(res.header).forEach(item => {
+               propDefines[item] = {label:res.header[item],slot:item}
+            })
+            this.propDefines = propDefines
           })
-          .catch((err) => {
-            console.log("请求出错！");
-            this.cleanSchoolSelect();
-          }).finally(() => {
+          .finally(() => {
             this.loading = false
         })
       },