Browse Source

DEMO - mock generation cycle available

hare8999@163.com 2 years ago
parent
commit
4a18f94747

+ 1 - 1
src/common/mx-config.js

@@ -154,7 +154,7 @@ export default {
       code: 'ForceAdjust',
       decisionMaking: true,
       stepsVisible: true,
-      title: '强制调剂',
+      title: '补录调剂',
       description: '',
       icon: ''
     },

+ 13 - 6
src/views/elective/generation/components/elective-generation-commands.vue

@@ -11,7 +11,8 @@
       <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>
-      <el-button v-else type="primary" @click="jumpDispatch">选科分班</el-button>
+      <!--<el-button v-else type="primary" @click="jumpDispatch">选科分班</el-button>-->
+      <!--<el-button type="primary" @click="jumpReport" class="ml10">选科数据</el-button>-->
     </div>
     <el-dialog v-if="pushSettingFormVisible" :visible.sync="pushSettingFormVisible"
                :title="nextStepName+'设置'" width="350">
@@ -73,6 +74,7 @@ export default {
       return this.status.doneDMAlgorithm && !this.status.allMatched
     },
     showRankBalance() {
+      return false
       const options = this.generation.options
       return this.status.allMatched && this.generation.current < options.rankBalance.value
     },
@@ -123,20 +125,25 @@ export default {
         this.notifyRootRefresh()
       })
     },
-    jumpRankBalance() {
+    async jumpRankBalance() {
       jumpGenerationRankBalance().finally(() => {
         this.notifyRootRefresh()
       })
     },
-    terminateAndJumpDispatch() {
+    async terminateAndJumpDispatch() {
+      await this.$confirm('确认进入选科分班?该操作将锁定所有选科录取状态,且不可逆')
       terminateGeneration().then(res => {
-        // this.refreshData()
         this.jumpDispatch()
-      }).catch(_ => this.notifyRootRefresh())
+      }).finally(() => this.notifyRootRefresh())
     },
     jumpDispatch() {
-      const path = '/evaluating/master-manage/permission/elective/dispatch/index'
+      const path = '/evaluating/master-manage/selectCourse/elective/dispatch/index'
       this.transferTo(path)
+    },
+    jumpReport() {
+      // 跳转选科数据
+      // TODO: 页面还没有定义好
+      this.msgInfo('更多选科数据,敬请期待')
     }
   }
 }

+ 1 - 7
src/views/elective/generation/components/elective-generation-master.vue

@@ -13,9 +13,7 @@
           </slot>
         </div>
         <div>
-          <slot name="header-suffix">
-            <el-button type="primary" @click="jumpReport" class="ml10">选科数据</el-button>
-          </slot>
+          <slot name="header-suffix"></slot>
         </div>
       </div>
       <slot :name="activeKey" v-bind="chartBinding">
@@ -93,10 +91,6 @@ export default {
     }
   },
   methods: {
-    jumpReport() {
-      // 跳转选科数据
-      // TODO: 页面还没有定义好
-    },
     handleJumpDetail() {
       // 跳列表,模拟点击第一列
       this.$refs.gTable.simulateGoDetails()