分组API对接、评测试卷挑选bug、默认题库页面

TEAMModelOS/ClientApp/src/view/classmgt/ManageClass.vue

@@ -339,8 +339,26 @@ export default {
         },
         saveGroup() {
             this.tableLoading = true
+            // this.$api.schoolSetting.upsertGroup({
+            //     classroom: this.classList[this.curClassIndex]
+            // }).then(
+            //     (res) => {
+            //         if (!res.error) {
+            //             this.$Message.success(this.$t('cusMgt.saveOk'))
+            //         } else {
+            //             this.$Message.error('API error!')
+            //         }
+            //     },
+            //     (err) => {
+            //         this.$Message.error('API error!')
+            //     }
+            // ).finally(() => {
+            //     setTimeout(() => {
+            //         this.tableLoading = false
+            //     }, 500)
+            // })
             this.$api.schoolSetting.upsertGroup({
-                classroom: this.classList[this.curClassIndex]
+                students: this.classList[this.curClassIndex].students
             }).then(
                 (res) => {
                     if (!res.error) {
@@ -357,7 +375,6 @@ export default {
                     this.tableLoading = false
                 }, 500)
             })
-
         },
         comfirmCustomRules() {
             if (this.groupNum === 0) {
@@ -391,22 +408,11 @@ export default {
             this.classList[this.curClassIndex].students = this.classList[this.curClassIndex].students.sort((a, b) => {
                 a.seatNo > b.seatNo
             })
-            // for (let i = 0; i < maxCount; i++) {
-            //     for (let j = 0; j < this.groupNum; j++) {
-            //         let startIndex = this.groupNum * i
-            //         if (startIndex + j < stuLen) {
-            //             this.$set(this.classList[this.curClassIndex].students[startIndex + j], 'groupId', i + 1)
-            //             this.$set(this.classList[this.curClassIndex].students[startIndex + j], 'groupName', (i + 1) + this.$t('cusMgt.groupUnit'))
-            //         } else {
-            //             break
-            //         }
-            //     }
-            // }
             for (let i = 0; i < this.groupNum; i++) {
                 let num = surplus == 0 ? maxCount : i < surplus ? maxCount : maxCount - 1 //每组实际人数
                 for (let j = 0; j < num; j++) {
                     let startIndex = i + (j * this.groupNum)
-                    this.$set(this.classList[this.curClassIndex].students[startIndex], 'groupId', i + 1)
+                    this.$set(this.classList[this.curClassIndex].students[startIndex], 'groupId', (i + 1)+'')
                     this.$set(this.classList[this.curClassIndex].students[startIndex], 'groupName', (i + 1) + this.$t('cusMgt.groupUnit'))
                 }
             }

TEAMModelOS/ClientApp/src/view/learnactivity/CreateSchoolEva.vue

@@ -179,7 +179,7 @@ export default {
                     { required: true, type: 'number', message: this.$t('learnActivity.createEv.errTips9'), trigger: 'change' }
                 ]
             },
-            activeTab: 'preview',
+            activeTab: 'manualPaper', //默认到试卷库
             curSubIndex: 0,
             evaluationInfo: {
                 name: '',

TEAMModelOS/ClientApp/src/view/learnactivity/ManualPaper.vue

@@ -201,7 +201,7 @@ export default {
                 let params = {
                     '@DESC': 'createTime',
                     'code': this.scope,
-                    "scope": scope,
+                    "scope": this.routeScope,
                     //'gradeIds[*]': scope == 'school' ? this.gradeIds : [],
                     'gradeIds[*]': [],
                     'periodId': scope == 'school' ? this.searchPeriod : [],
@@ -226,7 +226,6 @@ export default {
     },
     created() {
         this.routeScope = this.$route.name == 'createPrivEva' ? 'private' : 'school'
-        this.scope = this.$store.state.userInfo.TEAMModelId
         this.$store.dispatch('user/getSchoolProfile').then(
             res => {
                 this.schoolBase = res.school_base
@@ -284,10 +283,14 @@ export default {
         },
         source:{
             handler(n,o){
+                console.log(this.$route.name)
                 if(this.source){
                     this.scope = this.source
+                }else{
+                    this.scope = this.$route.name == 'createPrivEva' ? this.$store.state.userInfo.TEAMModelId : this.$store.state.userInfo.schoolCode
                 }
-            }
+            },
+            immediate:true
         }
 
     }

TEAMModelOS/ClientApp/src/view/schoolmgmt/ClassroomSetting/ClassroomSetting.vue

@@ -122,7 +122,7 @@
                                     <span slot="label" class="class-attr-wrap-label">{{$t('schoolBaseInfo.classroomCode')}}</span>
                                     <Input @on-change="watchUpdate" :disabled="editStatus" v-model="classroomListShow[curClassIndex].no" clearable :placeholder="$t('schoolBaseInfo.classroomCodeHolder')" />
                                 </FormItem>
-                                <FormItem prop="gradeId" :label="$t('schoolBaseInfo.setGrade')" @click.native.stop class="requird-color">
+                                <FormItem prop="gradeId" :label="$t('schoolBaseInfo.setGrade')" @click.native.stop class="requird-color" v-if="classroomListShow[curClassIndex].openType == '1'">
                                     <span slot="label" class="class-attr-wrap-label">{{$t('schoolBaseInfo.setGrade')}}</span>
                                     <Select @on-change="watchUpdate" :disabled="editStatus" v-model="classroomListShow[curClassIndex].gradeId" clearable>
                                         <Option v-for="(item,index) in $jsFn.getPeriod($store.state.user.schoolProfile.school_base,classroomListShow[curClassIndex].periodId).grades" :value="item.id" :key="index">