恢复页面

src/views/career/components/UniversitiesLine.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <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.year">
           <el-radio-button v-for="item in years" :key="item" :label="item"
@@ -14,127 +14,165 @@
       <!-- 科类 -->
       <el-row class="radioInput">
         <div>
-          <span class="radiaTitle">科类:</span>
+          <span class="radiaTitle">科 类：</span>
         </div>
-        <el-radio-group v-model="universityParams.liberalScience">
+        <el-radio-group v-model="universityParams.type">
           <el-radio-button label="">所有</el-radio-button>
           <el-radio-button v-for="item in types" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
       </el-row>
-      <!-- 院校过滤条件 -->
-      <filter-form :filter="filter_form"></filter-form>
-      <mx-search-group class="mb10" justify="end" :span="6" v-model="name" placeholder="搜索" @search="clickSuffix"
-      ></mx-search-group>
+      <!--层次-->
+      <el-row class="radioInput">
+        <div>
+          <span class="radiaTitle">层 次：</span>
+        </div>
+        <el-radio-group v-model="universityParams.level">
+          <el-radio-button label="">所有</el-radio-button>
+          <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>
+        </div>
+        <el-radio-group v-model="universityParams.location">
+          <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="all_form"></universities-line-table>
+      <universities-line-table :universityParams="universityParams"></universities-line-table>
     </div>
   </div>
 </template>
 
 <script>
   import {
+    selectUniversityLocations,
+    selectUniversityLevels,
     selectUniversityTypes,
     selectUniversityYears
   } from '@/api/webApi/shiftLine'
   import UniversitiesLineTable from '@/views/career/components/UniversitiesLineTable'
-  import FilterForm from '@/views/career/components/FilterForm'
-  import MxSearchGroup from '@/components/MxSearch/mx-search-group'
   export default {
     name: "UniversitiesLine",
-    components: {UniversitiesLineTable,FilterForm,MxSearchGroup},
+    components: {UniversitiesLineTable},
     data() {
       return {
+        locations: [],//所在地
+        levels: [],
         types: [],
         years: [],
-        filter_form:{
-          location:'',
-          natureTypeCN:'',
-          type:'',
-          level:'',
-          features:'',
-          name:''
-        },
-        name:'',
         universityParams: {
-          liberalScience: '',
+          location: '',
+          level: '',
+          type: '',
           year: ''
         }
       }
     },
-    computed:{
-      all_form(){
-       return {
-         ...this.filter_form,
-         ...this.universityParams,
-       }
-      }
-    },
     watch: {
       'universityParams.year': {
         immediate: false,
         handler(val) {
+          console.log(val)
+          this.getUniversityLevels()
           this.getUniversityTypes()
         }
       }
     },
     created() {
+      this.getUniversityLocations()
       this.getUniversityYears()
     },
     methods: {
-      clickSuffix() {
-        this.filter_form.name = this.name
+      handleQuery() {
+
+      },
+      handleInvalidQuery() {
+
+      },
+      getUniversityLocations() {
+        selectUniversityLocations().then(res => {
+          this.universityParams.location = res.rows[0]
+          this.locations = res.rows
+        })
+      },
+      getUniversityLevels() {
+        const params = {
+          // location: this.universityParams.locations,
+          year: this.universityParams.year,
+        }
+        selectUniversityLevels(params).then(res => {
+          // this.universityParams.level = res.rows[0]
+          this.levels = res.rows
+        })
       },
       getUniversityTypes() {
         const params = {
+          // location: this.universityParams.locations,
           year: this.universityParams.year,
         }
         selectUniversityTypes(params).then(res => {
+          // this.universityParams.type = res.rows[0]
           this.types = res.rows
         })
       },
       getUniversityYears() {
-        selectUniversityYears().then(res => {
+        const params = {
+          level: '',
+          location: '',
+          type: ''
+        }
+        selectUniversityYears(params).then(res => {
           this.universityParams.year = res.rows[0]
           this.years = res.rows
+          // this.$nextTick(_ => {
+          //   this.getUniversityTypes()
+          //   this.getUniversityLevels()
+          // })
         })
       }
     }
   }
 </script>
 
-<style lang="scss" scoped>
-
-.radioInput ::v-deep {
-  background-color: #ffffff;
-  font-size: 14px;
-  padding:5px;
-  .el-radio {
-    .el-radio__input {
-      display: none;
+<style lang="scss">
+  .radioInput {
+    .el-radio {
+      .el-radio__input {
+        display: none;
+      }
     }
   }
-}
 
-.radioInput ::v-deep {
-  display: flex;
-  .el-radio-button .el-radio-button__inner {
-    border-radius: 4px !important;
-    border: none;
-    padding: 5px 10px !important;
-    font-weight: 400;
-    font-family: PingFangSC-Regular, PingFang SC;
-  }
-  .el-radio-button__orig-radio:checked + .el-radio-button__inner {
-    box-shadow: none;
-  }
-  .radiaTitle {
-    display: inline-block;
-    width: 80px;
-    font-size: 14px;
-    text-align: right;
-    margin-top: 2px;
-    margin-right: 10px;
+  .radioInput {
+    display: flex;
+    margin-top: 5px;
+    .el-radio-button .el-radio-button__inner {
+      border-radius: 4px !important;
+      border: none;
+      padding: 5px 10px !important;
+      font-weight: 400;
+      font-family: PingFangSC-Regular, PingFang SC;
+    }
+
+    .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+      box-shadow: none;
+    }
+
+    .radiaTitle {
+      display: inline-block;
+      width: 130px;
+      font-size: 14px;
+      text-align: right;
+      margin-top: 2px;
+    }
   }
-}
 </style>

src/views/career/components/UniversitiesLineTable.vue

@@ -14,7 +14,7 @@
       <el-table-column prop="level" label="层次" align="center"></el-table-column>
       <el-table-column prop="score" label="投档线" align="center"></el-table-column>
       <el-table-column
-        prop="batchName"
+        prop="seat"
         label="投档分位次"
       >
       </el-table-column>