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

doc/Mind/ElectiveGeneration.cs

@@ -99,7 +99,7 @@ namespace mxdemo.Mind
         bool doneDMAlgorithm; // 当前为决策进程，且已经运行了匹配算法
         // 5.13 现在只有forceAdjust阶段开放
         bool allowForce; // 当前阶段是否开放了强制调剂功能
-        bool enableForceAdjustEntry; // 当前是否展示强制阶段入口：2次补录结果匹配算法之后一定展示此入口；如果提前录取完毕，加个匹配项控制是否展示此入口（最好配置到round,作为后门），默认不展示
+        bool enablePushForceAdjust; // 当前是否展示强制阶段入口：2次补录结果匹配算法之后一定展示此入口；如果提前录取完毕，加个匹配项控制是否展示此入口（最好配置到round,作为后门），默认不展示
     }
 
     // 1 初选决策时，需要进行设置

mock/modules/elective-generation.js

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

src/views/career/subject/components/select-subjec-report.vue

@@ -2,7 +2,7 @@
   <div class="pb20">
     <div class="mb10">
       <span class="tabs-item" @click="activeType = 0" :class="{'bg-primary':activeType == 0}">我的收藏</span>
-      <span class="tabs-item" @click="activeType = 1" :class="{'bg-primary':activeType == 1}">我的自选</span>
+      <span class="tabs-item" @click="activeType = 1" :class="{'bg-primary':activeType == 1}">我的选科收藏</span>
       <span class="tabs-item" @click="activeType = 2" :class="{'bg-primary':activeType == 2}">我的测评选科</span>
     </div>
     <mx-table v-if="activeType == 0 || activeType == 1"  :propDefines="propDefine" :rows="collectList">
@@ -63,7 +63,7 @@ export default {
       activeType: '',
       recomProp: {
         majorCategoryCode:{
-          label:'专业code'
+          label:'专业编码'
         },
         majorCategoryName:{
           label:'专业名称'

src/views/career/subject/subjectChoice.vue

@@ -163,6 +163,10 @@
       year: {
         type: Number,
         default: ''
+      },
+      readonly: {
+        type: Boolean,
+        default: false
       }
     },
     components : {
@@ -216,12 +220,14 @@
             align: "left",
           },
           collect: {
+            hidden: this.readonly,
             label: "收藏",
             align: "left",
             slot: "collect",
             width: "100px",
           },
           subjectCollect: {
+            hidden: this.readonly,
             label: "选科收藏",
             align: "left",
             slot: "select",

src/views/components/user-validation-mixin.js

@@ -143,6 +143,8 @@ export default {
                     }
                     exist.classList.push({ classId })
                 })
+            } else {
+              delete data.gradeClass
             }
             return data
         }

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

@@ -67,7 +67,7 @@ export default {
       return Object.values(options).find(opt => opt.value == next).title
     },
     showForceAdjustSend() {
-      return this.status.enableForceAdjustEntry
+      return this.status.enablePushForceAdjust
     },
     showSend() {
       return this.status.doneDMAlgorithm && !this.status.allMatched

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

@@ -85,7 +85,7 @@
                          :group-model="groupModel" :default-group-id="scoreQueryGroupId"></round-score-query>
     </el-dialog>
     <!--  查看专业  -->
-    <choose-subject-dialog ref="chooseDialog"></choose-subject-dialog>
+    <choose-subject-dialog ref="chooseDialog" readonly></choose-subject-dialog>
     <!--  选科大数据分析  -->
     <group-query-dialog ref="groupQueryDialog"></group-query-dialog>
   </div>

src/views/system/user/profile/components/choose-subject-dialog.vue

@@ -1,32 +1,45 @@
 <template>
-    <el-dialog
-      append-to-body
-      v-if="dialogVisible"
-      title="选择自选专业"
-      :visible.sync="dialogVisible"
-      :before-close="handlerClose"
-      :close-on-click-modal ="false"
-      width="70%"
-    >
-      <subject-choice :course0="course0" :course1="course1" :year="year" ></subject-choice>
-      <span slot="footer" class="dialog-footer">
+  <el-dialog
+    append-to-body
+    v-if="dialogVisible"
+    title="选择自选专业"
+    :visible.sync="dialogVisible"
+    :before-close="handlerClose"
+    :close-on-click-modal="false"
+    width="70%"
+  >
+    <subject-choice :course0="course0" :course1="course1" :year="year" :readonly="readonly"></subject-choice>
+    <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel">确 定</el-button>
       </span>
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
-import SubjectChoice from'@/views/career/subject/subjectChoice'
+import SubjectChoice from '@/views/career/subject/subjectChoice'
+
 export default {
   components: {
     SubjectChoice
   },
-  inject: ['optionalMajors'],
+  inject: {
+    optionalMajors: {
+      default: function() {
+        // default - empty function
+      }
+    }
+  },
+  props: {
+    readonly: {
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
-    return{
-      dialogVisible:false,
+    return {
+      dialogVisible: false,
       course0: '',
       year: '',
-      course1: '',
+      course1: ''
     }
   },
   methods: {
@@ -34,7 +47,7 @@ export default {
       console.log('res')
       this.cancel()
     },
-    open(course0, course1,year) {
+    open(course0, course1, year) {
       this.dialogVisible = true
       this.year = year || ''
       this.course0 = course0

src/views/system/user/profile/userInfo.vue

@@ -12,6 +12,9 @@
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" disabled="disabled" maxlength="11" />
     </el-form-item>
+    <el-form-item v-if="isFrontStudent" label="学号" prop="sno">
+      <el-input v-model="user.sno" />
+    </el-form-item>
     <el-form-item label="性别">
       <el-radio-group v-model="user.sex">
         <el-radio label="0">男</el-radio>
@@ -27,7 +30,7 @@
 
 <script>
 import { updateUserProfile, getUserProfile } from "@/api/system/user";
-import { mapActions } from "vuex";
+import { mapActions, mapGetters } from 'vuex'
 
 export default {
   props: {
@@ -35,6 +38,9 @@ export default {
       type: Object,
     },
   },
+  computed: {
+    ...mapGetters(['isFrontStudent'])
+  },
   data() {
     return {
       // 表单校验