Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html

@@ -27,7 +27,7 @@
                 </el-col>
 
                 <el-col :span="12">
-                    考试状态：{{ item.state | paperStateFilter }}
+                    考试状态：{{ item.stateName}}
                 </el-col>
 
             </el-row>
@@ -38,13 +38,27 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: element-js" />
 <script th:inline="javascript">
+    var examStateDatas = [[${@dict.getType('sys_exam_state')}]];
     var app = new Vue({
         el: '#app',
         data: {
-            paperList: []
+            paperList: [[${list}]],
+            examStateList:examStateDatas
         },
         mounted(){
-            this.paperList = [[${list}]];
+            this.paperList = this.updatedPaperList
+        },
+        computed: {
+            updatedPaperList() {
+                return this.paperList.map(paper => {
+                    const match = this.examStateList.find(item => item.dictValue == paper.state);
+                    if (match) {
+                        return { ...paper, stateName: match.dictLabel };
+                    } else {
+                        return paper;
+                    }
+                });
+            }
         },
         methods:{
             formatDate(dateString) {