diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss index ef745ec0..767a9bd6 100644 --- a/src/assets/css/components/views/charts/panel.scss +++ b/src/assets/css/components/views/charts/panel.scss @@ -499,7 +499,9 @@ height: calc(100% - 40px); } } - &>.cn-chart__table,{ + &>.cn-chart__table{ + height: 100%; + width: 100%; .cn-chart__header { border-bottom: 1px solid $--content-right-background-color; .header__operations { @@ -580,6 +582,8 @@ .cn-chart__body { flex: auto; overflow-y: auto; + height: 100%; + width: 100%; .el-table { padding: 0 10px; @@ -601,6 +605,30 @@ color: #333; } } + .active-ip__icon { + overflow: hidden; + position: absolute; + top: 8px; + left: 6px; + display: flex; + justify-content: center; + justify-items: center; + align-items: center; + width: 23px; + height: 23px; + border-radius: 50%; + background: #e8fbf9; + border: 2px solid #e8fbf9; + } + .ip-green { + color: #23BF9A; + } + .active-ip__content { + position: absolute; + top: 7px; + left: 35px; + overflow: hidden; + } } } &>.cn-chart__echarts { diff --git a/src/views/charts/Chart2.vue b/src/views/charts/Chart2.vue index 078b1fb0..295e22fa 100644 --- a/src/views/charts/Chart2.vue +++ b/src/views/charts/Chart2.vue @@ -79,7 +79,7 @@ > @@ -149,6 +150,7 @@ import { isEchartsLine, isSingleValue, isTable, + isCurrentTable, isActiveIpTable, isTitle, isMap, @@ -214,7 +216,7 @@ export default { }, computed: { isNoData () { - return !this.loading && (_.isEmpty(this.chartData) || this.isError) && !this.isSingleValue && !this.isTabs && !this.isDomainDnsRecord && !this.isCryptocurrencyEventList + return !this.loading && (_.isEmpty(this.chartData) || this.isError) && !this.isSingleValue && !this.isTabs && !this.isDomainDnsRecord && !this.isCryptocurrencyEventList && !this.isActiveIpTable }, chartOption () { if (this.customChartOption) { @@ -246,6 +248,7 @@ export default { isSingleValueWithEchartsTemp: isSingleValueWithEchartsTemp(props.chartInfo.type), isRelationShip: isRelationShip(props.chartInfo.type), isTable: isTable(props.chartInfo.type), + isCurrentTable: isCurrentTable(props.chartInfo.type), isActiveIpTable: isActiveIpTable(props.chartInfo.type), isMap: isMap(props.chartInfo.type), isTitle: isTitle(props.chartInfo.type), diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue index d9da962b..fe1e9fb2 100644 --- a/src/views/charts/ChartHeader.vue +++ b/src/views/charts/ChartHeader.vue @@ -1,7 +1,7 @@