fix:添加group组件

This commit is contained in:
zhangyu
2022-01-21 16:07:23 +08:00
parent e098ce12bf
commit 01faf800ca
3 changed files with 30 additions and 2 deletions

View File

@@ -35,12 +35,12 @@
:entity="entity" :entity="entity"
></chart-block> ></chart-block>
<chart-block <chart-group
v-else-if="isGroup" v-else-if="isGroup"
:chart-info="chartInfo" :chart-info="chartInfo"
:chart-data="chartData" :chart-data="chartData"
:entity="entity" :entity="entity"
></chart-block> ></chart-group>
<ip-basic-info <ip-basic-info
v-else-if="isIpBasicInfo" v-else-if="isIpBasicInfo"
@@ -156,6 +156,7 @@ import ChartTabs from '@/views/charts/charts/ChartTabs'
import ChartMap from '@/views/charts/charts/ChartMap' import ChartMap from '@/views/charts/charts/ChartMap'
import ChartSingleValue from '@/views/charts/charts/ChartSingleValue' import ChartSingleValue from '@/views/charts/charts/ChartSingleValue'
import ChartBlock from '@/views/charts/charts/ChartBlock' import ChartBlock from '@/views/charts/charts/ChartBlock'
import ChartGroup from '@/views/charts/charts/ChartGroup'
import IpBasicInfo from '@/views/charts/charts/IpBasicInfo' import IpBasicInfo from '@/views/charts/charts/IpBasicInfo'
import ChartEchartLine from '@/views/charts/charts/ChartEchartLine' import ChartEchartLine from '@/views/charts/charts/ChartEchartLine'
import ChartActiveIpTable from '@/views/charts/charts/ChartActiveIpTable' import ChartActiveIpTable from '@/views/charts/charts/ChartActiveIpTable'
@@ -226,6 +227,7 @@ export default {
ChartCategoryBar, ChartCategoryBar,
ChartIpOpenPortBar, ChartIpOpenPortBar,
ChartRelationShip, ChartRelationShip,
ChartGroup
}, },
props: { props: {
chartInfo: Object, chartInfo: Object,

View File

@@ -124,6 +124,9 @@ export default {
chart.h = 1 chart.h = 1
} }
} }
if (chart.type === 95) {
chart.h += 1
}
if (!this.$_.isEmpty(chart.children)) { if (!this.$_.isEmpty(chart.children)) {
chart.children.forEach(c => { chart.children.forEach(c => {
this.recursionParamsConvert(c) this.recursionParamsConvert(c)

View File

@@ -0,0 +1,23 @@
<template>
<panel-chart-list
:time-filter="timeFilter"
:data-list="chartInfo.children"
:panel-lock="true"
:entity="entity"
>
</panel-chart-list>
</template>
<script>
import chartMixin from '@/views/charts/charts/chart-mixin'
export default {
name: 'ChartBlock',
mixins: [chartMixin],
props: {
timeFilter: Object
},
mounted () {
}
}
</script>