diff --git a/src/App.vue b/src/App.vue index 03b65cb..93f9455 100644 --- a/src/App.vue +++ b/src/App.vue @@ -45,9 +45,9 @@ body, #app { background: transparent; } -body::-webkit-scrollbar { +/* body::-webkit-scrollbar { width: 0; -} +} */ diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue index 1bde55e..b6d255c 100644 --- a/src/views/Index/Index.vue +++ b/src/views/Index/Index.vue @@ -23,6 +23,7 @@ + @@ -43,8 +44,8 @@ export default { disProgress: true, timeObj: { carId: 2, - startTime: Date.parse(new Date()) - 3600 * 24 * 1000, - endTime: Date.parse(new Date()), + startTime: '', + endTime: '', types: [1, 2], }, timer: null, @@ -52,6 +53,12 @@ export default { }; }, async created() { + const startTime = this.$moment().valueOf() - 3600 * 24 * 1000; + const endTime = this.$moment().valueOf(); + const startTimeStr = this.$moment(startTime).format('YYYY-MM-DD') + ' 00:00:00'; + const endTimeStr = this.$moment(endTime).format('YYYY-MM-DD') + ' 23:59:59'; + this.timeObj.startTime = this.$moment(startTimeStr).valueOf(); + this.timeObj.endTime = this.$moment(endTimeStr).valueOf(); if (this.timer) { clearInterval(this.timer); } @@ -63,6 +70,8 @@ export default { this.timer = null; }, methods: { + // 获取默认时间 昨天的00:00:00 到今天的23:59:59 + getDefaultTime() {}, async getData(timeData) { try { if (timeData) {