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

doc/Mind/ElectiveGeneration.cs

@@ -97,7 +97,9 @@ namespace mxdemo.Mind
         bool enablePushNextDMGeneration; // 是否可以强制推进下一代决策进程 = 当前为报名进程，且学生均已报名
         bool allowDMAlgorithm; // 当前为决策进程，支持运行匹配算法（BackTrackingDM,FinalAdjustDM）
         bool doneDMAlgorithm; // 当前为决策进程，且已经运行了匹配算法
-        bool allowForce; // 当前进程代是否允许强制调剂录取（原来BackTrackingDM,FinalAdjustDM,RankBalance),现在调整为(FinalAdjustDM,RankBalance)
+        // 5.13 现在只有forceAdjust阶段开放
+        bool allowForce; // 当前阶段是否开放了强制调剂功能
+        bool enableForceAdjustEntry; // 当前是否展示强制阶段入口：2次补录结果匹配算法之后一定展示此入口；如果提前录取完毕，加个匹配项控制是否展示此入口（最好配置到round,作为后门），默认不展示
     }
 
     // 1 初选决策时，需要进行设置
@@ -515,6 +517,11 @@ namespace mxdemo.Mind
         /// <param name="setting">推进配置</param>
         void pushGenerationSetting(FlowPushSetting setting);
 
+        /// <summary>
+        /// 5.13 hht 二次补录结果（或者提前录取完毕时）跳转到强制调剂
+        /// </summary>
+        void jumpGenerationForceAdjust();
+
         /// <summary>
         /// 如果在所有学生全部录取的情况，可以在任意决策结点跳转至排名均衡
         /// </summary>

doc/Mind/PrimaryElective.cs

@@ -105,6 +105,7 @@ namespace mxdemo.Mind
         public string disabledReason; // 不可报名时的原因
 
         public bool selected;  // 已报名
+        // 5.13 如果是多志愿，按selectedRank区分一志愿、二志愿、三志愿...
         public int selectedRank; // 多志愿时的排序
 
 

mock/modules/elective-generation.js

@@ -36,6 +36,7 @@ module.exports = [
           allowDMAlgorithm: true,
           doneDMAlgorithm: true,
           allowForce: true,
+          enableForceAdjustEntry: true
         }
       }
     }

src/api/webApi/elective/generation.js

@@ -68,6 +68,15 @@ export function flushIntoGenerationDM() {
   })
 }
 
+// /front/elective/generation/jumpGenerationForceAdjust
+// 二次补录结果（或者提前录取完毕时）跳转到强制调剂
+export function jumpGenerationForceAdjust() {
+  return request({
+    url: '/front/elective/generation/jumpGenerationForceAdjust',
+    method: 'post'
+  })
+}
+
 // /front/elective/generation/jumpGenerationRankBalance
 // 如果在所有学生全部录取的情况，可以在任意决策结点跳转至排名均衡
 export function jumpGenerationRankBalance() {

src/common/mx-config.js

@@ -148,19 +148,29 @@ export default {
       description: '',
       icon: ''
     },
+    forceAdjust: {
+      key: 'forceAdjust',
+      value: 7,
+      code: 'ForceAdjust',
+      decisionMaking: true,
+      stepsVisible: true,
+      title: '强制调剂',
+      description: '',
+      icon: ''
+    },
     rankBalance: {
       key: 'rankBalance',
-      value: 7,
+      value: 8,
       code: 'RankBalance',
       decisionMaking: true,
-      stepsVisible: true,
+      stepsVisible: false,
       title: '排名均衡',
       description: '',
       icon: ''
     },
     terminate: {
       key: 'terminate',
-      value: 8,
+      value: 9,
       code: 'Terminate',
       decisionMaking: false,
       stepsVisible: false,

src/views/elective/generation/components/elective-color-map-mixins.js

@@ -0,0 +1,27 @@
+import config from '@/common/mx-config'
+
+export default {
+  data() {
+    return {
+      electiveColorMap: {
+        R: config.color.error,
+        r: config.color.error,
+        G: config.color.success,
+        g: config.color.success,
+        B: config.color.blue_up,
+        b: config.color.blue_up,
+        p: config.color.primary,
+        P: config.color.primary,
+        y: config.color.yellow_report,
+        Y: config.color.yellow_report,
+        o: config.color.yellow_report,
+        O: config.color.yellow_report
+      }
+    }
+  },
+  methods: {
+    matchElectiveColor(color) {
+      return this.electiveColorMap[color] || color
+    }
+  }
+}

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

@@ -7,7 +7,8 @@
     </div>
     <div>
       <el-button v-if="showFastPush" type="primary" @click="flushIntoDM">提前进入{{ nextStepName }}</el-button>
-      <el-button v-if="showSend" type="primary" @click="pushGeneration">发送</el-button>
+      <el-button v-if="showForceAdjustSend" type="primary" @click="jumpForceAdjust">进入强制调剂</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>
       <el-button v-else type="primary" @click="jumpDispatch">选科分班</el-button>
@@ -26,7 +27,7 @@
 <script>
 import {
   applyElectiveDMAlgorithm,
-  flushIntoGenerationDM,
+  flushIntoGenerationDM, jumpGenerationForceAdjust,
   jumpGenerationRankBalance, pushGenerationSetting,
   terminateGeneration
 } from '@/api/webApi/elective/generation'
@@ -65,6 +66,9 @@ export default {
       const next = this.generation.current + 1
       return Object.values(options).find(opt => opt.value == next).title
     },
+    showForceAdjustSend() {
+      return this.status.enableForceAdjustEntry
+    },
     showSend() {
       return this.status.doneDMAlgorithm && !this.status.allMatched
     },
@@ -114,6 +118,11 @@ export default {
         this.notifyRootRefresh()
       })
     },
