|
@@ -4,8 +4,15 @@
|
|
<mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
|
|
<mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
|
|
@invalid="handleInvalidQuery"
|
|
@invalid="handleInvalidQuery"
|
|
></mx-condition>
|
|
></mx-condition>
|
|
- <mx-search-group class="mb10" justify="end" :span="6" v-model="queryParams.name" placeholder="请输入名称" @search="toGetList"
|
|
|
|
- ></mx-search-group>
|
|
|
|
|
|
+ <mx-search-group class="mb10" justify="space-between" :span="6" v-model="queryParams.name" placeholder="请输入名称" @search="toGetList"
|
|
|
|
+ >
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-alert v-if="isThreeFormSix" type="warning" :closable="false" show-icon>
|
|
|
|
+ 新高考改革后,本省采用“院校专业”的志愿填报方式,自改革年份起的数据,请查询专业数据。
|
|
|
|
+ </el-alert>
|
|
|
|
+ </el-col>
|
|
|
|
+
|
|
|
|
+ </mx-search-group>
|
|
<!-- 表格数据 -->
|
|
<!-- 表格数据 -->
|
|
<universities-line-table :tableList="tableList"></universities-line-table>
|
|
<universities-line-table :tableList="tableList"></universities-line-table>
|
|
<pagination class="mt10" :total="total" :autoScroll="false" @pagination="getUniversityList"
|
|
<pagination class="mt10" :total="total" :autoScroll="false" @pagination="getUniversityList"
|
|
@@ -21,7 +28,7 @@ import { selectUniversityList } from '@/api/webApi/shiftLine'
|
|
import UniversitiesLineTable from '@/views/career/components/UniversitiesLineTable'
|
|
import UniversitiesLineTable from '@/views/career/components/UniversitiesLineTable'
|
|
import MxSearchGroup from '@/components/MxSearch/mx-search-group'
|
|
import MxSearchGroup from '@/components/MxSearch/mx-search-group'
|
|
import MxCondition from '@/components/MxCondition/mx-condition'
|
|
import MxCondition from '@/components/MxCondition/mx-condition'
|
|
-
|
|
|
|
|
|
+import MxConst from '@/common/mx-const'
|
|
import { mapGetters } from 'vuex'
|
|
import { mapGetters } from 'vuex'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -51,7 +58,10 @@ export default {
|
|
this.queryParams.lineLocation = this.currentUser.provinceName
|
|
this.queryParams.lineLocation = this.currentUser.provinceName
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
- ...mapGetters(['currentUser'])
|
|
|
|
|
|
+ ...mapGetters(['currentUser']),
|
|
|
|
+ isThreeFormSix() {
|
|
|
|
+ return Object.keys(MxConst.enum.gkSelectType).find(item => this.currentUser.newgaokaoType == MxConst.enum.gkSelectType[item]) == 'threeFormSix'
|
|
|
|
+ }
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
handleQuery() {
|
|
handleQuery() {
|