diff --git a/src/views/cet/cet-ana-1.vue b/src/views/cet/cet-ana-1.vue index 244db0b..1c0e703 100644 --- a/src/views/cet/cet-ana-1.vue +++ b/src/views/cet/cet-ana-1.vue @@ -312,14 +312,20 @@ export default { this.query(query, college, [this.oneentrydate]); }, async majorQuery() { - if (this.lastCollegeMajor.length == 0 || this.lastCollegeMajor == null) { - message.error('请选择专业'); - return; - } + if (this.majorentrydate.length == 0) { message.error('请选择年级'); return; } + if (this.collegeMajor.length == 0||this.collegeMajor==null) { + message.error('请选择学院'); + return; + } + + if (this.lastCollegeMajor.length == 0 || this.lastCollegeMajor == null) { + message.error('请选择专业'); + return; + } this.tab3loading = true; let res = null; try { @@ -337,14 +343,15 @@ export default { } }, collegeQuery() { - if (this.collegetab2.length == 0) { - message.error('请选择学院'); - return; - } if (this.collegeentrydate.length == 0) { message.error('请选择年级'); return; } + if (this.collegetab2.length == 0) { + message.error('请选择学院'); + return; + } + this.tab2loading = true; let query = 'tab2'; this.query(query, this.collegetab2, this.collegeentrydate); @@ -390,7 +397,7 @@ export default { }), }; }); - this.collegeMajor = ['东语学院', '日语']; + // this.collegeMajor = ['东语学院']; console.log(this.collegeMajor, 'collegeMajor'); console.log(this.collegeMajorOptions, 'collegeMajorOptions1'); }, @@ -987,7 +994,7 @@ export default { this.entrydateOptions = getEntrydate.entrydates; this.oneentrydate = this.entrydateOptions[0].value; // this.collegeentrydate = [this.entrydateOptions[0].value]; - this.majorentrydate = [this.entrydateOptions[0].value]; + // this.majorentrydate = [this.entrydateOptions[0].value]; // this.entrydate.push (this.entrydateOptions[0].value); }, // 查询数据