Commit a0795f49 authored by danfuman's avatar danfuman

修改

parent c58d2c8d
...@@ -666,6 +666,19 @@ export default { ...@@ -666,6 +666,19 @@ export default {
/*}*/ /*}*/
/*}*/ /*}*/
} }
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
} }
.table-title{ .table-title{
/*width: 100%;*/ /*width: 100%;*/
......
...@@ -283,6 +283,19 @@ export default { ...@@ -283,6 +283,19 @@ export default {
z-index: 0; z-index: 0;
top: 46px; top: 46px;
} }
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
} }
} }
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<span class="common-title">经济数据</span> <span class="common-title">经济数据</span>
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small"> <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year"> <el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="getData"> <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="changeSelect">
<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" /> <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -102,14 +102,13 @@ export default { ...@@ -102,14 +102,13 @@ export default {
if(this.queryParams.order){ if(this.queryParams.order){
params.order=this.queryParams.order params.order=this.queryParams.order
} }
if(this.provinceId.length > 0){
if(this.provinceId.length >= 0){
params.provinceIds=[this.provinceId[0]] params.provinceIds=[this.provinceId[0]]
} }
if(this.provinceId.length >= 1){ if(this.provinceId.length > 1){
params.cityId=[this.provinceId[1]] params.cityId=[this.provinceId[1]]
} }
if(this.provinceId.length >= 2){ if(this.provinceId.length > 2){
params.areaId=[this.provinceId[2]] params.areaId=[this.provinceId[2]]
} }
// params.provinceIds=[this.dataQuery.provinceId] // params.provinceIds=[this.dataQuery.provinceId]
...@@ -118,6 +117,10 @@ export default { ...@@ -118,6 +117,10 @@ export default {
this.tableDataTotal = res.data.totalCount this.tableDataTotal = res.data.totalCount
}) })
}, },
changeSelect(){
this.pageIndex=1
this.getData()
},
// 重置页数 // 重置页数
handleSizeChange(val) { handleSizeChange(val) {
this.pageIndex = 1 this.pageIndex = 1
...@@ -199,6 +202,21 @@ export default { ...@@ -199,6 +202,21 @@ export default {
} }
.table-item{ .table-item{
margin-top: 22px; margin-top: 22px;
::v-deep .el-table{
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
}
} }
} }
......
...@@ -669,6 +669,12 @@ export default { ...@@ -669,6 +669,12 @@ export default {
fontWeight: 'bold' fontWeight: 'bold'
} }
} }
if(row.row.title === '指标'){
return {
background: '#F0F3FA',
color:'#4C4D4E',
}
}
}, },
handleMessage(){ handleMessage(){
this.$message({ this.$message({
...@@ -816,11 +822,21 @@ export default { ...@@ -816,11 +822,21 @@ export default {
} }
.table-item{ .table-item{
margin-top: 22px; margin-top: 22px;
/*::v-deep .el-table {*/ ::v-deep .el-table{
/*td.el-table__cell {*/ th{
/*border-bottom: 0;*/ font-size: 12px !important;
/*}*/ font-weight: 400 !important;
/*}*/ }
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
}
} }
} }
</style> </style>
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
<el-table-column label="GDP增速(%)" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="120" align="right"></el-table-column> <el-table-column label="GDP增速(%)" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="120" align="right"></el-table-column>
<el-table-column label="人均GDP(元)" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column> <el-table-column label="人均GDP(元)" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column>
<el-table-column label="人口(万人)" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column> <el-table-column label="人口(万人)" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
<el-table-column label="一般公共预算收入(亿元)" prop="gbr" sortable="custom" :formatter="formatStatus" width="170" align="right"></el-table-column> <el-table-column label="一般公共预算收入(亿元)" prop="gbr" sortable="custom" :formatter="formatStatus" width="180" align="right"></el-table-column>
<el-table-column label="一般公共预算收入增速(%)" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column> <el-table-column label="一般公共预算收入增速(%)" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="150" align="right"></el-table-column>
<el-table-column label="一般公共预算收入:税收收入(亿元)" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column> <el-table-column label="一般公共预算收入:税收收入(亿元)" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="150" align="right"></el-table-column>
<el-table-column label="一般公共预算支出(亿元)" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="right"></el-table-column> <el-table-column label="一般公共预算支出(亿元)" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="right"></el-table-column>
<el-table-column label="政府性基金收入(亿元)" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="right"></el-table-column> <el-table-column label="政府性基金收入(亿元)" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="right"></el-table-column>
<el-table-column label="政府性基金收入:土地出让收入(亿元)" prop="landTransferIncome" sortable="custom" :formatter="formatStatus" width="150" align="right"></el-table-column> <el-table-column label="政府性基金收入:土地出让收入(亿元)" prop="landTransferIncome" sortable="custom" :formatter="formatStatus" width="150" align="right"></el-table-column>
......
...@@ -610,6 +610,19 @@ export default { ...@@ -610,6 +610,19 @@ export default {
} }
} }
} }
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
} }
} }
} }
......
...@@ -557,7 +557,7 @@ export default { ...@@ -557,7 +557,7 @@ export default {
grid: { grid: {
top:20, top:20,
left:65, left:65,
right:30, right:50,
bottom:20, bottom:20,
}, },
series: [ series: [
...@@ -829,6 +829,19 @@ export default { ...@@ -829,6 +829,19 @@ export default {
} }
} }
} }
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment