diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index cfcd80804..00d783cc0 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -130,7 +130,6 @@ export default { // 参数 isRefresh 标识是否是刷新操作 getChartData (isRefresh) { this.loading = true - console.log(this.timeRange) // TODO assetInfo、endpointInfo、echarts等进行不同的处理 let startTime = '' let endTime = '' @@ -238,7 +237,7 @@ export default { this.logChartDataFormat() } }).catch(res => { - console.log(res) + console.info(res) }).finally(() => { this.loading = false }) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue index 8cbd7dcb7..f22013548 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue @@ -90,7 +90,7 @@ export default { obj: { immediate: true, handler (n) { - this.formatTime = new Date(bus.computeTimezoneTime(new Date())) + this.formatTime = bus.timeFormate(new Date(bus.computeTimezoneTime(new Date()))) } } }, @@ -153,7 +153,7 @@ export default { this.formatTime = this.getTime(size, unit) }, getTime (size, unit) { // 计算时间 - const now = !this.formatTime ? new Date(bus.computeTimezone(new Date().getTime())) : new Date(this.formatTime) + const now = !this.formatTime ? new Date(bus.computeTimezone(new Date().getTime())) : new Date(bus.formateTimeToTime(this.formatTime)) if (unit) { switch (unit) { case 'y': @@ -191,7 +191,8 @@ export default { minute = minute < 10 ? '0' + minute : minute let second = now.getSeconds() second = second < 10 ? '0' + second : second - return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second + const str = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second + return bus.timeFormate(new Date(str)) }, viewGraph () { this.$refs.endpointQueryTab.viewGraph() diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue index b4148834a..87ecea886 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue @@ -617,7 +617,6 @@ export default { const _self = this this.scrollbarWrap.addEventListener('scroll', bus.debounce(function () { _self.showTopBtn = _self.scrollbarWrap.scrollTop > 50 - console.log(_self.scrollbarWrap.scrollTop) // _self.$refs.chartList.loadChartData(_self.scrollbarWrap.scrollTop) _self.$refs.chartList.onScroll(_self.scrollbarWrap.scrollTop) }, 300)) diff --git a/nezha-fronted/src/components/common/multipleTime.vue b/nezha-fronted/src/components/common/multipleTime.vue index a450500e7..430853613 100644 --- a/nezha-fronted/src/components/common/multipleTime.vue +++ b/nezha-fronted/src/components/common/multipleTime.vue @@ -4,6 +4,7 @@
diff --git a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue index d1e85618d..d2c8c723c 100644 --- a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue @@ -218,7 +218,7 @@ export default { this.tableData = [] this.tableDataCopy = '' setTimeout(() => { - this.$get('/prom/api/v1/query?query=' + encodeURIComponent("{endpoint_id='" + this.currentEndpoint.id + "'}") + '&time=' + this.$stringTimeParseToUnix(new Date(this.formatTime).getTime())).then(response => { + this.$get('/prom/api/v1/query?query=' + encodeURIComponent("{endpoint_id='" + this.currentEndpoint.id + "'}") + '&time=' + this.$stringTimeParseToUnix(bus.formateTimeToTime(this.formatTime))).then(response => { this.loading = false if (response.status === 'success') { const results = response.data.result diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index 3c17a95cc..d5be8f78f 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -1,6 +1,7 @@