diff --git a/src/views/system/logManage/deviceLog/index.vue b/src/views/system/logManage/deviceLog/index.vue index a384b13..e991651 100644 --- a/src/views/system/logManage/deviceLog/index.vue +++ b/src/views/system/logManage/deviceLog/index.vue @@ -3,13 +3,13 @@
- 导出 + @@ -36,8 +36,9 @@ @selection-change="selectionChangeHandler" > - - + + @@ -55,7 +56,6 @@
{{ scope.row.i64Ts | parseTime }}
-
@@ -113,9 +113,12 @@ export default { } else if (this.optionVal === 'roomName') { this.crud.query.roomName = this.keyWord } - if (this.queryTime.length > 0) { + if (this.queryTime && this.queryTime.length !== 0) { this.crud.query.startTime = this.queryTime[0] this.crud.query.endTime = this.queryTime[1] + } else { + this.crud.query.startTime = null + this.crud.query.endTime = null } }, // 导出 diff --git a/src/views/system/logManage/index.vue b/src/views/system/logManage/index.vue index 92e1d97..7a0845a 100644 --- a/src/views/system/logManage/index.vue +++ b/src/views/system/logManage/index.vue @@ -11,6 +11,7 @@
  • 通道门日志
  • 门禁日志
  • 密集架日志
  • +
  • 库房环控日志
  • @@ -28,6 +29,7 @@ import doorLog from './doorLog/index.vue' import accessDoorLog from './accessDoorLog/index.vue' import portLog from './portLog/index.vue' import deviceLog from './deviceLog/index.vue' +import storeLog from './storeLog/index.vue' export default { name: 'LogManage', @@ -38,7 +40,8 @@ export default { doorLog, portLog, accessDoorLog, - deviceLog + deviceLog, + storeLog }, data() { return { @@ -59,6 +62,8 @@ export default { return 'doorLog' } else if (this.activeIndex === 5) { return 'deviceLog' + } else if (this.activeIndex === 6) { + return 'storeLog' } // else if (this.activeIndex === 4) { // return 'portLog' diff --git a/src/views/system/logManage/storeLog/index.vue b/src/views/system/logManage/storeLog/index.vue new file mode 100644 index 0000000..b2b968b --- /dev/null +++ b/src/views/system/logManage/storeLog/index.vue @@ -0,0 +1,136 @@ + + + + +