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

Merge branch 'dev-3.9' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.10

Browse Source
This commit is contained in:
zhangyu
2024-03-08 15:12:56 +08:00
parent 1100c8c13c 3ebe6e9918
commit 00a9ecc6d8
3 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nezha-fronted/src/components/chart/ChartScreenHeader.vue
View File

@@ -104,28 +104,6 @@ export default {
closeDialog () { closeDialog () {
this.$emit('close') this.$emit('close')
}, },
// setSearchTime (type, val, nowTimeType) { // 设置searchTime
// if (type === 'minute') {
// const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setMinutes(new Date(bus.computeTimezone(new Date().getTime())).getMinutes() - val))
// const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
// this.$set(this.searchTime, 0, startTime)
// this.$set(this.searchTime, 1, endTime)
// this.$set(this.searchTime, 2, val + 'm')
// } else if (type === 'hour') {
// const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - val))
// const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
// this.$set(this.searchTime, 0, startTime)
// this.$set(this.searchTime, 1, endTime)
// this.$set(this.searchTime, 2, val + 'h')
// } else if (type === 'date') {
// const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setDate(new Date(bus.computeTimezone(new Date().getTime())).getDate() - val))
// const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
// this.$set(this.searchTime, 0, startTime)
// this.$set(this.searchTime, 1, endTime)
// this.$set(this.searchTime, 2, val + 'd')
// }
// this.$refs.pickTime.$refs.timePicker.searchTime = this.searchTime
// },
showTime (type) { showTime (type) {
switch (type) { switch (type) {
case 'line' : case 'line' :

2
nezha-fronted/src/components/chart/chartHeaderMixin.js
View File

@@ -32,8 +32,6 @@ export default {
type: Boolean, type: Boolean,
default: true default: true
}, },
nowTimeType: {
},
hiddenText: { // 隐藏图表的悬浮文字 hiddenText: { // 隐藏图表的悬浮文字
type: String type: String
}, },

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

@@ -222,7 +222,7 @@ export default {
let startTime = '' let startTime = ''
let endTime = '' let endTime = ''
// todo 刷新 需要判断是否是相对时间 // todo 刷新 需要判断是否是相对时间
if (isRefresh) { // 刷新则视情况更新时间范围 if (isRefresh || this.isFullscreen) { // 刷新则视情况更新时间范围
const now = new Date(bus.computeTimezone(new Date().getTime())) const now = new Date(bus.computeTimezone(new Date().getTime()))
const origin = new Date(bus.timeFormate(bus.formateTimeToTime(this.timeRange[1]), 'YYYY-MM-DD HH:mm:ss')) const origin = new Date(bus.timeFormate(bus.formateTimeToTime(this.timeRange[1]), 'YYYY-MM-DD HH:mm:ss'))
const numInterval = now.getTime() - origin.getTime() const numInterval = now.getTime() - origin.getTime()
@@ -234,7 +234,7 @@ export default {
} else { } else {
nowTimeType = JSON.parse(nowTimeType) nowTimeType = JSON.parse(nowTimeType)
} }
if (numInterval >= 60000 && nowTimeType.value !== -1) { // 大于1分钟，则start、end均往后移numInterval，否则时间不变 if (numInterval >= 15000 && nowTimeType.value !== -1) { // 大于1分钟，则start、end均往后移numInterval，否则时间不变
startTime = bus.getNewTime(bus.formateTimeToTime(this.timeRange[0]), numInterval, 'YYYY-MM-DD HH:mm:ss') startTime = bus.getNewTime(bus.formateTimeToTime(this.timeRange[0]), numInterval, 'YYYY-MM-DD HH:mm:ss')
endTime = bus.timeFormate(now, 'YYYY-MM-DD HH:mm:ss') endTime = bus.timeFormate(now, 'YYYY-MM-DD HH:mm:ss')
} else { } else {