Browse Source

选课报名信息标点

shilipojs 2 năm trước cách đây
mục cha
commit
a5dab699fe

+ 7 - 7
src/views/elective/select/components/elective-enroll-info.vue

@@ -5,30 +5,30 @@
       <span>未填报志愿</span>
     </template>
     <template v-else-if="appliedModel.selectedList.some(m=>m.rejected)">
-      <span>拒绝填报志愿</span>
+      <span>拒绝填报志愿</span>
     </template>
     <template v-else>
       <span>填报的</span>
-      <span v-for="group in appliedModel.selectedList" :key="group.groupId" :class="enrollGroupClass(group)">
-        {{ group.groupName }}
+      <span v-for="(group,index) in appliedModel.selectedList" :key="group.groupId" :class="enrollGroupClass(group)">
+        {{ group.groupName }}{{index < appliedModel.selectedList.length - 1 ? '、' : ''}}
       </span>
     </template>
     <template v-if="approved">
       <span v-if="appliedModel.selectedList.length == 1">
-        符合条件 已被录取
+        符合条件,已被录取。
       </span>
       <span v-else-if="appliedModel.selectedList.length > 1">
-        其中 <span class="bold">{{ enrollStatus.enrolledGroup.groupName }}</span> 符合条件 已被录取
+        其中 <span class="bold">{{ enrollStatus.enrolledGroup.groupName }}</span> 符合条件,已被录取。
       </span>
       <template v-else-if="appliedModel.nextModel.selectedList.length == 1">
         但系统按推荐组合 <span class="f-primary">{{ appliedModel.nextModel.selectedList.first().groupName }}</span> 进行了录取
       </template>
     </template>
     <template v-else>
-      <span v-if="appliedModel.selectedList.length">不符合条件</span> 未被录取
+      <span v-if="appliedModel.selectedList.length">不符合条件</span>,未被录取。
     </template>
     <template v-if="forceAdjusted">
-      学校将您调剂录取至<span class="f-warning">{{ enrollStatus.enrolledGroup.groupName }}</span>组合
+      学校将您调剂录取至<span class="f-warning">{{ enrollStatus.enrolledGroup.groupName }}</span>组合
     </template>
     <template v-if="enableSelect">
       现有以下标黄组合可以重新报名

+ 2 - 2
src/views/elective/select/components/elective-preference-batch.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <span v-if="selectedList.length">您填报了 {{ allSelectedGroupNames }}</span>
+    <span v-if="selectedList.length">您填报了 {{ allSelectedGroupNames }}</span>
     <elective-preference-drag :disabled="disabled" :selected-list="selectedList"></elective-preference-drag>
     <el-button v-if="!disabled" @click="commitBatch" type="primary" :disabled="!enableCommit">提交</el-button>
   </div>
@@ -22,7 +22,7 @@ export default {
       return this.selectedList.length == this.generation.status.preferenceCount
     },
     allSelectedGroupNames() {
-      return this.selectedList.map(g => g.groupName).join(' ')
+      return this.selectedList.map(g => g.groupName).join(' ')
     }
   },
   methods: {

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

@@ -2,9 +2,9 @@
   <div>
     <div v-if="generation.activeOpt.decisionMaking">
       <span>您在{{ appliedModel.option.title }}阶段</span>
-      <span v-if="!appliedModel.selectedList.length">未填报志愿</span>
-      <span v-else-if="appliedModel.selectedList.some(isGroupRejected)">拒绝了系统推荐组合</span>
-      <span v-else-if="appliedModel.selectedList.length">填报了 {{ allSelectedGroupNames }}</span>
+      <span v-if="!appliedModel.selectedList.length">未填报志愿</span>
+      <span v-else-if="appliedModel.selectedList.some(isGroupRejected)">拒绝了系统推荐组合</span>
+      <span v-else-if="appliedModel.selectedList.length">填报了 {{ allSelectedGroupNames }}</span>
       <elective-preference-drag v-if="appliedModel.preferenceCount>1" :selected-list="appliedModel.selectedList"
                                 disabled></elective-preference-drag>
     </div>
@@ -25,7 +25,7 @@ export default {
       return this.generation.activeModel.prevModel
     },
     allSelectedGroupNames() {
-      return this.appliedModel.selectedList.map(g => g.groupName).join(' ')
+      return this.appliedModel.selectedList.map(g => g.groupName).join(' ')
     }
   }
 }