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

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

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
This commit is contained in:
zhangyu
2022-03-23 15:18:55 +08:00
parent 8c26da6426 1e7b1da349
commit 261b3369d9
17 changed files with 506 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/charts/chartDataFormat.js
View File

@@ -421,7 +421,7 @@ function timeFormat34 (value) {
return bus.timeFormate(parseInt(value), 'YYYY-MM-DD HH:mm:ss')
}
function timeFormat35 (value) {
return bus.timeFormate(parseInt(value), 'MM/dd/yyyy h:mm:ss a')
return bus.timeFormate(parseInt(value), 'MM/DD/yyyy h:mm:ss a')
}
// unit转化配置信息
/*