diff --git a/pages.json b/pages.json index 0c0397d..9bc717a 100644 --- a/pages.json +++ b/pages.json @@ -127,6 +127,12 @@ "style": { "navigationBarTitleText": "设备状态" } + }, + { + "path": "deviceLog/log", + "style": { + "navigationBarTitleText": "自动模式设备日志" + } } ] }, diff --git a/pages/home/control/automatic.vue b/pages/home/control/automatic.vue index 3737b1b..35f02b7 100644 --- a/pages/home/control/automatic.vue +++ b/pages/home/control/automatic.vue @@ -1162,7 +1162,8 @@ export default { this.$refs.historyDataRef.getAgriList() }) } else if (e.index===1) { - this.$refs.logDialog.open(); + // this.$refs.logDialog.open(); + this.$tab.navigateTo('/pages/news/subpages/deviceLog/log'); } }, closeLogDialog() { diff --git a/pages/news/subpages/deviceLog/log.vue b/pages/news/subpages/deviceLog/log.vue index e69de29..da48093 100644 --- a/pages/news/subpages/deviceLog/log.vue +++ b/pages/news/subpages/deviceLog/log.vue @@ -0,0 +1,335 @@ + + + + + \ No newline at end of file diff --git a/pages/news/subpages/videoCenter/index.vue b/pages/news/subpages/videoCenter/index.vue index 8e65f3f..1cd610f 100644 --- a/pages/news/subpages/videoCenter/index.vue +++ b/pages/news/subpages/videoCenter/index.vue @@ -17,7 +17,7 @@ - + ({...d, active: d === item})) uni.showToast({title: `切换到${item.day} ${item.week}`}) + + var number = new Date(); + if (item.day !== '今') { + number.setDate(item.day) + } + this.date = +number; // todo 切换日期后,更新视频列表 // this.videoList = this.getDateList1(); },