rename & mock

mock/modules/elective-generation.js

@@ -1,7 +1,7 @@
 const Mock = require('mockjs')
 const Random = Mock['Random']
 
-const mockGeneration = 2 // primary
+const mockGeneration = 7 // primary
 const mockGroups = [1, 2, 3, 4, 5, 6]
 const mockPreferenceCount = 3 // 1 or 3 // 1志愿/3志愿
 
@@ -27,21 +27,21 @@ module.exports = [
             limitPerson: false,
             rankOut: false
           })),
-          allMatched: Random.boolean(1, 10, 8),
+          allMatched: true,
           currentGeneration: mockGeneration,
 
           // +
-          disenrollCount: Random.integer(20, 100), // 未录人数
+          disenrollCount: 0, // 未录人数
           enablePushNextDMGeneration: true,
           allowDMAlgorithm: true,
           doneDMAlgorithm: true,
-          allowForce: Random.boolean(1, 10, 8)
+          allowForce: true,
         }
       }
     }
   },
   {
-    url: '/mock/front/report/getElectiveSummary',
+    url: '/mock/front/elective/generation/getElectiveSummary',
     type: 'get',
     response: config => {
       const results = []
@@ -458,7 +458,7 @@ module.exports = [
     }
   },
   {
-    url: '/mock/front/report/getElectiveGenerationDetails',
+    url: '/mock/front/elective/generation/getElectiveGenerationDetails',
     type: 'get',
     response: config => {
       return {
@@ -503,7 +503,7 @@ module.exports = [
     }
   },
   {
-    url: '/mock/front/report/getGenerationOptionalMajorsBatch',
+    url: '/mock/front/elective/generation/getGenerationOptionalMajorsBatch',
     type: 'get',
     response: config => {
       let studentIds = config.query.studentIds

src/api/webApi/elective/generation.js

@@ -10,7 +10,7 @@ export function getElectiveStatus(params) {
 
 export function getElectiveSummary(params) {
   return request({
-    url: '/front/elective/generation/getElectiveSummary',
+    url: '/mock/front/elective/generation/getElectiveSummary',
     method: 'get',
     params
   })
@@ -18,7 +18,7 @@ export function getElectiveSummary(params) {
 
 export function getElectiveGenerationDetails(params) {
   return request({
-    url: '/front/elective/generation/getElectiveGenerationDetails',
+    url: '/mock/front/elective/generation/getElectiveGenerationDetails',
     method: 'get',
     params
   })
@@ -26,7 +26,7 @@ export function getElectiveGenerationDetails(params) {
 
 export function getGenerationOptionalMajorsBatch(params) {
   return request({
-    url: '/front/elective/generation/getGenerationOptionalMajorsBatch',
+    url: '/mock/front/elective/generation/getGenerationOptionalMajorsBatch',
     method: 'get',
     params
   })

src/common/mx-config.js

@@ -92,7 +92,7 @@ export default {
       code: 'Primary',
       decisionMaking: false,
       stepsVisible: true,
-      title: '初录数据',
+      title: '初录报名',
       description: '',
       icon: ''
     },
@@ -102,7 +102,7 @@ export default {
       code: 'PrimaryDM',
       decisionMaking: true,
       stepsVisible: true,
-      title: '通知补录',
+      title: '初录结果',
       description: '',
       icon: ''
     },
@@ -112,7 +112,7 @@ export default {
       code: 'BackTracking',
       decisionMaking: false,
       stepsVisible: true,
-      title: '补录数据',
+      title: '补录报名',
       description: '',
       icon: ''
     },
@@ -122,7 +122,7 @@ export default {
       code: 'BackTrackingDM',
       decisionMaking: true,
       stepsVisible: true,
-      title: '通知二次补录',
+      title: '补录结果',
       description: '',
       icon: ''
     },
@@ -132,7 +132,7 @@ export default {
       code: 'FinalAdjust',
       decisionMaking: false,
       stepsVisible: true,
-      title: '二次补录数据',
+      title: '二次补录报名',
       description: '',
       icon: ''
     },
@@ -142,7 +142,7 @@ export default {
       code: 'FinalAdjustDM',
       decisionMaking: true,
       stepsVisible: true,
-      title: '调剂决策',
+      title: '二次补录结果',
       description: '',
       icon: ''
     },

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

@@ -10,6 +10,8 @@
       <el-button v-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="jumpTerminate">选科分班</el-button>
+<!--      <el-button type="primary" @click="jumpTerminate">查看分班结果</el-button>-->
+<!--      <el-button type="primary" @click="jumpTerminate">查看选科数据</el-button>-->
     </div>
     <el-dialog :visible.sync="pushSettingFormVisible" :title="nextStepName+'设置'" width="350">
       <elective-generation-push-setting ref="settingForm"/>