diff --git a/src/components/charts/ChartTable.vue b/src/components/charts/ChartTable.vue
index 58a16ab8..d0507bb4 100644
--- a/src/components/charts/ChartTable.vue
+++ b/src/components/charts/ChartTable.vue
@@ -12,7 +12,7 @@
+
-
diff --git a/src/components/charts/panel.scss b/src/components/charts/panel.scss
index f1d9289f..eb2472d2 100644
--- a/src/components/charts/panel.scss
+++ b/src/components/charts/panel.scss
@@ -109,6 +109,7 @@
}
&>.cn-chart {
+ position: relative;
background-color: #FFFFFF;
border: 1px solid #E7EAED;
box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02);
@@ -129,6 +130,7 @@
display: flex;
justify-content: space-between;
align-items: center;
+ flex-shrink: 0;
padding: 10px 20px 10px 18px;
height: 50px;
font-size: 16px;
diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue
index f5454921..2b5fea17 100644
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -284,7 +284,7 @@ export default {
if (chartParams) {
this.loadMap(this.polygonSeries)
}
- // TODO 优化:缓存地图,重新查询时只更改数据不再次初始化
+ // TODO 优化:缓存地图,重新查询时只更改数据,不再次初始化
} else if (this.isEcharts) {
const dom = document.getElementById(`chart${this.chartInfo.id}`)
!this.myChart && (this.myChart = echarts.init(dom))
@@ -340,9 +340,6 @@ export default {
this.errorInfo = response.msg || response.message || 'Unknown'
}
this.myChart.setOption(this.chartOption)
- this.$nextTick(() => {
- this.myChart.resize()
- })
})
} else {
this.loading = false
@@ -350,7 +347,12 @@ export default {
}).catch(() => {
this.singleValue.value = ''
}).finally(() => {
- setTimeout(() => { this.loading = false }, 250)
+ setTimeout(() => {
+ this.loading = false
+ this.$nextTick(() => {
+ this.echartsResize()
+ })
+ }, 250)
})
}
} else if (this.isTabs) {
@@ -692,11 +694,13 @@ export default {
this.errorInfo = response.msg || response.message || 'Unknown'
}
this.myChart.setOption(this.chartOption)
- this.$nextTick(() => {
- this.myChart.resize()
- })
}).finally(() => {
- setTimeout(() => { this.loading = false }, 250)
+ setTimeout(() => {
+ this.loading = false
+ this.$nextTick(() => {
+ this.echartsResize()
+ })
+ }, 250)
})
},
initRelationShip (chartParams) {
@@ -717,11 +721,13 @@ export default {
this.chartOption.series[0].links = links
}
this.myChart.setOption(this.chartOption)
- this.$nextTick(() => {
- this.myChart.resize()
- })
}).finally(() => {
- setTimeout(() => { this.loading = false }, 250)
+ setTimeout(() => {
+ this.loading = false
+ setTimeout(() => {
+ this.myChart.resize()
+ })
+ }, 250)
})
const vm = this
@@ -810,11 +816,13 @@ export default {
this.errorInfo = response.msg || response.message || 'Unknown'
}
this.myChart.setOption(this.chartOption)
- this.$nextTick(() => {
- this.myChart.resize()
- })
}).finally(() => {
- setTimeout(() => { this.loading = false }, 250)
+ setTimeout(() => {
+ this.loading = false
+ this.$nextTick(() => {
+ this.echartsResize()
+ })
+ }, 250)
})
},
initEchartsWithPieTable (chartParams) {
@@ -856,9 +864,6 @@ export default {
this.chartOption.legend.type = 'scroll'
}
this.myChart.setOption(this.chartOption)
- this.$nextTick(() => {
- this.myChart.resize()
- })
if (!this.$_.isEmpty(data)) {
get(replaceUrlPlaceholder(chartParams.urlTable, tableQueryParams)).then(response2 => {
if (response2.code === 200) {
@@ -876,7 +881,12 @@ export default {
this.errorInfo = response.msg || response.message || 'Unknown'
}
}).finally(() => {
- setTimeout(() => { this.loading = false }, 250)
+ setTimeout(() => {
+ this.loading = false
+ this.$nextTick(() => {
+ this.echartsResize()
+ })
+ }, 250)
})
// legend点击事件
this.myChart.off('legendselectchanged')