diff --git a/src/views/device/log.vue b/src/views/device/log.vue
index d283e16..ca617da 100644
--- a/src/views/device/log.vue
+++ b/src/views/device/log.vue
@@ -21,8 +21,8 @@
         <el-descriptions-item label="操作时间">{{
           device.modifiedTime
         }}</el-descriptions-item>
-        <el-descriptions-item v-if="type == 2" label="答题次数">{{
-          device.answerTimes
+        <el-descriptions-item v-if="type == 1" label="所在教室">{{
+          device.roomName
         }}</el-descriptions-item>
         <el-descriptions-item v-if="type == 1" label="固件版本号">{{
           device.otaVersionName
@@ -30,6 +30,9 @@
         <el-descriptions-item v-if="type == 2" label="电量">{{
           device.electricity
         }}</el-descriptions-item>
+        <el-descriptions-item v-if="type == 2" label="答题次数">{{
+          device.answerTimes
+        }}</el-descriptions-item>
       </el-descriptions>
     </div>
     <div class="answer-header">
@@ -94,6 +97,18 @@
           label="日志内容"
           align="center"
         ></el-table-column>
+        <el-table-column
+        v-if="type == 2"
+          prop="submit"
+          label="提交次数"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+        v-if="type == 2"
+          prop="electricity"
+          label="电量"
+          align="center"
+        ></el-table-column>
       </el-table>
     </div>
     <div class="pagination-box">
@@ -133,6 +148,7 @@ export default {
         classList: [],
         modifiedTime: "",
         answerTimes: "",
+        roomName: "",
         otaVersionName:""
       },
       total: 0,