From ce0243e33936b4d91f4662c60813d835869b3727 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 28 Oct 2022 11:38:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=9C=B0=E5=9B=BE):=20=E6=B8=90?= =?UTF-8?q?=E5=8F=98=E8=89=B2=E8=AE=BE=E7=BD=AE=E4=B8=8D=E5=8F=AF=E6=B8=85?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/GradientColorSelector/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/components/GradientColorSelector/index.vue b/frontend/src/components/GradientColorSelector/index.vue index 8bffc71dab..1dcec6bf38 100644 --- a/frontend/src/components/GradientColorSelector/index.vue +++ b/frontend/src/components/GradientColorSelector/index.vue @@ -106,6 +106,7 @@ @@ -423,4 +424,7 @@ export default { width: 20px; height: 20px; } +.gradient-picker-dropdown .el-color-dropdown__link-btn { + display: none; +} From 88c5f6993fbc8d3fa92165b3c2d1a316ebdf02f9 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 28 Oct 2022 14:37:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):?= =?UTF-8?q?=20echarts=E8=A7=86=E5=9B=BE=E6=88=AA=E5=9B=BE=E4=B8=8D?= =?UTF-8?q?=E5=AE=8C=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/ChartComponent.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue index ef6702181f..b6d2577ca1 100644 --- a/frontend/src/views/chart/components/ChartComponent.vue +++ b/frontend/src/views/chart/components/ChartComponent.vue @@ -47,6 +47,9 @@ +
@@ -167,7 +170,8 @@ export default { borderRadius: '0px', mapCenter: null, linkageActiveParam: null, - buttonTextColor: null + buttonTextColor: null, + loading: true } }, @@ -222,6 +226,7 @@ export default { } }, preDraw() { + this.loading = true // 基于准备好的dom,初始化echarts实例 // 渲染echart等待dom加载完毕,渲染之前先尝试销毁具有相同id的echart 放置多次切换仪表板有重复id情况 const that = this @@ -253,6 +258,10 @@ export default { that.$refs.viewTrack.trackButtonClick() } }) + this.myChart.off('finished') + this.myChart.on('finished', () => { + this.loading = false + }) }) }, loadThemeStyle() {