@@ -68,7 +68,7 @@
style="width: 100%;"
:height="maxTableHeight"
>
-
+
@@ -669,4 +669,5 @@ export default {
}
}
}
+
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 5a92a37f6..9ded3ce79 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -97,7 +97,7 @@
style="width: 100%;"
:height="maxTableHeight"
>
-
+
@@ -216,7 +216,7 @@ export default {
},
computed: {
maxTableHeight() {
- this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 638 + this.iframeHeigh : this.clientHeight - 638;
+ this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 668 + this.iframeHeigh : this.clientHeight - 668;
return this.TableHeight;
},
...mapGetters(['clientHeight', 'iframeHeight'])
@@ -810,7 +810,7 @@ export default {
justify-content: space-between;
align-items: flex-end;
margin-bottom: 0px;
- margin-top: 0px;
+ margin-top: 30px;
.census_searchcensus_box {
align-items: flex-end;
display: flex;
@@ -881,4 +881,5 @@ export default {
}
}
}
+
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 8a88ce5e2..c4f8a07cd 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -58,7 +58,7 @@
class="table"
:data="tableDataAge"
border
- :height="tableHeight"
+ :height="maxTableHeight"
v-loading="tableLoadingAge"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%"
@@ -124,7 +124,7 @@
class="table"
:data="tableData"
border
- :height="tableHeight"
+ :height="maxTableHeight"
v-loading="tableLoading"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%"
@@ -272,8 +272,8 @@ export default {
};
},
computed: {
- tableHeight() {
- this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 638 + this.iframeHeigh : this.clientHeight - 638;
+ maxTableHeight() {
+ this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 668 + this.iframeHeigh : this.clientHeight - 668;
return this.TableHeight;
},
@@ -669,6 +669,7 @@ export default {
console.log(prev, cur, index);
return prev + cur;
});
+ console.log('this.pieDatatotal',this.pieDatatotal);
this.chartData.name = data.map(item => item.value);
this.chartData.data = data.map(item => {
return {
@@ -679,6 +680,7 @@ export default {
};
});
console.log('chartData', this.chartData);
+ this.$forceUpdate();
this.initAgeCharts(this.chartData);
},
setPieData2() {
@@ -703,6 +705,7 @@ export default {
});
console.log('chartData', this.chartData2);
+ this.$forceUpdate();
this.initEduCharts(this.chartData2);
},
@@ -948,7 +951,7 @@ export default {
justify-content: space-between;
align-items: flex-end;
margin-bottom: 0px;
- margin-top: 0px;
+ margin-top: 30px;
.census_searchcensus_box {
align-items: flex-end;
display: flex;
@@ -1021,4 +1024,5 @@ export default {
}
}
}
+