Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/view/learnactivity/markpaper/MarkSetting.vue

@@ -79,13 +79,13 @@
                 <div class="setting-content" id="teacher-wrap-content">
                     <Form ref="teacherSet" :model="subsInfo" label-colon :label-width="100" :rules="ruleValidate" style="margin-top:15px">
                         <Row>
-                            <Col :md="24" :lg="24" :xl="24" :xxl="24" v-if="setting.isErr">
+                            <Col :md="24" :lg="24" :xl="24" :xxl="24">
                             <!-- 异常处理老师 -->
-                            <!-- <FormItem :label="$t('learnActivity.mark.errRole')" class="setting-item-wrap" prop="err">
+                            <FormItem :label="$t('learnActivity.mark.errRole')" class="setting-item-wrap" prop="err">
                                 <Select v-model="subsInfo.err" style="width:400px" multiple>
                                     <Option v-for="(item,index) in teacherList" :value="item.id" :key="index">{{item.name}}</Option>
                                 </Select>
-                            </FormItem> -->
+                            </FormItem>
                             </Col>
                             <Col :md="24" :lg="24" :xl="24" :xxl="24" v-if="setting.isArb">
                             <!-- 仲裁老师 -->
@@ -247,12 +247,12 @@ export default {
                 // isArb: [
                 //     { required: true, type: 'number', message: '请设置分差超过1/6的题目是否需要仲裁', trigger: 'change' }
                 // ],
-                // arb: [
-                //     { required: true, type: 'array', message: '请设置仲裁老师', trigger: 'change' }
-                // ],
-                // err: [
-                //     { required: true, type: 'array', message: '请设置异常处理老师', trigger: 'change' }
-                // ],
+                arb: [
+                    { required: true, type: 'array', message: '请设置仲裁老师', trigger: 'change' }
+                ],
+                err: [
+                    { required: true, type: 'array', message: '请设置异常处理老师', trigger: 'change' }
+                ],
                 markers: [
                     { required: true, type: 'array', message: this.$t('learnActivity.mark.markerErr'), trigger: 'change' }
                 ],

TEAMModelOS/ClientApp/src/view/task/arb/Arbitration.vue

@@ -34,10 +34,6 @@
                                 2021-09-01
                             </span>
                         </p>
-                        <!-- <p style="margin-top:5px">
-                            <Icon type="md-time" />
-                            2021-09-01
-                        </p> -->
                     </div>
                     <div style="width:100px">
                         <Button type="primary" shape="circle" size="small" long>仲裁</Button>
@@ -113,13 +109,16 @@ export default {
     height: ~"calc(100% - 45px)";
 }
 .arb-paper-item {
-    width: ~"calc(100% - 20px)";
-    margin: 6px 5px;
+    width: ~"calc(100% - 15px)";
+    margin: 6px 5px 6px 0px;
     border: 1px solid #363636;
     background: #2b2a2f;
     padding: 15px;
     display: flex;
     align-items: center;
     border-radius: 0px;
+    &:hover{
+        background: #383838;
+    }
 }
 </style>

TEAMModelOS/ClientApp/src/view/task/index.vue

@@ -403,9 +403,19 @@ export default {
         },
         //当前阅卷任务已阅学生信息
         marked() {
-            if (this.markData && this.markData.objs) {
-                return this.markData.objs.filter(item => {
-                    return item.scores.indexOf(-1) == -1
+            if (this.markData) {
+                console.log('数据',this.markData)
+                return this.markData.objs.filter((item) => {
+                    let scores = item.item.map(scoreItem => {
+                        return scoreItem.sc
+                    })
+                    //如果是按题分配的任务，只验证指定给老师的题目
+                    if (this.markList[this.curTaskIndex].qu.length) {
+                        scores = scores.filter((sItem, sIndex) => {
+                            return this.markList[this.curTaskIndex].qu.includes(sIndex)
+                        })
+                    }
+                    return !scores.includes(-1)
                 })
             } else {
                 return []
@@ -413,9 +423,18 @@ export default {
         },
         //当前阅卷任务进行中学生信息
         marking() {
-            if (this.markData && this.markData.objs) {
-                return this.markData.objs.filter(item => {
-                    return item.scores.indexOf(-1) !== -1
+            if (this.markData) {
+                return this.markData.objs.filter((item) => {
+                    let scores = item.item.map(scoreItem => {
+                        return scoreItem.sc
+                    })
+                    //如果是按题分配的任务，只验证指定给老师的题目
+                    if (this.markList[this.curTaskIndex].qu.length) {
+                        scores = scores.filter((sItem, sIndex) => {
+                            return this.markList[this.curTaskIndex].qu.includes(sIndex)
+                        })
+                    }
+                    return scores.includes(-1)
                 })
             } else {
                 return []