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

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
This commit is contained in:
chenjinsong
2021-11-11 11:28:19 +08:00
parent e7273d0be0 6abf76db08
commit a0dcb8d877
10076 changed files with 1357 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,7 +222,6 @@ export default {
this.$refs.calendar.pickerVisible = true
if (document.getElementById('viewGraphDialog')) { // 处理 多弹出的z-index的问题 当前为 alertMessage的处理
const viewGraphDialogStyle = window.getComputedStyle(document.getElementById('viewGraphDialog', null))
console.log(viewGraphDialogStyle['z-index'])
setTimeout(() => {
if (viewGraphDialogStyle['z-index'] !== 'auto') {
const dom = document.getElementsByClassName('el-picker-panel')