diff --git a/.env.development b/.env.development index f3d7c10c1..31afb2c2f 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api -VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api #家中开发连级的后端服务 # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 370eed265..25c1f970d 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -291,14 +291,17 @@ export default { this.housePieInitState = false this.userPieInitState = false - this.getHousechart() - this.getUserchart() + await this.getHousechart() + await this.getUserchart() + await this.getSubuserhouselist() + this.dataLoading = false + + await nextTick(500) this.getHousePie() this.getUserPie() - await this.getSubuserhouselist() - this.dataLoading = false + }, housePieInitOk (dom) { @@ -610,7 +613,7 @@ export default { this.runNum = this.runNum - cutNum let orgData = this.runAgencyArray[index] - console.log('----------------',orgData) + console.log('----------------', orgData) for (let i = 0; i < cutNum; i++) { this.runAgencyArray.pop()