|
@@ -58,6 +58,8 @@ import ElectivePreferenceBatch from '@/views/elective/select/components/elective
|
|
|
import ElectiveTableGroupTag from '@/views/elective/select/components/elective-table-group-tag'
|
|
|
|
|
|
import ElectiveTableMixin from './elective-table-mixins'
|
|
|
+import { mapGetters } from 'vuex'
|
|
|
+import MxConst from '@/common/mx-const'
|
|
|
|
|
|
export default {
|
|
|
mixins: [ElectiveTableMixin, MxSelectTranslate],
|
|
@@ -95,6 +97,10 @@ export default {
|
|
|
stepMatched() {
|
|
|
return this.generation.active == this.generation.current
|
|
|
},
|
|
|
+ ...mapGetters(['currentUser']),
|
|
|
+ isThreeFormSix() {
|
|
|
+ return Object.keys(MxConst.enum.gkSelectType).find(item => this.currentUser.newgaokaoType == MxConst.enum.gkSelectType[item]) == 'threeFormSix'
|
|
|
+ },
|
|
|
selectStep() {
|
|
|
return !this.generation.activeOpt.decisionMaking
|
|
|
},
|
|
@@ -145,9 +151,18 @@ export default {
|
|
|
async toSelectSub(row) {
|
|
|
await this.preventSelectedListChanged()
|
|
|
// 打开选科弹窗
|
|
|
- const course0 = this.translateCourse0(row.groupId)
|
|
|
- const course1 = this.translateCourse1(row.groupId)
|
|
|
- this.$refs.chooseDialog.open(course0, course1)
|
|
|
+
|
|
|
+ if(this.isThreeFormSix){
|
|
|
+ const course0 = this.translateCourse0(row.groupId)
|
|
|
+ const course1 = this.translateCourse1(row.groupId)
|
|
|
+ console.log(course0)
|
|
|
+ console.log(course1)
|
|
|
+ this.$refs.chooseDialog.open([], `${course0},${course1}`)
|
|
|
+ }else {
|
|
|
+ const course0 = this.translateCourse0(row.groupId)
|
|
|
+ const course1 = this.translateCourse1(row.groupId)
|
|
|
+ this.$refs.chooseDialog.open(course0, course1)
|
|
|
+ }
|
|
|
},
|
|
|
toAiAnalysis() {
|
|
|
// AI 分析 跳转
|