diff --git a/src/views/device/index.vue b/src/views/device/index.vue index 3940fbd..90fc88b 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -572,7 +572,7 @@ export default { pairingCode: [ { required: true, message: "请输入配对码", trigger: "blur" }, ], - // classIds: [{ required: true, message: "请选择班级", trigger: "blur" }], + classIds: [{ required: true, message: "请选择班级", trigger: "blur" }], }, tableData: [], total: 0, diff --git a/src/views/device/log.vue b/src/views/device/log.vue index 4bdb4ba..d283e16 100644 --- a/src/views/device/log.vue +++ b/src/views/device/log.vue @@ -10,9 +10,6 @@ {{ device.sn }} - {{ - device.electricity - }} {{ device.pairingCode }} @@ -21,12 +18,18 @@ item.className }} - {{ - device.latestReportTime + {{ + device.modifiedTime }} - {{ + {{ device.answerTimes }} + {{ + device.otaVersionName + }} + {{ + device.electricity + }}
@@ -64,7 +67,9 @@ >本季度

- 筛选 + 筛选
@@ -111,6 +116,7 @@ import { formatDate } from "utils"; export default { data() { return { + type: 1, id: "", date: "", //今天-昨天-本周 query: { @@ -125,8 +131,9 @@ export default { electricity: "", pairingCode: "", classList: [], - latestReportTime: "", + modifiedTime: "", answerTimes: "", + otaVersionName:"" }, total: 0, page: 1, @@ -135,6 +142,7 @@ export default { }, created() { this.id = this.$route.query.id; + this.type = this.$route.query.type; this._QueryDetail(); this.setDate(1); let startDay = this.query?.startDay; @@ -302,7 +310,7 @@ export default { .table-box { padding: 0 20px; } -.serach-box{ - margin-left:20px; +.serach-box { + margin-left: 20px; } \ No newline at end of file