diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index 4d9c6da6..b46923af 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -114,7 +114,7 @@ width: 100%; .echart-wr{ flex-shrink: 0; - height: 420px; + height: 380px; width: 70%; } .div-tip{ @@ -169,7 +169,7 @@ margin-top:2px; width: 20px; height: 10px; - background: #1B51FF; + background: #ff7800; border-radius: 4px; } diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 85b3c7f9..da717e6b 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -262,7 +262,7 @@ export default { ldUserRatio: '5%',//流动居民总数占比 }, - userColorArray: ['#1B51FF', '#00E5ED'], + userColorArray: ['#ff7800', '#00E5ED'], userPieData: [], subList: [], @@ -285,10 +285,11 @@ export default { methods: { async getApiData () { - - await this.getHousechart() - await this.getUserchart() - await this.getSubuserhouselist() + this.housePieInitState = false + this.userPieInitState = false + this.getHousechart() + this.getUserchart() + this.getSubuserhouselist() this.getHousePie() this.getUserPie() @@ -296,13 +297,13 @@ export default { housePieInitOk (dom) { console.log('pie准备好了', dom) this.housePieChartS = dom - this.housePieInitState = true + // this.housePieInitState = true }, userPieInitOk (dom) { console.log('pie准备好了', dom) this.userPieChartS = dom - this.userPieInitState = true + // this.userPieInitState = true }, @@ -330,6 +331,7 @@ export default { this.houseData = {} this.$message.error(msg); } + this.housePieInitState = true }, getHousePie () { @@ -411,6 +413,7 @@ export default { this.userData = {} this.$message.error(msg); } + this.userPieInitState = true }, getUserPie () { diff --git a/src/views/modules/visual/basicinfo/houseStatic/options.js b/src/views/modules/visual/basicinfo/houseStatic/options.js index 180d3b55..e271f19d 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/options.js +++ b/src/views/modules/visual/basicinfo/houseStatic/options.js @@ -1,10 +1,10 @@ export function housePieOption (_charts) { - const center= ['50%', '200px'] + const center= ['50%', '150px'] return { title: { text: '0', - top: 170, + top: 120, left: 'center', textStyle: { width: '100%', diff --git a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js index ba1eab7f..7ac43fcf 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js +++ b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js @@ -1,10 +1,10 @@ export function userPieOption (_charts) { - const center= ['50%', '200px'] + const center= ['50%', '150px'] return { title: { text: '0', - top: 170, + top: 120, left: 'center', textStyle: { width: '100%',