Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

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

@@ -7,7 +7,7 @@
     </div>
     <div>
       <el-button v-if="showFastPush" type="primary" @click="flushIntoDM">提前进入{{ nextStepName }}</el-button>
-      <el-button v-if="showForceAdjustSend" type="primary" @click="jumpForceAdjust">进入{{ nextStepName }}</el-button>
+      <el-button v-if="showForceAdjustSend" type="primary" @click="jumpForceAdjust">进入{{ generation.options.forceAdjust.title }}</el-button>
       <el-button v-else-if="showSend" type="primary" @click="pushGeneration">发送</el-button>
       <el-button v-if="showRankBalance" type="primary" @click="jumpRankBalance">排名均衡</el-button>
       <el-button v-if="showClassDispatch" type="primary" @click="terminateAndJumpDispatch">选科分班</el-button>
@@ -74,7 +74,7 @@ export default {
       return this.status.doneDMAlgorithm && !this.status.allMatched
     },
     showRankBalance() {
-      return false
+      return false // TODO: not implement.
       const options = this.generation.options
       return this.status.allMatched && this.generation.current < options.rankBalance.value
     },

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

@@ -37,8 +37,8 @@
     </el-card>
     <el-card shadow="hover" class="mt20">
       <template #header>选科报告</template>
-      <el-button v-if="false" @click="goReportDemo">报告示例</el-button>
-      <el-button @click="goReportDemoOnline">报告示例</el-button>
+      <el-button v-if="false" @click="goReportDemo">选科报告1</el-button>
+      <el-button @click="goReportDemoOnline">选科报告</el-button>
     </el-card>
 
     <el-dialog :visible.sync="helpVideo.visible">