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 git.mesalab.cn:nezha/nezha-fronted into dev-3.10

Browse Source
This commit is contained in:
zyh
2024-03-27 09:52:12 +06:30
parent 264dbace3f a486cd35f1
commit 442dcd1a3d
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
View File

@@ -381,13 +381,13 @@ export default {
return function (val, index) {
const value = val * 1000
let offset = localStorage.getItem('nz-sys-timezone')
offset = moment.tz(offset).format('Z')
offset = Number.parseInt(offset)
offset = moment.tz(offset).utcOffset()
const localOffset = new Date().getTimezoneOffset() * 60 * 1000 * -1 // 默认 一分钟显示时区偏移的结果
// if (window.dataJson) {
// offset = new Date().getTimezoneOffset() * -1 / 60
// }
const tData = new Date(value - localOffset + offset * 60 * 60 * 1000)
const tData = new Date(value - localOffset + offset * 60 * 1000)
let hour = tData.getHours()
hour = hour > 9 ? hour : '0' + hour // 加0补充为两位数字
let minute = tData.getMinutes()

12
nezha-fronted/src/components/common/js/tools.js
View File

@@ -422,19 +422,17 @@ export const bottomBoxWindow = {
export function stringTimeParseToUnix (stringTime) {
let time = new Date(stringTime).getTime()
let offset = localStorage.getItem('nz-sys-timezone')
offset = moment.tz(offset).format('Z')
offset = Number.parseInt(offset)
offset = moment.tz(offset).utcOffset()
const localOffset = new Date().getTimezoneOffset() * 60 * 1000 * -1 // 默认 一分钟显示时区偏移的结果
time = time + localOffset - offset * 60 * 60 * 1000
time = time + localOffset - offset * 60 * 1000
return parseInt(time / 1000)
}
export function stringTimeParseToUnixMs (stringTime) {
let time = new Date(stringTime).getTime()
let offset = localStorage.getItem('nz-sys-timezone')
offset = moment.tz(offset).format('Z')
offset = Number.parseInt(offset)
offset = moment.tz(offset).utcOffset()
const localOffset = new Date().getTimezoneOffset() * 60 * 1000 * -1 // 默认 一分钟显示时区偏移的结果
time = time + localOffset - offset * 60 * 60 * 1000
time = time + localOffset - offset * 60 * 1000
return parseInt(time)
}
export function getTime (size, unit) { // 计算时间
@@ -1149,7 +1147,7 @@ export const watermark = {
const height = binding.value.height || 200
const textRotate = binding.value.textRotate || -20
addWaterMarker(el, text, font, textColor, width, height, textRotate, show, text1)
},
}
}
function addWaterMarker (parentNode, text, font, textColor, width, height, textRotate, show, text1) {
const can = document.createElement('canvas')

20
nezha-fronted/src/libs/bus.js
View File

@@ -209,13 +209,12 @@ export default new Vue({
// 将本地时区转为系统配置的时区
computeTimezone: function (sourceTime) {
let offset = localStorage.getItem('nz-sys-timezone')
offset = moment.tz(offset).format('Z')
if (offset && offset !== 'undefined') {
offset = Number.parseInt(offset)
offset = moment.tz(offset).utcOffset()
const date = new Date(sourceTime)
const localOffset = date.getTimezoneOffset() * 60 * 1000 // 默认 一分钟显示时区偏移的结果
const utcTime = sourceTime + localOffset
return utcTime + (offset * 60 * 60 * 1000)
return utcTime + (offset * 60 * 1000)
} else {
return sourceTime
}
@@ -223,13 +222,12 @@ export default new Vue({
// 将本地时区转为系统配置的时区
computeTimezoneTime: function (sourceTime) {
let offset = localStorage.getItem('nz-sys-timezone')
offset = moment.tz(offset).format('Z')
if (offset && offset !== 'undefined') {
offset = Number.parseInt(offset)
offset = moment.tz(offset).utcOffset()
const date = new Date(sourceTime)
const localOffset = date.getTimezoneOffset() * 60 * 1000 // 默认 一分钟显示时区偏移的结果
const utcTime = date.getTime() + localOffset
return utcTime + (offset * 60 * 60 * 1000)
return utcTime + (offset * 60 * 1000)
} else {
return sourceTime
}
@@ -254,14 +252,13 @@ export default new Vue({
UTCTimeToConfigTimezone (utcTime) {
let offset = localStorage.getItem('nz-sys-timezone')
offset = moment.tz(offset).format('Z')
if (offset && offset !== 'undefined') {
let time = utcTime
if (typeof time === 'string' && /(\d+?-){2}\d+?\s(\d+?:)*\d+/.test(time)) {
time = new Date(time).getTime()
}
offset = Number.parseInt(offset)
time += offset * 60 * 60 * 1000
offset = moment.tz(offset).utcOffset()
time += offset * 60 * 1000
return time
} else {
return utcTime
@@ -269,14 +266,13 @@ export default new Vue({
},
configTimezoneToUTCTime: function (configTime) {
let offset = localStorage.getItem('nz-sys-timezone')
offset = moment.tz(offset).format('Z')
if (offset && offset !== 'undefined') {
let time = configTime
if (typeof time === 'string' && /(\d+?-){2}\d+?\s(\d+?:)*\d+/.test(time)) {
time = new Date(time).getTime()
}
offset = Number.parseInt(offset)
time -= offset * 60 * 60 * 1000
offset = moment.tz(offset).utcOffset()
time -= offset * 60 * 1000
return time
} else {
return configTime