shilipojs 3 роки тому
батько
коміт
cc7ae1afe3

+ 42 - 44
src/views/career/components/UniversitiesLine.vue

@@ -1,49 +1,50 @@
 <template>
   <div>
     <div style="background-color: #ffffff;font-size: 14px;padding:5px;">
+      <!-- 录取年份 -->
       <el-row class="radioInput">
         <div>
-          <span class="radiaTitle">地 域:</span>
+          <span class="radiaTitle">录 取 年 份:</span>
         </div>
-        <el-radio-group v-model="universityParams.locationsRes">
-          <el-radio-button label="">所有</el-radio-button>
-          <el-radio-button v-for="item in locations" :key="item" :label="item"
+        <el-radio-group v-model="universityParams.yearRes">
+<!--          <el-radio-button label="">所有</el-radio-button>-->
+          <el-radio-button v-for="item in years" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
       </el-row>
-      <!--层次-->
+      <!-- 科类 -->
       <el-row class="radioInput">
         <div>
-          <span class="radiaTitle">层 次:</span>
+          <span class="radiaTitle">科 类:</span>
         </div>
-        <el-radio-group v-model="universityParams.levelsRes">
-          <el-radio-button label="">所有</el-radio-button>
-          <el-radio-button v-for="item in levels" :key="item" :label="item"
+        <el-radio-group v-model="universityParams.typeRes">
+          <el-radio-button v-for="item in types" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
       </el-row>
-      <!-- 科类 -->
+      <!--层次-->
       <el-row class="radioInput">
         <div>
-          <span class="radiaTitle">科 类:</span>
+          <span class="radiaTitle">层 次:</span>
         </div>
-        <el-radio-group v-model="universityParams.typeRes">
-          <el-radio-button label="">所有</el-radio-button>
-          <el-radio-button v-for="item in types" :key="item" :label="item"
+        <el-radio-group v-model="universityParams.levelsRes">
+          <el-radio-button v-for="item in levels" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
       </el-row>
-      <!-- 录取年份 -->
+      <!--地区-->
       <el-row class="radioInput">
         <div>
-          <span class="radiaTitle">录 取 年 份:</span>
+          <span class="radiaTitle">院校所在地:</span>
         </div>
-        <el-radio-group v-model="universityParams.yearRes">
-          <el-radio-button label="">所有</el-radio-button>
-          <el-radio-button v-for="item in years" :key="item" :label="item"
+        <el-radio-group v-model="universityParams.locationsRes">
+          <el-radio-button v-for="item in locations" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
       </el-row>
+
+
+
     <!-- 表格数据 -->
       <universities-line-table :universityParams="universityParams"></universities-line-table>
     </div>
@@ -76,28 +77,16 @@
       }
     },
     watch: {
-      // 'universityParams.locationsRes': {
-      //   handler(val) {
-      //     this.getUniversityLevels()
-      //     this.getUniversityTypes()
-      //     this.getUniversityYears()
-      //   }
-      // },
-      // 'universityParams.levelsRes': {
-      //   handler(val) {
-      //     this.getUniversityYears()
-      //   }
-      // },
-      // 'universityParams.typeRes': {
-      //   handler(val) {
-      //     this.getUniversityYears()
-      //   }
-      // }
+      'universityParams.yearRes': {
+        handler(val) {
+          console.log(val)
+          this.getUniversityLevels()
+          this.getUniversityTypes()
+        }
+      }
     },
     created() {
       this.getUniversityLocations()
-      this.getUniversityLevels()
-      this.getUniversityTypes()
       this.getUniversityYears()
     },
     methods: {
@@ -109,34 +98,43 @@
       },
       getUniversityLocations() {
         selectUniversityLocations().then(res => {
+          this.universityParams.locationsRes = res.rows[0]
           this.locations = res.rows
         })
       },
       getUniversityLevels() {
         const params = {
-          location: this.universityParams.locationsRes
+          // location: this.universityParams.locationsRes,
+          year: this.universityParams.yearRes,
         }
         selectUniversityLevels(params).then(res => {
+          this.universityParams.levelsRes = res.rows[0]
           this.levels = res.rows
         })
       },
       getUniversityTypes() {
         const params = {
-          location: this.universityParams.locationsRes
+          // location: this.universityParams.locationsRes,
+          year: this.universityParams.yearRes,
         }
         selectUniversityTypes(params).then(res => {
+          this.universityParams.typeRes = res.rows[0]
           this.types = res.rows
         })
       },
       getUniversityYears() {
         const params = {
-          level: this.universityParams.levelsRes,
-          location: this.universityParams.locationsRes,
-          type: this.universityParams.typeRes
+          level: '',
+          location: '',
+          type: ''
         }
         selectUniversityYears(params).then(res => {
-          console.log(res)
+          this.universityParams.yearRes = res.rows[0]
           this.years = res.rows
+          this.$nextTick(_ => {
+            this.getUniversityTypes()
+            this.getUniversityLevels()
+          })
         })
       }
     }

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

@@ -129,11 +129,6 @@ export default {
       this.pageForm.pageNum = page.page;
       this.getXkcxlist();
     },
-    getOptionalMajors() {
-      getOptionalMajors().then(res => {
-        this.optionalMajors = res.data
-      })
-    },
     getRecommendMajor() {
       getRecommendMajor().then(res => {
         console.log(res)
@@ -163,7 +158,7 @@ export default {
         if(res.code== 200){
           row.isSelectCourse = !row.isSelectCourse
           this.$message.success(res.msg)
-          this.getOptionalMajors()
+          this.getXkcxlist()
         }
       })
     },