baoman / Ezquiz_Platform

Commit 4eb3e41b19d62c1c4ba9e4d94f8b39d6d23aa91e

Authored by 梁保满
1 parent 280e7dfe

设备日志显示选项

Inline Side-by-side
Showing 1 changed file with 18 additions and 2 deletions
src/views/device/log.vue
  View file @4eb3e41
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
21 <el-descriptions-item label="操作时间">{{ 21 <el-descriptions-item label="操作时间">{{
22 device.modifiedTime 22 device.modifiedTime
23 }}</el-descriptions-item> 23 }}</el-descriptions-item>
24 - <el-descriptions-item v-if="type == 2" label="答题次数">{{  
25 - device.answerTimes 24 + <el-descriptions-item v-if="type == 1" label="所在教室">{{
  25 + device.roomName
26 }}</el-descriptions-item> 26 }}</el-descriptions-item>
27 <el-descriptions-item v-if="type == 1" label="固件版本号">{{ 27 <el-descriptions-item v-if="type == 1" label="固件版本号">{{
28 device.otaVersionName 28 device.otaVersionName
@@ -30,6 +30,9 @@ @@ -30,6 +30,9 @@
30 <el-descriptions-item v-if="type == 2" label="电量">{{ 30 <el-descriptions-item v-if="type == 2" label="电量">{{
31 device.electricity 31 device.electricity
32 }}</el-descriptions-item> 32 }}</el-descriptions-item>
  33 + <el-descriptions-item v-if="type == 2" label="答题次数">{{
  34 + device.answerTimes
  35 + }}</el-descriptions-item>
33 </el-descriptions> 36 </el-descriptions>
34 </div> 37 </div>
35 <div class="answer-header"> 38 <div class="answer-header">
@@ -94,6 +97,18 @@ @@ -94,6 +97,18 @@
94 label="日志内容" 97 label="日志内容"
95 align="center" 98 align="center"
96 ></el-table-column> 99 ></el-table-column>
  100 + <el-table-column
  101 + v-if="type == 2"
  102 + prop="submit"
  103 + label="提交次数"
  104 + align="center"
  105 + ></el-table-column>
  106 + <el-table-column
  107 + v-if="type == 2"
  108 + prop="electricity"
  109 + label="电量"
  110 + align="center"
  111 + ></el-table-column>
97 </el-table> 112 </el-table>
98 </div> 113 </div>
99 <div class="pagination-box"> 114 <div class="pagination-box">
@@ -133,6 +148,7 @@ export default { @@ -133,6 +148,7 @@ export default {
133 classList: [], 148 classList: [],
134 modifiedTime: "", 149 modifiedTime: "",
135 answerTimes: "", 150 answerTimes: "",
  151 + roomName: "",
136 otaVersionName:"" 152 otaVersionName:""
137 }, 153 },
138 total: 0, 154 total: 0,