局域网——更新

TEAMModelOS.Extension/IES.Exam/IES.ExamViews/src/view/admin/ActivityManage.vue

@@ -58,9 +58,9 @@
                             <span class="paper-extType" style="border-color: #88a1d8; color: #9fa91d;" v-if="evaluationClient.type === 'Art'">
                                 艺术评测
                             </span>
-                            <div class="short-code">
+                            <!-- <div class="short-code">
                                 <el-button size="mini">暂时隐藏页面</el-button>
-                            </div>
+                            </div> -->
                         </div>
                         <span>{{ evaluationClient.name }}
                             <span v-show="needUpdate.status" style="font-size: 16px; font-weight: normal; margin-left: 60px;">
@@ -195,7 +195,7 @@
                         </el-tab-pane>
                     </el-tabs>
                 </template>
-                <div v-else>暂无活动</div>
+                <div v-else style="text-align: center; margin-top: 18%; font-size: 36px; width: 100%;">暂无活动</div>
             </el-main>
         </el-container>
         <el-dialog title="请输入开卷码" width="30%" :visible.sync="isInputOpen" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
@@ -231,7 +231,9 @@
                     <span style="margin-right: 30px;">时间类型：{{ !item.countdownType ? '无' : item.countdownType === 1 ? '统一作答时长' : '学生个人作答时长' }}</span>
                     <span v-show="item.countdownType">作答时长：{{ item.duration }}</span>
                 </p>
-                <el-button @click="getExamRoundInfo(item.id, true)" style="float: right;">查看详情</el-button>
+                <div style="text-align: right;">
+                    <el-button @click="getExamRoundInfo(item.id, true)" size="mini">查看详情</el-button>
+                </div>
             </div>
         </el-dialog>
         <div class="open-evaluation" v-if="showErrorMsgs">
@@ -903,8 +905,15 @@ export default {
                     this.studentListShow = res.results.map(item => {
                         // 后续要重新处理状态
                         item.isAnswer = item.finished ? 2 : item.pushed ? 1 : 0 //0未开始  1正在作答  2已完成
+                        item.subjectResults = item.subjectResults.map(sub => {
+                            sub.paperProgress = sub.finished ? 100 : 0
+                            return sub
+                        })
                         return item
                     })
+                    this.studentListShow = this.studentListShow.sort((a, b) => {
+                        return a.studentId - b.studentId
+                    })
                     this.$forceUpdate()
                 } else {
                     this.$message({
@@ -944,6 +953,7 @@ export default {
                             type: 'success'
                         });
                         this.onSelectAct(this.curIndex)
+                        sessionStorage.removeItem(this.evaluationClient.id)
                     }
                 } else {
                     this.$message({
@@ -1017,9 +1027,15 @@ export default {
                     this.studentListShow = res.results.map(item => {
                         // 后续要重新处理状态
                         item.isAnswer = item.finished ? 2 : item.pushed ? 1 : 0 //0未开始  1正在作答  2已完成
-                        // item.subject = item.subjectResults
+                        item.subjectResults = item.subjectResults.map(sub => {
+                            sub.paperProgress = sub.finished ? 100 : 0
+                            return sub
+                        })
                         return item
                     })
+                    this.studentListShow = this.studentListShow.sort((a, b) => {
+                        return a.studentId - b.studentId
+                    })
                 }
             }).finally(() => {
                 if(isDialog) this.isLoading.close()

TEAMModelOS.Extension/IES.Exam/IES.ExamViews/src/view/student/ActivityInfo.vue

@@ -194,6 +194,11 @@ export default {
                         message: '当前无评测可以作答',
                         type: 'warning'
                     });
+                    setTimeout(() => {
+                        this.$router.push({
+                            path: "/login/student"
+                        });
+                    }, 1000)
                 }
             })
         },