+    jumpForceAdjust() {
+      jumpGenerationForceAdjust().finally(() => {
+        this.notifyRootRefresh()
+      })
+    },
     jumpRankBalance() {
       jumpGenerationRankBalance().finally(() => {
         this.notifyRootRefresh()

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

@@ -1,13 +1,16 @@
 <template>
   <mx-table ref="table" :prop-defines="resolvedTable.columns" :rows="resolvedTable.rows" border>
-    <template #elective-cell="{value, label, prop}">
+    <template #elective-cell="{value, label, prop, key}">
       <el-tooltip :disabled="(value&&value.disabled)||!!!prop.queryCode" effect="light">
         <div slot="content">
           查看名单
         </div>
         <div v-if="value" class="pointer" :style="getCellStyles(value)" @click="goDetails(value, label, $event)">
-          <span v-if="value.star">*</span>
-          <span>{{ value && value.value }}</span>
+          <template v-if="!useUnderOverBadge(key)">
+            <span v-if="value.star">*</span>
+            <span>{{ value && value.value }}</span>
+          </template>
+          <over-under-badge v-else :value="value.value" exchange></over-under-badge>
         </div>
       </el-tooltip>
     </template>
@@ -15,11 +18,13 @@
 </template>
 
 <script>
-import config from '@/common/mx-config'
 import MxTransferMixin from '@/components/mx-transfer-mixin'
+import ElectiveColorMap from './elective-color-map-mixins'
+import OverUnderBadge from '@/views/elective/publish/components/steps/fauclty/over-under-badge'
 
 export default {
-  mixins: [MxTransferMixin],
+  components: { OverUnderBadge },
+  mixins: [MxTransferMixin, ElectiveColorMap],
   name: 'elective-generation-table',
   props: ['chartBinding'],
   computed: {
@@ -71,7 +76,8 @@ export default {
           roundId: this.chartBinding.generation.status.roundId,
           generation: -1, // for detail page special display,
           queryableCategories: [], // 本代支持查询的列
-          ignoreGroupCategories: [] // 本代支持查询，且与组合无关的列
+          ignoreGroupCategories: [], // 本代支持查询，且与组合无关的列
+          isAccumulate: true
         }
         this.chartBinding.chartData.accumulates.forEach(acc => this.resolveTableGeneration(ext, acc, columns, rows, mergedColumns, prefix, true))
       }
@@ -93,6 +99,9 @@ export default {
     }
   },
   methods: {
+    useUnderOverBadge(label) {
+      return ['indicateCount'].some(prop => label.includes(prop))
+    },
     resolveTableGeneration(ext, data, columnsRef, rowsRef, mergedColumnsRef, prefix = '', fixed = false, overrideQueryName = '') {
       // resolve core
       const prop = prefix + ext.generation + '_' + data.category
@@ -131,36 +140,11 @@ export default {
     getCellStyles(option) {
       const styles = {}
       if (option.color) {
-        const map = {
-          R: config.color.error,
-          r: config.color.error,
-          G: config.color.success,
-          g: config.color.success,
-          B: config.color.blue_up,
-          b: config.color.blue_up,
-          p: config.color.primary,
-          P: config.color.primary,
-          y: config.color.yellow_report,
-          Y: config.color.yellow_report
-        }
-        styles.color = map[option.color] || option.color
+        styles.color = this.matchElectiveColor(option.color)
       }
       return styles
     },
     goDetails(option, label, e) {
-      // try close accessor el-popover
-      // const $btn = e?.currentTarget?.__vue__
-      // if ($btn) {
-      //   let parent = $btn.$parent
-      //   while (parent) {
-      //     if (parent.$options.name === 'ElPopover') {
-      //       parent.doClose()
-      //       break
-      //     }
-      //     parent = parent.$parent
-      //   }
-      // }
-
       // jump logic
       const path = '/elective/generation/detail'
       const nextData = {
@@ -168,6 +152,7 @@ export default {
         roundId: this.chartBinding.generation.status.roundId,
         roundName: this.chartBinding.generation.status.roundName,
         activeGeneration: this.chartBinding.generation.active,
+        isAccumulate: option.isAccumulate || false,
         queryGeneration: option.generation,
         queryGroupId: option.groupId,
         queryCode: option.queryCode,

src/views/elective/generation/detail.vue

@@ -16,6 +16,9 @@
           </el-popover>
         </div>
       </template>
+      <template #studentName="{value, row}">
+        <span :style="getStudentNameCellStyle(row)">{{ value }}</span>
+      </template>
       <template #group-flow="{value}">
         <elective-flow-major v-if="value.matchedMajors.length" :icon-classes="['f-primary']"
                              :matched-majors="value.matchedMajors"></elective-flow-major>
@@ -54,6 +57,7 @@
 import config from '@/common/mx-config'
 import transferMixin from '@/components/mx-transfer-mixin'
 import groupTranslateMixin from '@/components/Cache/modules/mx-select-translate-mixin'
+import ElectiveColorMap from './components/elective-color-map-mixins'
 import { mapGetters } from 'vuex'
 import MxCondition from '@/components/MxCondition/mx-condition'
 import {
@@ -67,7 +71,7 @@ import ElectiveFlowRankDescriptor from '@/views/elective/generation/components/e
 
 export default {
   components: { ElectiveFlowRankDescriptor, ElectiveFlowMajor, ElectiveGenerationFlowLog, MxCondition },
-  mixins: [transferMixin, groupTranslateMixin],
+  mixins: [transferMixin, groupTranslateMixin, ElectiveColorMap],
   name: 'generation-detail',
   computed: {
     ...mapGetters(['school']),
@@ -78,7 +82,8 @@ export default {
       return y + s + n
     },
     subTitle() {
-      const g = Object.values(config.electiveGenerationOptions).find(opt => opt.value == this.prevData.queryGeneration)
+      if (this.prevData.isAccumulate) return ''
+      const g = Object.values(config.electiveGenerationOptions).find(opt => opt.value == this.prevData.activeGeneration)
       const hideGeneration = g == config.electiveGenerationOptions.init || g == config.electiveGenerationOptions.terminate
       return hideGeneration ? '' : g?.title || ''
     },
@@ -101,7 +106,7 @@ export default {
       const ignoreGroups = this.prevData.ignoreGroupCategories.includes(this.queryParams.generationQueryCode)
       const columns = {
         className: { label: '班级' },
-        studentName: { label: '姓名' }
+        studentName: { label: '姓名', slot: 'studentName' }
       }
       if (!ignoreGroups) {
         columns.groupName = { label: queryCategory.detailName || '组合' }
@@ -221,6 +226,11 @@ export default {
         rankDescriptors: mergedHistories.last(i => !!i.rankDescriptors?.length)?.rankDescriptors
       }
     },
+    getStudentNameCellStyle(row) {
+      const style = {}
+      if (row.color) style.color = this.matchElectiveColor(row.color)
+      return style
+    },
     handleFlowLog(row) {
       this.logRow = row
       this.logVisible = true

src/views/permission/components/group-query-dialog.vue → src/views/elective/publish/components/group-query-dialog.vue

@@ -13,7 +13,7 @@
   </el-dialog>
 </template>
 <script>
-import GroupSubjectQuery from'./group-subject-query'
+import GroupSubjectQuery from '../../../permission/components/group-subject-query'
 export default {
   name: 'GroupQueryDialog',
   components: {

src/views/permission/components/round-settings.vue → src/views/elective/publish/components/round-settings.vue

@@ -1,26 +1,25 @@
 <template>
   <div>
-    <el-button type="primary" @click="settingsVisible=true" icon="el-icon-setting" size="small">打开选科设置</el-button>
-    <el-drawer :visible.sync="settingsVisible" title="选科设置" size="80%">
+    <el-card>
       <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
                     @invalid="handleInvalidQuery"></mx-condition>
-      <div class="mt20 pl20 pr20">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" class="mb5" @click="handleSettingAdd">新增
-        </el-button>
-        <mx-table :prop-defines="tableDefines" :rows="dataList">
-          <template #actions="{row}">
-            <el-button type="text" @click="handleSettingEdit(row)">
-              <i class="el-icon-edit"></i>编辑
-            </el-button>
-            <el-button type="text" @click="handleSettingDelete(row)">
-              <i class="el-icon-delete"></i>删除
-            </el-button>
-          </template>
-        </mx-table>
-        <pagination v-show="total>queryParams.pageSize" :total="total" :limit.sync="queryParams.pageSize"
-                    :page.sync="queryParams.pageNum" @pagination="handleQuery"></pagination>
-      </div>
-    </el-drawer>
+    </el-card>
+    <div class="mt20">
+      <el-button type="primary" plain icon="el-icon-plus" size="mini" class="mb5" @click="handleSettingAdd">新增
+      </el-button>
+      <mx-table :prop-defines="tableDefines" :rows="dataList">
+        <template #actions="{row}">
+          <el-button type="text" @click="handleSettingEdit(row)">
+            <i class="el-icon-edit"></i>编辑
+          </el-button>
+          <el-button type="text" @click="handleSettingDelete(row)">
+            <i class="el-icon-delete"></i>删除
+          </el-button>
+        </template>
+      </mx-table>
+      <pagination v-show="total>queryParams.pageSize" :total="total" :limit.sync="queryParams.pageSize"
+                  :page.sync="queryParams.pageNum" @pagination="handleQuery"></pagination>
+    </div>
     <el-drawer v-if="stepsVisible" :visible.sync="stepsVisible" :title="modifyTitle" :append-to-body="true" size="70%">
       <round-setting-steps :settingModel="settingModel" :default-active-step="activeStep" :year-options="yearOptions"
                            @do-post="handleSubmit"></round-setting-steps>
@@ -41,7 +40,7 @@ import {
   saveScoreImportConfig,
   updateRound
 } from '@/api/webApi/selection'
-import RoundSettingSteps from '@/views/permission/components/steps/round-setting-steps'
+import RoundSettingSteps from '@/views/elective/publish/components/steps/round-setting-steps'
 
 export default {
   mixins: [selectTranslateMixin, RoundModelConvert],
@@ -50,7 +49,6 @@ export default {
   data() {
     return {
       // drawer
-      settingsVisible: false,
       stepsVisible: false,
       activeStep: 0,
       // query list

src/views/permission/components/steps/fauclty/faculty-result.vue → src/views/elective/publish/components/steps/fauclty/faculty-result.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import OverUnderBadge from '@/views/permission/components/steps/fauclty/over-under-badge'
+import OverUnderBadge from '@/views/elective/publish/components/steps/fauclty/over-under-badge'
 export default {
   name: 'faculty-result',
   components: { OverUnderBadge },
@@ -73,7 +73,4 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-badge__content.is-fixed {
-  top: 8px;
-}
 </style>

src/views/permission/components/steps/fauclty/over-under-badge.vue → src/views/elective/publish/components/steps/fauclty/over-under-badge.vue

@@ -41,13 +41,13 @@ export default {
     },
     badgeValue() {
       if (!this.valid) return ''
-      if (this.value * 1 > 0) return this.exchange ? this.underText : this.overText
-      return this.exchange ? this.overText : this.underText
+      if (this.value * 1 > 0) return !this.exchange ? this.underText : this.overText
+      return !this.exchange ? this.overText : this.underText
     },
     badgeType() {
-      if (!this.valid) return this.exchange ? this.overType : this.underType
-      if (this.value * 1 > 0) return this.exchange ? this.underType : this.overType
-      return this.exchange ? this.overType : this.underType
+      if (!this.valid) return !this.exchange ? this.overType : this.underType
+      if (this.value * 1 > 0) return !this.exchange ? this.underType : this.overType
+      return !this.exchange ? this.overType : this.underType
     }
   },
   methods: {}
@@ -55,5 +55,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .el-badge__content.is-fixed {
+  top: 8px;
+}
 </style>

src/views/permission/components/steps/round-setting-group-models.vue → src/views/elective/publish/components/steps/round-setting-group-models.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import RoundSettingGroup from '@/views/permission/components/steps/round-setting-group'
+import RoundSettingGroup from '@/views/elective/publish/components/steps/round-setting-group'
 
 export default {
   name: 'round-setting-group-models',

src/views/permission/components/steps/round-setting-group.vue → src/views/elective/publish/components/steps/round-setting-group.vue

@@ -94,11 +94,11 @@
 <script>
 import ChooseSubjectDialog from '@/views/system/user/profile/components/choose-subject-dialog'
 import selectTranslateMixin from '@/components/Cache/modules/mx-select-translate-mixin'
-import RoundScoreQuery from '@/views/permission/components/round-score-query'
-import FacultyForms from '@/views/permission/components/steps/fauclty/faculty-forms'
+import RoundScoreQuery from '@/views/elective/publish/components/round-score-query'
+import FacultyForms from '@/views/elective/publish/components/steps/fauclty/faculty-forms'
 import RoundModelConvert from '../round-model-convert'
 import { calculateFaculties, generateFaculties } from '@/api/webApi/selection'
-import FacultyResult from '@/views/permission/components/steps/fauclty/faculty-result'
+import FacultyResult from '@/views/elective/publish/components/steps/fauclty/faculty-result'
 import GroupQueryDialog from '../group-query-dialog'
 
 export default {

src/views/permission/components/steps/round-setting-steps.vue → src/views/elective/publish/components/steps/round-setting-steps.vue

@@ -23,11 +23,11 @@
 </template>
 
 <script>
-import RoundSettingScore from '@/views/permission/components/steps/round-setting-score'
-import RoundSettingWeight from '@/views/permission/components/steps/round-setting-weight'
-import RoundSettingGroup from '@/views/permission/components/steps/round-setting-group'
-import RoundSettingPublish from '@/views/permission/components/steps/round-setting-publish'
-import RoundSettingGroupModels from '@/views/permission/components/steps/round-setting-group-models'
+import RoundSettingScore from '@/views/elective/publish/components/steps/round-setting-score'
+import RoundSettingWeight from '@/views/elective/publish/components/steps/round-setting-weight'
+import RoundSettingGroup from '@/views/elective/publish/components/steps/round-setting-group'
+import RoundSettingPublish from '@/views/elective/publish/components/steps/round-setting-publish'
+import RoundSettingGroupModels from '@/views/elective/publish/components/steps/round-setting-group-models'
 import config from '@/common/mx-config'
 
 export default {

src/views/elective/publish/index.vue

@@ -0,0 +1,17 @@
+<template>
+  <div class="app-container">
+    <round-settings></round-settings>
+  </div>
+</template>
+
+<script>
+import RoundSettings from '@/views/elective/publish/components/round-settings'
+export default {
+  name: 'ElectivePublishIndex',
+  components: { RoundSettings }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/permission/components/round-settings-entry.vue

@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <el-button type="primary" @click="settingsVisible=true" icon="el-icon-setting" size="small">打开选科设置</el-button>
+    <el-drawer :visible.sync="settingsVisible" title="选科设置" size="80%">
+      <round-settings></round-settings>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import RoundSettings from '@/views/elective/publish/components/round-settings'
+export default {
+  name: 'round-settings-entry',
+  components: { RoundSettings },
+  data() {
+    return {
+      settingsVisible: false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -4,7 +4,7 @@
       <template #header>
         <div class="fx-row fx-bet-cen">
           <div class="fx-row">
-            <round-settings v-if="isFrontMaster" class="mr10"></round-settings>
+            <round-settings-entry v-if="isFrontMaster" class="mr10"></round-settings-entry>
             <round-history></round-history>
           </div>
           <span>选科管理</span>
@@ -60,17 +60,17 @@
 </template>
 
 <script>
-import RoundSettings from '@/views/permission/components/round-settings'
 import RoundHistory from '@/views/system/user/profile/components/round-history'
 import MxCondition from '@/components/MxCondition/mx-condition'
 import { mapGetters } from 'vuex'
 import { getSelectDetail, getSelectReport, sendSelectedNotice } from '@/api/webApi/selection'
 import MxChart from '@/components/MxChart/index'
 import MxTableDynamic from '@/components/MxTableDynamic/index'
+import RoundSettingsEntry from '@/views/permission/components/round-settings-entry'
 
 export default {
   name: 'round-select-manage',
-  components: { MxTableDynamic, MxChart, MxCondition, RoundHistory, RoundSettings },
+  components: { RoundSettingsEntry, MxTableDynamic, MxChart, MxCondition, RoundHistory },
   data() {
     return {
       requireFields: ['year', 'roundId'],