diff --git a/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss b/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss index 252b67dc..235ea328 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss @@ -123,10 +123,39 @@ } .overview__content.domain__content { + .overview__tags.domain__tags.overview__ip-tags,.overview__tags.domain__tags.overview__app-tags { + max-width: 1200px; + .overview__domain-more-tabs.show-more-app { + z-index: 1; + position: absolute; + right: -92px; + top: -180px; + } + .overview__domain-more-tabs.show-more-ip { + z-index: 1; + position: absolute; + top: -180px; + right: -92px; + } + } + .overview__tags.domain__tags.overview__domain-tags { + max-width: 1500px; + .overview__domain-more-tabs.show-more-app { + z-index: 1; + position: absolute; + top: -180px; + right: -92px; + } + .overview__domain-more-tabs.show-more-ip { + z-index: 1; + position: absolute; + top: -180px; + right: -92px; + } + } .overview__tags.domain__tags { flex-direction: column; align-items: baseline; - max-width: 1500px; .overview__domain-tabs { display: flex; margin: 0 0 8px 0; @@ -159,7 +188,6 @@ font-size: 14px; font-weight: 400; border-radius: 15px; - position: relative; } .overview__domain-btn { background-color: #EFF6FE; @@ -172,16 +200,7 @@ padding: 6px 15px; line-height: .3; cursor: pointer; - } - .overview__domain-more-tabs.show-more-app { - position: absolute; - top: 176px; - z-index: 1; - } - .overview__domain-more-tabs.show-more-ip { - position: absolute; - top: 215px; - z-index: 1; + position: relative; } .overview__domain-more-tabs { min-width: 110px; diff --git a/src/mixins/relatedServer.js b/src/mixins/relatedServer.js index fb07d95c..2cb86f16 100644 --- a/src/mixins/relatedServer.js +++ b/src/mixins/relatedServer.js @@ -2,61 +2,77 @@ import { get } from '@/utils/http' export default { data () { return { - relationDomainData: [], - relationAppData: [], - showMoreApp: false, - showMoreDomain: false, - moreDataDomain: [], - moreDataApp: [], - showDomainMore: false, - showAppMore: false + + relationshipDataOne: [], // 数据 + relationshipDataTow: [], // 数据 + relationshipShowOne: false, // 控制 ... 的展示隐藏 + relationshipShowTow: false, // 控制 ... 的展示隐藏 + relationshipShowMoreOne: false, // 控制弹框的展示隐藏 + relationshipShowMoreTow: false, // 控制弹框的展示隐藏 + relationshipMoreDataOne: [], // 展示所有 + relationshipMoreDataTow: [] // 展示所有 } }, methods: { - getRelatedServerData () { - get(this.relatedServerDomainUrl, this.getQueryParams()).then(response => { + // 请求数据 relationshipUrlOne => 路由 refOne => ref + getRelatedServerDataOne (relationshipUrlOne, refOne) { + get(relationshipUrlOne, this.getQueryParams()).then(response => { if (response.code === 200) { - this.relationDomainData = response.data.result - this.relatedServerWidth(this.relationDomainData, 'relatedDomain') - } - }) - get(this.relatedServerAppUrl, this.getQueryParams()).then(response => { - if (response.code === 200) { - this.relationAppData = response.data.result - this.relatedServerWidth(this.relationAppData, 'relatedServerApp') + this.relationshipDataOne = response.data.result + // 将请求数据 传入方法中 + this.relatedServerWidth(this.relationshipDataOne, refOne) } }) }, + getRelatedServerDataTow (relationshipUrlTow, refTow) { + get(relationshipUrlTow, this.getQueryParams()).then(response => { + if (response.code === 200) { + this.relationshipDataTow = response.data.result + // 将请求数据 传入方法中 + this.relatedServerWidth(this.relationshipDataTow, refTow) + } + }) + }, + // data => 数据, value => ref relatedServerWidth (data, value) { + // 最大宽度 const relatedServerWidth = this.$refs.relationship.offsetWidth let sum = 0 let flag = true data.map((item, index) => { if (this.$refs[value + index]) { - const width = this.$refs[value + index].offsetWidth + 22 + // 每条数据的宽度 + const width = this.$refs[value + index].offsetWidth + 30 if (width) { sum += width if (flag && relatedServerWidth < sum) { flag = false - this.showDomainMore = true + this.relationshipShowOne = true + this.relationshipShowTow = true } } item.show = flag } return item }) - console.log(data) }, + // 点击事件 控制弹框的展示隐藏,展示全部的数据 more (data, showMore, index) { if (index === 1) { - this.moreDataDomain = data - this.showMoreDomain = !showMore - this.showMoreApp = false + // 展示数据 + this.relationshipMoreDataOne = data + // 弹框的显示隐藏 + this.relationshipShowMoreOne = !showMore + // 展示当前弹框是,隐藏其他弹框 + this.relationshipShowMoreTow = false } if (index === 2) { - this.moreDataApp = data - this.showMoreApp = !showMore - this.showMoreDomain = false + // 展示数据 + this.relationshipMoreDataTow = data + // 弹框的显示隐藏 + this.relationshipShowMoreTow = !showMore + // 展示当前弹框是,隐藏其他弹框 + this.relationshipShowMoreOne = false } } } diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index d1c7435e..18149020 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -51,21 +51,21 @@