选科查询--收藏、测评、自选

src/views/career/subject/components/select-subjec-report.vue

@@ -1,64 +1,140 @@
 <template>
-  <div>
-    <div class="mb20">
-      <span class="tabs-item" @click="type = 0" :class="{'bg-primary':type == 0}">我的收藏</span>
-      <span class="tabs-item" @click="type = 1" :class="{'bg-primary':type == 1}">我的自选</span>
-      <span class="tabs-item" @click="type = 2" :class="{'bg-primary':type == 2}">我的测评选科</span>
+  <div class="pb20">
+    <div class="mb10">
+      <span class="tabs-item" @click="activeType = 0" :class="{'bg-primary':activeType == 0}">我的收藏</span>
+      <span class="tabs-item" @click="activeType = 1" :class="{'bg-primary':activeType == 1}">我的自选</span>
+      <span class="tabs-item" @click="activeType = 2" :class="{'bg-primary':activeType == 2}">我的测评选科</span>
     </div>
-    <mx-table :propDefines="propDefine" :rows="rows"></mx-table>
+    <mx-table v-if="activeType == 0 || activeType == 1"  :propDefines="propDefine" :rows="collectList">
+      <template #select="{ 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>
+      </template>
+    </mx-table>
+    <mx-table v-if="activeType == 2" :propDefines="recomProp" :rows="recommendMajor"></mx-table>
   </div>
 </template>
 
 <script>
+import {
+  getRecommendMajor,
+  getOptionalMajors
+} from '@/api/webApi/elective/selected-subject'
+import { xkcxlist } from '@/api/webApi/webQue'
 export default {
   props: {
     type: {
       type:Number,
       default: 0
+    },
+    querySource: {
+      type:String,
+      default: '1'
+    },
+  },
+  watch: {
+    activeType:{
+      immediate:true,
+      handler(value) {
+        console.log('change',value)
+        if(value == 2) {
+          this.getRecommendMajor()
+          return
+        }
+        this.getXkcxlist()
+        if(value == 1) {
+          this.propDefine.collect.hidden =true
+          this.propDefine.isSelectCourse.hidden =false
+          this.propDefine.roundName.hidden = false
+        }
+        if(value == 0) {
+          this.propDefine.collect.hidden =false
+          this.propDefine.isSelectCourse.hidden =true
+          this.propDefine.roundName.hidden = true
+        }
+      }
     }
   },
   data() {
     return {
       dataList: [],
       rows:[],
+      activeType: '',
+      recomProp: {
+        majorCategoryCode:{
+          label:'专业code'
+        },
+        majorCategoryName:{
+          label:'专业名称'
+        },
+      },
+      collectList: [],
+      optionalMajors:[],
+      recommendMajor: [],
       propDefine: {
-        year:{
-          label:'所属年份'
+        universityName:{
+          label:'院校名称'
         },
-        schoolName:{
-          label:'学校名称'
+        roundName: {
+          label:'批次',
+          hidden: false
         },
-        major:{
+        marjorName:{
           label:'专业(类)名称'
         },
-        majorRemark:{
+        remark:{
           label:'专业备注'
         },
-        majorLevel:{
+        level:{
           label:'专业层次'
         },
-        course0:{
+        courseRemark0:{
           label:'首选科目范围'
         },
-        course1:{
+        courseRemark1:{
           label:'再选科目范围'
         },
         data:{
           label:'历年录取数据'
         },
         collect:{
-          label:'收藏'
+          label:'收藏',
+          slot:'select',
+          hidden: false
         },
-        majorCollect:{
-          label:'选科收藏'
+        isSelectCourse:{
+          label:'选科收藏',
+          slot:'select',
         }
+      },
+      params: {
+        collect:true,
+        pageNum:1,
+        pageSize: 10
       }
-
     };
   },
   created() {
+    this.activeType=this.type
   },
   methods: {
+    getOptionalMajors() {
+      getOptionalMajors().then(res => {
+        this.optionalMajors = res.data
+      })
+    },
+    getRecommendMajor() {
+      getRecommendMajor().then(res => {
+        console.log(res)
+        this.recommendMajor = res.data
+      })
+    },
+    getXkcxlist() {
+      xkcxlist({ querySource: this.querySource,...this.params }).then(res => {
+        this.collectList = res.rows
+        console.log(res)
+      })
+    },
     handleClick() {
 
     }

src/views/career/subject/myChoice.vue

@@ -27,39 +27,6 @@ export default {
       dataList: [],
       activeName: 'first',
       rows:[],
-      propDefine: {
-        year:{
-          label:'所属年份'
-        },
-        schoolName:{
-          label:'学校名称'
-        },
-        major:{
-          label:'专业(类)名称'
-        },
-        majorRemark:{
-          label:'专业备注'
-        },
-        majorLevel:{
-          label:'专业层次'
-        },
-        course0:{
-          label:'首选科目范围'
-        },
-        course1:{
-          label:'再选科目范围'
-        },
-        data:{
-          label:'历年录取数据'
-        },
-        collect:{
-          label:'收藏'
-        },
-        majorCollect:{
-          label:'选科收藏'
-        }
-      }
-
     };
   },
   created() {

src/views/system/user/profile/components/report-table.vue

@@ -91,7 +91,7 @@
     </div>
     <esign-dialog ref="esignDialog"></esign-dialog>
     <choose-subject-dialog ref="chooseDialog"></choose-subject-dialog>
-    <select-subject-report-dialog ref="reportDialog"></select-subject-report-dialog>
+    <select-subject-report-dialog  ref="reportDialog"></select-subject-report-dialog>
     <!--    <Ai-dialog ref="aiDialog" :prevPreferences="prevPreferences"></Ai-dialog>-->
   </div>
 </template>

src/views/system/user/profile/components/select-subject-report-dialog.vue

@@ -4,7 +4,7 @@
     :visible.sync="dialogVisible"
     width="70%"
   >
-    <select-subject-report :type="1"></select-subject-report>
+    <select-subject-report :type="1" querySource="2" ></select-subject-report>
   </el-dialog>
 </template>
 

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

@@ -117,7 +117,7 @@ import {
   getOptionalMajors,
   getPrimaryElectivesModels,
   getRecommendMajor
-} from '@/api/webApi/elective/ selected-subject'
+} from '@/api/webApi/elective/selected-subject'
 
 export default {
   provide() {