elink-star
/
epmet-oper-gov
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去除表格的多出的半格线

dev
tianq 3 years ago
parent
7d28c45d0c
commit
eb7bee558a
3 changed files with 16 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/views/modules/census/census-nineList.vue
  2. 7
      src/views/modules/census/census-residentList.vue
  3. 14
      src/views/modules/communityParty/dyhx/party.vue

5
src/views/modules/census/census-nineList.vue
View File

@ -39,7 +39,7 @@
</div> </div>
<div class="flex1"> <div class="flex1">
<div class="box"> <div class="box">
<div class="legend"> <div class="legend" style="max-width: 1000px;">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
<div class="kuai" :style="{ backgroundColor: color[index] }"></div> <div class="kuai" :style="{ backgroundColor: color[index] }"></div>
<div class="content"> <div class="content">
@ -68,7 +68,7 @@
style="width: 100%;" style="width: 100%;"
:height="maxTableHeight" :height="maxTableHeight"
> >
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> <el-table-column label="序号" type="index" align="center" width="50" />
<!-- <el-table-column prop="placeOrgName" align="center" label="区县" :show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column prop="placeOrgName" align="center" label="区县" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="placeOrgName" align="center" label="镇街" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="placeOrgName" align="center" label="镇街" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="placeOrgName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column> --> <el-table-column prop="placeOrgName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column> -->
@ -669,4 +669,5 @@ export default {
} }
} }
} }
</style> </style>

7
src/views/modules/census/census-residentList.vue
View File

@ -97,7 +97,7 @@
style="width: 100%;" style="width: 100%;"
:height="maxTableHeight" :height="maxTableHeight"
> >
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> <el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" /> <el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
@ -216,7 +216,7 @@ export default {
}, },
computed: { computed: {
maxTableHeight() { 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; return this.TableHeight;
}, },
...mapGetters(['clientHeight', 'iframeHeight']) ...mapGetters(['clientHeight', 'iframeHeight'])
@ -810,7 +810,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: flex-end; align-items: flex-end;
margin-bottom: 0px; margin-bottom: 0px;
margin-top: 0px; margin-top: 30px;
.census_searchcensus_box { .census_searchcensus_box {
align-items: flex-end; align-items: flex-end;
display: flex; display: flex;
@ -881,4 +881,5 @@ export default {
} }
} }
} }
</style> </style>

14
src/views/modules/communityParty/dyhx/party.vue
View File

@ -58,7 +58,7 @@
class="table" class="table"
:data="tableDataAge" :data="tableDataAge"
border border
:height="tableHeight" :height="maxTableHeight"
v-loading="tableLoadingAge" v-loading="tableLoadingAge"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%" style="width: 100%"
@ -124,7 +124,7 @@
class="table" class="table"
:data="tableData" :data="tableData"
border border
:height="tableHeight" :height="maxTableHeight"
v-loading="tableLoading" v-loading="tableLoading"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%" style="width: 100%"
@ -272,8 +272,8 @@ export default {
}; };
}, },
computed: { computed: {
tableHeight() { 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; return this.TableHeight;
}, },
@ -669,6 +669,7 @@ export default {
console.log(prev, cur, index); console.log(prev, cur, index);
return prev + cur; return prev + cur;
}); });
console.log('this.pieDatatotal',this.pieDatatotal);
this.chartData.name = data.map(item => item.value); this.chartData.name = data.map(item => item.value);
this.chartData.data = data.map(item => { this.chartData.data = data.map(item => {
return { return {
@ -679,6 +680,7 @@ export default {
}; };
}); });
console.log('chartData', this.chartData); console.log('chartData', this.chartData);
this.$forceUpdate();
this.initAgeCharts(this.chartData); this.initAgeCharts(this.chartData);
}, },
setPieData2() { setPieData2() {
@ -703,6 +705,7 @@ export default {
}); });
console.log('chartData', this.chartData2); console.log('chartData', this.chartData2);
this.$forceUpdate();
this.initEduCharts(this.chartData2); this.initEduCharts(this.chartData2);
}, },
@ -948,7 +951,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: flex-end; align-items: flex-end;
margin-bottom: 0px; margin-bottom: 0px;
margin-top: 0px; margin-top: 30px;
.census_searchcensus_box { .census_searchcensus_box {
align-items: flex-end; align-items: flex-end;
display: flex; display: flex;
@ -1021,4 +1024,5 @@ export default {
} }
} }
} }
</style> </style>

Write Preview
Loading…
Cancel
Save