diff --git a/src/assets/css/components/views/charts/chartSingleValue.scss b/src/assets/css/components/views/charts/chartSingleValue.scss index cf59a53c..1b9892a5 100644 --- a/src/assets/css/components/views/charts/chartSingleValue.scss +++ b/src/assets/css/components/views/charts/chartSingleValue.scss @@ -1,5 +1,9 @@ .cn-chart__single-value { &.cn-chart__single-value--detail-overview.cn-chart__single-value--icon-left { + width: unset; + flex: 0 0 240px; + flex-wrap: wrap; + .single-value__icon { width: 38px; height: 38px; diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss index 37b4fac8..81947b3a 100644 --- a/src/assets/css/components/views/charts/panel.scss +++ b/src/assets/css/components/views/charts/panel.scss @@ -61,11 +61,27 @@ text-overflow: ellipsis; overflow: hidden; white-space: nowrap; + &.chart-header__title--block { color: #1890FF; font-weight: bold; font-size: 16px; } + + .arrow-icon { + display: inline-block; + transform: rotate(0); + transition: all linear .2s; + + &.reg-down { + transform: rotate(90deg); + } + + i { + font-size: 12px; + color: #999; + } + } } .chart-header__tools { display: flex; 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 ff603544..f2ac0663 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss @@ -37,6 +37,7 @@ .overview__row { display: flex; flex-direction: row; + flex-wrap: wrap; padding: 2px 0; font-size: 14px; diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue index 87cd3671..7b538874 100644 --- a/src/views/charts/ChartHeader.vue +++ b/src/views/charts/ChartHeader.vue @@ -1,13 +1,19 @@ @@ -198,6 +204,14 @@ export default { this.$emit('orderPieTableChange', this.orderPieTable) } }, + computed: { + showRefreshButton () { + // 自己是group且父元素是block时,不显示刷新按钮 + // TODO 父元素是block,且只有自己一个子元素时,不显示刷新按钮 + const isGroupAndParentIsBlock = this.chartInfo.parent.type === 95 && this.isGroup + return !isGroupAndParentIsBlock + } + }, setup (props) { const dateRangeValue = 60 const { startTime, endTime } = getNowTime(dateRangeValue) diff --git a/src/views/charts/Panel.vue b/src/views/charts/Panel.vue index e0f246dd..7bae66d5 100644 --- a/src/views/charts/Panel.vue +++ b/src/views/charts/Panel.vue @@ -113,14 +113,14 @@ export default { this.detailChartList = this.detailTabs[index].children }, recursionParamsConvert (chart) { - chart.params = chart.params ? JSON.parse(chart.params) : null + chart.params = chart.params ? JSON.parse(chart.params) : {} if (chart.type === 94) { chart.oldH = chart.h - chart.params = { - collpase: false - } + /* chart.params = { + collapse: false + } */ chart.h = getGroupHeight(chart.children) + 1.5 - if (chart.params.collpase) { + if (chart.params.collapse) { chart.h = 1 } } diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index 50ba00f2..e364f48f 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -25,7 +25,7 @@ { if (item.id === chart.id) { - item.params.collpase = !item.params.collpase - if (item.params.collpase) { + item.params.collapse = !item.params.collapse + if (item.params.collapse) { item.h = 1 } else { item.h = getGroupHeight(item.children) + 1.5 @@ -134,7 +134,7 @@ export default { this.emitter.emit('groupParentCalcHeight', { chart, childrenList: this.copyDataList }) }, groupParentCalcHeight (chart, childrenList) { - console.log(chart, childrenList) + // console.log(chart, childrenList) setTimeout(() => { const parent = this.copyDataList.find(chartitem => chartitem.id === chart.parent.id) const children = parent.children.find(item => item.id === chart.id) diff --git a/src/views/charts/charts/ChartGroup.vue b/src/views/charts/charts/ChartGroup.vue index 5a107a7d..84cca306 100644 --- a/src/views/charts/charts/ChartGroup.vue +++ b/src/views/charts/charts/ChartGroup.vue @@ -18,6 +18,7 @@ export default { timeFilter: Object }, mounted () { + console.info(this.chartInfo) } } diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 1c1f6e24..8487a5d2 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -79,6 +79,8 @@ v-for="(chartInfo, i) in singleValues.chartInfos" :chart-info="chartInfo" :chart-data="singleValues.chartDatas[i]" + :key="i" + class="cn-chart__single-value--detail-overview" >