gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改时间格式的相关错误

Browse Source
This commit is contained in:
zhangyu
2022-01-04 14:27:28 +08:00
parent af980817dd
commit 55203ef0ea
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/components/chart/panelChart.vue
View File

@@ -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
})

7
nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
View File

@@ -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()

1
nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
View File

@@ -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))

1
nezha-fronted/src/components/common/multipleTime.vue
View File

@@ -4,6 +4,7 @@
<transition>
<div v-show="showDropdown" id="panel-calender" class="calendar">
<my-date-picker prefix-icon=" " size="mini" ref="calendar"
:value-format="timeFormatStrToDatePickFormat(multipleTime)"
:format="timeFormatStrToDatePickFormat(multipleTime)" class="panel-time-picker-hidden" @change="dateChange" v-model="startTime" type="datetime"
popper-class="panel-time-picker-popper"
align="right">

2
nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
View File

@@ -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

1
nezha-fronted/src/components/common/timePicker.vue
View File

@@ -1,6 +1,7 @@
<template>
<div id="panel-calender" :class="{'calendar--small': size === 'small'}" class="calendar">
<my-date-picker prefix-icon=" " class="panel-time-picker-hidden " size="mini" ref="calendar"
:value-format="timeFormatStrToDatePickFormat(timePicker)"
:format="timeFormatStrToDatePickFormat(timePicker)" @change="dateChange" v-model="searchTime" type="datetimerange"
popper-class="panel-time-picker-popper time-picker-popover__select-top"
:default-time="['00:00:00', '23:59:59']"