elective student - table info display update

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

@@ -1,8 +1,8 @@
 <template>
   <span v-if="!group.allowSelect">{{ group.disabledReason || '无法报名' }}</span>
   <span v-else-if="isRejected">已拒绝</span>
-  <span v-else-if="group.selected" class="f-red btn-red" @click="handleCancel">取消报名</span>
-  <span v-else-if="enableCommit" class="f-warning">被锁定</span>
+  <span v-else-if="group.selected" class="f-red btn-red" @click="handleCancel">已报名/重新报名</span>
+  <span v-else-if="enableCommit" class="f-warning">不能报名</span>
   <span v-else class="btn-green" @click="handleCommit">报名</span>
 </template>
 

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="generation.activeOpt.decisionMaking">
+    <div v-if="visible">
       <span>您在{{ appliedModel.option.title }}阶段</span>
       <span v-if="!appliedModel.selectedList.length">未填报志愿。</span>
       <span v-else-if="appliedModel.selectedList.some(isGroupRejected)">拒绝了系统推荐组合。</span>
@@ -12,6 +12,7 @@
 </template>
 
 <script>
+import config from '@/common/mx-config'
 import ElectiveToolsMixin from './elective-tools-mixins'
 import ElectivePreferenceDrag from '@/views/elective/select/components/elective-preference-drag'
 
@@ -21,7 +22,14 @@ export default {
   name: 'elective-preference-info',
   props: ['generation'],
   computed: {
+    visible() {
+      return this.generation.active > config.electiveGenerationOptions.primary.value
+    },
+    isDM() {
+      return this.generation.activeOpt.decisionMaking
+    },
     appliedModel() {
+      if (!this.isDM) return this.generation.activeModel
       let prev = this.generation.activeModel.prevModel
       while (prev.option.decisionMaking) prev = prev.prevModel
       return prev

src/views/elective/select/components/elective-table.vue

@@ -9,7 +9,7 @@
       <el-button v-if="enableAIFeature" type="primary" @click="toAiAnalysis">AI分析</el-button>
     </div>
 
-    <mx-table :propDefines="formatCols" :rows="formatRows">
+    <mx-table :propDefines="formatCols" :rows="formatRows" class="mb10">
       <template #underOver="{value}">
         <over-under-badge :value="value"></over-under-badge>
       </template>

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

@@ -36,7 +36,7 @@
       </el-card>
     </div>
     <evaluation-empty class="mt20" v-else :shadow="false" title="暂未开启选科"></evaluation-empty>
-    <el-card class="mt20">
+    <el-card v-if="false" class="mt20">
       <template #header>选科报告</template>
       <el-button v-if="false" @click="goReportDemo">选科报告1</el-button>
       <el-button @click="goReportDemoOnline">选科报告</el-button>