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

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

Browse Source
This commit is contained in:
zyh
2024-06-04 09:36:51 +08:00
parent 2555a35df4 b9771e07ce
commit 21f7d95376
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
View File

@@ -296,7 +296,7 @@ export default {
sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
legend: [],
searchTime: [],
searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '1h'],
searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '7d'],
searchTimeSelect: bus.getTimezontDateRange(),
currentMsg: {},
chartUnit: 5,
@@ -311,9 +311,9 @@ export default {
isError: false,
errorContent: '',
chartInfo: {},
defaultPick: 4,
defaultPickType: 'hour',
defaultPickVal: 1
defaultPick: 10,
defaultPickType: 'date',
defaultPickVal: 7
}
},
created () {

8
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -226,7 +226,7 @@ export default {
chartDatas: [],
sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
legend: [],
searchTime: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '1h'],
searchTime: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '7d'],
searchTimeDialog: [],
searchTimeSelect: bus.getTimezontDateRange(),
currentMsg: {},
@@ -399,9 +399,9 @@ export default {
],
errorContent: '',
isError: false,
defaultPick: 4,
defaultPickType: 'hour',
defaultPickVal: 1
defaultPick: 10,
defaultPickType: 'date',
defaultPickVal: 7
}
},
computed: {