Merge branch 'master' into select-subject

doc/Mind/FacultyEstimate.cs

@@ -27,8 +27,6 @@ namespace mxdemo.Mind
         public int actualClassesCount; // 实际课时
         public int missingClassesCount; // 缺少课时，正数表示缺的，负数表示超的
         public int missingTeacherCount; // 缺少老师，正负同上
-
-        public bool completed; // 是否计算结束
     }
 
     public class GroupSetting

src/views/permission/components/round-score-query.vue

@@ -105,8 +105,7 @@ export default {
   },
   computed: {
     groupSource() {
-      console.log(this.settingModel.roundGroups)
-      return { groups: this.settingModel.roundGroups }
+      return { groups: this.groupModel.roundGroups }
     },
     groupQuery() {
       return {
@@ -133,6 +132,7 @@ export default {
       this.localQuery.pageNum = 1
       const params = this[this.activeTab]
       const round = this.toApiModel(this.settingModel)
+      round.activeGroupModelIndex = this.groupModelIndex // NOTE: 这里重用了activeGroupModelIndex，少定义了一个参数字段
       const query = {
         ...params,
         round

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

@@ -187,7 +187,7 @@ export default {
     handleSubmit(commit) {
       const round = this.toApiModel(commit)
       // 提交
-      saveScoreImportConfig({ round }).then(res => {
+      saveScoreImportConfig(round).then(res => {
         this.stepsVisible = false
         this.msgSuccess('保存成功')
         this.handleQuery()