diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index 14c1e1440..10f28bc7e 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -261,7 +261,6 @@ export default { // 获取pieChart配置 this.pieOption = pieOption(); const {pandectData} = this - console.log(pandectData); // 设置三个配置值 this.pieOption.title.text = (pandectData.homeCount != 0 diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue index a498e359d..ebea4003f 100644 --- a/src/views/dataBoard/renfang/cpts/jmgl.vue +++ b/src/views/dataBoard/renfang/cpts/jmgl.vue @@ -7,6 +7,7 @@ class="" @myChartMethod="pieInitOk" ref="pieChart" + v-if="pandectData.totalResidents" >
@@ -31,7 +32,7 @@
居民总数
-
{{ info.resident_count }}
+
{{ pandectData.totalResidents }}
@@ -50,7 +51,7 @@
- {{ info.inhabitant_count }} + {{ pandectData.permanentResiCount }}
@@ -70,7 +71,7 @@
流动人口
-
{{ info.floating_count }}
+
{{ pandectData.floatingResiCount }}
@@ -145,6 +146,7 @@ export default { inhabitant_count: 0, floating_count: 0, }, + pandectData:{} }; }, watch: { @@ -153,7 +155,9 @@ export default { }, }, mounted() { - this.getData(); + this.$nextTick(()=>{ + this.getData(); + }) }, methods: { toListPage(type = "", type_name = "") { @@ -233,21 +237,19 @@ export default { async iniPieChart() { this.$refs.pieChart.clear(); // this.$refs.pieChart.showLoading() - // 获取pieChart配置 this.pieOption = pieOption(); - - const { info } = this; + const { pandectData } = this; // 设置三个配置值 this.pieOption.title.text = - (info.resident_count != 0 + (pandectData.totalResidents != 0 ? parseInt( - (100 * info.inhabitant_count) / info.resident_count + (100 * pandectData.permanentResiCount) / pandectData.totalResidents ) : "--") + "%"; this.pieData = [ - { value: info.inhabitant_count, name: "常住人口" }, - { value: info.floating_count, name: "流动人口" }, + { value: pandectData.permanentResiCount, name: "常住人口" }, + { value: pandectData.floatingResiCount, name: "流动人口" }, ]; this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); @@ -260,14 +262,14 @@ export default { fromActionPayload: { dataIndexInside }, } = params; this.pieOption.title.text = - (info.resident_count != 0 + (pandectData.totalResidents != 0 ? parseInt( (100 * [ - info.inhabitant_count, - info.floating_count, + pandectData.permanentResiCount, + pandectData.floatingResiCount, ][dataIndexInside]) / - info.resident_count + pandectData.totalResidents ) : "--") + "%"; this.$refs.pieChart.myChart.setOption(this.pieOption); diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 43ddcdf17..0664e1ee3 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -17,7 +17,7 @@
- +
@@ -31,7 +31,7 @@
- +
@@ -553,6 +553,7 @@ export default { if (data) { this.$nextTick(()=>{ this.$refs['fwgl'].pandectData = data + this.$refs['jmgl'].pandectData = data } ) } diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index d1fc51b76..86f3d2579 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -225,7 +225,8 @@ + height="350" + > @@ -245,10 +246,19 @@ class-name="small-padding fixed-width">