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

解决冲突

Browse Source
This commit is contained in:
likexuan
2022-04-20 18:00:59 +08:00
parent 9b553f4fbb
commit 9c08d0b108
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -676,19 +676,11 @@ export default {
if (!dialog) { if (!dialog) {
dialog = document.querySelector("#viewGraphDialog .el-dialog"); dialog = document.querySelector("#viewGraphDialog .el-dialog");
} }
<<<<<<< HEAD
const dialogHeight = dialog.getBoundingClientRect();
leftOffSet = leftOffSet - dialogHeight.x;
leftOffSetView = dialogHeight.x;
topOffSet = topOffSet - dialogHeight.y;
topOffSetView = topOffSet;
=======
const dialogHeight = dialog.getBoundingClientRect() const dialogHeight = dialog.getBoundingClientRect()
leftOffSet = leftOffSet - 3 * dialogHeight.x leftOffSet = leftOffSet - 3 * dialogHeight.x
leftOffSetView = dialogHeight.x leftOffSetView = dialogHeight.x
topOffSet = topOffSet - dialogHeight.y topOffSet = topOffSet - dialogHeight.y
topOffSetView = topOffSet topOffSetView = topOffSet
>>>>>>> 367c493975c4bbf015cdbba1e145e67964759399
} }
if (position.top > clientHeight / 2) { if (position.top > clientHeight / 2) {
labelPosition = { labelPosition = {