From 391f66b96a3643279cb45396dd42ec757ad7168e Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 7 Jun 2023 17:33:35 +0800
Subject: [PATCH] 异常设备信息显示问题,单题型总分错误

---
 src/views/examinationPaper/edit.vue | 21 ++++++++++++++-------
 src/views/standard/device/error.vue | 30 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 4a11dbc..778aa7d 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -2,7 +2,7 @@
   <div>
     <back-box>
       <template slot="title">
-        <span>{{type == 1?'修改试卷':'修改答案'}}</span>
+        <span>{{ type == 1 ? "修改试卷" : "修改答案" }}</span>
       </template>
     </back-box>
     <div class="content">
@@ -14,7 +14,7 @@
           }}老师修改了答案
         </p></template
       >
-      <div class="answer-title" :class="type == 1?'t-left':''">
+      <div class="answer-title" :class="type == 1 ? 't-left' : ''">
         <p class="name-box" v-if="type == 1">
           <span>试卷名称：</span>
           <el-input class="ipt-name" v-model="form.title"></el-input>
@@ -310,7 +310,8 @@
         <el-button type="danger" plain round @click="linkBack">取消</el-button>
         <el-button type="primary" round @click="save">保存</el-button>
       </div>
-      <el-dialog :close-on-click-modal="false"
+      <el-dialog
+        :close-on-click-modal="false"
         title="批量设置答案"
         :visible.sync="diaSetAns"
         width="400"
@@ -394,7 +395,8 @@
           <el-button @click="diaSetAns = false">取 消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :close-on-click-modal="false"
+      <el-dialog
+        :close-on-click-modal="false"
         :title="stem.type == 1 ? '上传题干' : '上传题目解析'"
         :visible.sync="dialogStem"
         v-if="dialogStem"
@@ -427,7 +429,12 @@
           <el-button @click="dialogStem = false">关闭弹窗</el-button>
         </div>
       </el-dialog>
-      <el-dialog :close-on-click-modal="false" title="题目打标" :visible.sync="dialogTag" width="500">
+      <el-dialog
+        :close-on-click-modal="false"
+        title="题目打标"
+        :visible.sync="dialogTag"
+        width="500"
+      >
         <div>
           <el-form ref="form" :model="stem" label-width="160px">
             <el-form-item label="题目难度：">
@@ -520,7 +527,7 @@ export default {
             return a + (Number(b.score) || 0);
           }, 0);
         } else {
-          score += item.score;
+          score += (item.score || 0);
         }
       }, 0);
       return Number(score).toFixed(2);
@@ -1126,7 +1133,7 @@ export default {
   color: #333;
   font-weight: 700;
   padding: 20px 0;
-  &.t-left{
+  &.t-left {
     text-align: left;
   }
   .totals {
diff --git a/src/views/standard/device/error.vue b/src/views/standard/device/error.vue
index 5282f0a..a2e0579 100644
--- a/src/views/standard/device/error.vue
+++ b/src/views/standard/device/error.vue
@@ -13,21 +13,6 @@
           align="center"
           width="160"
         ></el-table-column>
-        <el-table-column prop="abnormalSource" label="信息来源" align="center">
-          <template slot-scope="scoped">
-            {{
-              scoped.row.abnormalSource == 0
-                ? "无"
-                : scoped.row.abnormalSource == 1
-                ? "云平台"
-                : scoped.row.abnormalSource == 2
-                ? "授课端"
-                : scoped.row.abnormalSource == 3
-                ? "出厂工具"
-                : "发卡工具"
-            }}
-          </template>
-        </el-table-column>
         <el-table-column prop="deviceType" label="设备类型" align="center">
           <template slot-scope="scoped">
             {{
@@ -83,6 +68,21 @@
           label="状态"
           align="center"
         ></el-table-column>
+        <el-table-column prop="abnormalSource" label="信息来源" align="center">
+          <template slot-scope="scoped">
+            {{
+              scoped.row.abnormalSource == 0
+                ? "无"
+                : scoped.row.abnormalSource == 1
+                ? "云平台"
+                : scoped.row.abnormalSource == 2
+                ? "授课端"
+                : scoped.row.abnormalSource == 3
+                ? "出厂工具"
+                : "发卡工具"
+            }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="100"
           ><template slot-scope="scoped">
             <el-link
--
libgit2 0.21.4