tianq 3 years ago
parent
commit
95b0e4762d
  1. 8
      src/views/modules/census/census-accountList.vue
  2. 17
      src/views/modules/census/census-orgStatusList.vue

8
src/views/modules/census/census-accountList.vue

@ -539,6 +539,7 @@ export default {
//
async iniPieChart(chartData) {
this.$refs.pieChart.clear();
// pieChart
this.pieOption = {
grid: {
@ -588,7 +589,9 @@ export default {
lineStyle: {
color: '#F3F7FD'
}
}
},
min:0,
max:1000,
},
series: [
{
@ -602,6 +605,9 @@ export default {
}
]
};
if (chartData.data.length>0) {
this.pieOption.yAxis.max=null
}
this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(param) {

17
src/views/modules/census/census-orgStatusList.vue

@ -115,7 +115,7 @@
</div>
<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="30%" :before-close="handleClose">
<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="name" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="streeName" label="所属街道" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
@ -218,7 +218,7 @@ export default {
TableHeight: '',
pieData: {},
agencyId: '',
level:'',
level: ''
};
},
components: {
@ -227,7 +227,7 @@ export default {
computed: {
maxTableHeight() {
this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 431 + this.iframeHeigh : this.clientHeight - 431;
console.log("this.TableHeight",this.TableHeight)
console.log('this.TableHeight', this.TableHeight);
return this.TableHeight;
},
@ -443,6 +443,7 @@ export default {
//
async iniPieChart(chartData) {
this.$refs.pieChart.clear();
// pieChart
this.pieOption = {
grid: {
@ -492,7 +493,9 @@ export default {
lineStyle: {
color: '#F3F7FD'
}
}
},
min: 0,
max: 1000
},
series: [
{
@ -501,11 +504,14 @@ export default {
type: 'bar',
itemStyle: {
color: 'rgb(33, 149, 254)',
borderRadius: [4, 4, 0, 0],
borderRadius: [4, 4, 0, 0]
}
}
]
};
if (chartData.data.length>0) {
this.pieOption.yAxis.max=null
}
this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(param) {
@ -604,5 +610,4 @@ export default {
border-radius: 6px;
color: #fff;
}
</style>

Loading…
Cancel
Save