NEZ-1145 fix: System node exporter alert nums页面存在两个悬浮框
This commit is contained in:
@@ -257,7 +257,8 @@ export default {
|
|||||||
type: {},
|
type: {},
|
||||||
// labelLoading:{},
|
// labelLoading:{},
|
||||||
that: {},
|
that: {},
|
||||||
detailList: Boolean
|
detailList: Boolean,
|
||||||
|
alertTableDialog: Boolean
|
||||||
},
|
},
|
||||||
/* watch:{
|
/* watch:{
|
||||||
labelLoading: {
|
labelLoading: {
|
||||||
@@ -332,6 +333,8 @@ export default {
|
|||||||
const self = this
|
const self = this
|
||||||
return function (position) {
|
return function (position) {
|
||||||
const clientHeight = (document.body.clientHeight < document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
|
const clientHeight = (document.body.clientHeight < document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
|
||||||
|
const dialog = document.getElementsByClassName('el-dialog')[2] // 获取元素类名为 el-dialog的元素数组第二个
|
||||||
|
const dialogHeight = dialog.clientHeight // 获取元素窗口
|
||||||
const leftOffSetView = this.detailList ? -80 : 10
|
const leftOffSetView = this.detailList ? -80 : 10
|
||||||
const topOffSetView = this.detailList ? 0 : 0
|
const topOffSetView = this.detailList ? 0 : 0
|
||||||
const leftOffSet = this.detailList ? -80 : 10
|
const leftOffSet = this.detailList ? -80 : 10
|
||||||
@@ -342,6 +345,11 @@ export default {
|
|||||||
left: `${position.left + position.width + leftOffSet}px`,
|
left: `${position.left + position.width + leftOffSet}px`,
|
||||||
top: `${position.top - elHeight + topOffSet}px`
|
top: `${position.top - elHeight + topOffSet}px`
|
||||||
}
|
}
|
||||||
|
} else if (dialogHeight && this.alertTableDialog) { // dialogHeight 为获取的元素窗口,this.alertTableDialog // 为了判断是alertMessageTable页面使用的组件
|
||||||
|
return {
|
||||||
|
left: `${position.left + position.width - 40}px`,
|
||||||
|
top: `${position.top - 95}px`
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return {
|
return {
|
||||||
left: `${position.left + position.width + leftOffSetView}px`,
|
left: `${position.left + position.width + leftOffSetView}px`,
|
||||||
|
|||||||
@@ -1057,14 +1057,14 @@ const cn = {
|
|||||||
metrics_storage_type: '保存模式',
|
metrics_storage_type: '保存模式',
|
||||||
metrics_storage_s3_endpoint: 'Endpoint',
|
metrics_storage_s3_endpoint: 'Endpoint',
|
||||||
metrics_storage_s3_bucket: 'Bucket name',
|
metrics_storage_s3_bucket: 'Bucket name',
|
||||||
metrics_storage_s3_access_key: 'Access key',
|
metrics_storage_s3_access_key: '访问密钥',
|
||||||
metrics_storage_s3_secret_access_key: 'Secret key',
|
metrics_storage_s3_secret_access_key: '密钥',
|
||||||
logs_storage_retention: '保存天数',
|
logs_storage_retention: '保存天数',
|
||||||
logs_storage_type: '保存模式',
|
logs_storage_type: '保存模式',
|
||||||
logs_storage_s3_endpoint: 'Endpoint',
|
logs_storage_s3_endpoint: 'Endpoint',
|
||||||
logs_storage_s3_bucket: 'Bucket name',
|
logs_storage_s3_bucket: 'Bucket name',
|
||||||
logs_storage_s3_access_key: 'Access key',
|
logs_storage_s3_access_key: '访问密钥',
|
||||||
logs_storage_s3_secret_access_key: 'Secret key',
|
logs_storage_s3_secret_access_key: '密钥',
|
||||||
logs_query_range_default_limit: '查询最大条数',
|
logs_query_range_default_limit: '查询最大条数',
|
||||||
local: '本地文件存储',
|
local: '本地文件存储',
|
||||||
s3: 'S3对象存储'
|
s3: 'S3对象存储'
|
||||||
|
|||||||
@@ -94,6 +94,7 @@
|
|||||||
:id="scope.row[item.label].id"
|
:id="scope.row[item.label].id"
|
||||||
:that="scope.row[item.label]"
|
:that="scope.row[item.label]"
|
||||||
:type="item.label"
|
:type="item.label"
|
||||||
|
:alert-table-dialog="true"
|
||||||
></alertLabel>
|
></alertLabel>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user