elective student - more tips

src/views/elective/generation/components/elective-generation-commands.vue

@@ -125,7 +125,8 @@ export default {
         this.notifyRootRefresh(true)
       })
     },
-    jumpForceAdjust() {
+    async jumpForceAdjust() {
+      await this.$confirm('确认进入调剂阶段？')
       jumpGenerationForceAdjust().finally(() => {
         this.notifyRootRefresh(true)
       })

src/views/elective/select/components/elective-preference-command.vue

@@ -45,7 +45,9 @@ export default {
         this.group.selected = true
         this.selectedList.push(this.group)
       } else {
-        await this.$confirm(`确认填报 ${this.group.groupName}`)
+        let confirmTip = `确认填报 ${this.group.groupName}`
+        if (!group.isRecommend) confirmTip += '（非推荐）'
+        await this.$confirm(confirmTip)
         this.group.selected = true
         this.selectedList.push(this.group)
         try {

src/views/system/user/profile/round-select.vue

@@ -4,10 +4,15 @@
       <template #header>选科信息</template>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form ref="form" v-if="selectObj" label-position="right" label-width="80px">
+          <el-form ref="form" v-if="selectObj" label-position="right" label-width="110px">
             <el-form-item label="选科轮次" class="form-item-readonly">{{ selectObj.year }}{{ selectObj.name }}
             </el-form-item>
-            <el-form-item label="选科时间" class="form-item-readonly">{{ selectObj.beginTime }} 至 {{ selectObj.endTime }}
+            <el-form-item v-if="!generationSettings.length" label="选科时间" class="form-item-readonly">
+              {{ selectObj.beginTime }} 至 {{ selectObj.endTime }}
+            </el-form-item>
+            <el-form-item v-else v-for="s in generationSettings" :key="s.option.key" :label="s.option.title"
+                          class="form-item-readonly">
+              {{ s.begin }} 至 {{ s.end }}
             </el-form-item>
           </el-form>
         </el-col>
@@ -51,7 +56,6 @@
 </template>
 
 <script>
-import { saveStudentSelected } from '@/api/webApi/selection'
 import TestEntry from '@/views/elective/test/components/test-entry'
 import TestResult from '@/views/elective/test/components/test-result'
 import SelectSubject from '@/views/system/user/profile/components/select-subject'
@@ -61,10 +65,10 @@ import TransferMixin from '@/components/mx-transfer-mixin'
 import ElectiveToolsMixin from '../../../elective/select/components/elective-tools-mixins'
 import config from '@/common/mx-config'
 import {
-  getStudentElectiveModels,
   getOptionalMajors,
-  getStudentSelected,
-  getRecommendMajor
+  getRecommendMajor,
+  getStudentElectiveModels,
+  getStudentSelected
 } from '@/api/webApi/elective/selected-subject'
 
 export default {
@@ -133,6 +137,12 @@ export default {
         })
       }) || []
     },
+    generationSettings() {
+      if (!this.generationModels?.length) return []
+      return this.generationModels
+        .filter(m => !m.option.decisionMaking && m.setting)
+        .map(m => ({ ...m.setting, option: m.option }))
+    },
     generation() {
       if (!this.selectObj) return {}
       return {