Commit bb1d90e5 authored by danfuman's avatar danfuman

修改

parent a348b9cd
...@@ -343,6 +343,11 @@ ul, li { ...@@ -343,6 +343,11 @@ ul, li {
} }
} }
} }
.el-table__fixed{
tr:nth-child(2n){
background-color: #F8FBFF;
}
}
} }
} }
......
...@@ -61,12 +61,12 @@ export default { ...@@ -61,12 +61,12 @@ export default {
}, },
created() { created() {
this.dataQuery=this.$route.query; this.dataQuery=this.$route.query;
location({provinceId:'500000'}).then(res => { location({}).then(res => {
this.province=res.data.currentProvince.regionName; this.province=res.data.province;
if(!this.dataQuery.provinceId){ if(!this.dataQuery.provinceId){
this.dataQuery.provinceId=res.data.currentProvince.id this.dataQuery.provinceId=res.data.provinceId
this.dataQuery.province=this.province; this.dataQuery.province=this.province;
this.provinceId.push(res.data.currentProvince.id) this.provinceId.push(res.data.provinceId)
}else { }else {
this.provinceId.push(this.dataQuery.provinceId) this.provinceId.push(this.dataQuery.provinceId)
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
border border
:summary-method="getSummaries" :summary-method="getSummaries"
show-summary show-summary
height="360" height="400"
fit fit
@sort-change="sortChange" @sort-change="sortChange"
highlight-current-row highlight-current-row
...@@ -170,13 +170,15 @@ export default { ...@@ -170,13 +170,15 @@ export default {
orient: 'horizontal', orient: 'horizontal',
bottom: 0, bottom: 0,
data: data, data: data,
itemHeight:8,
itemWidth:12,
pageButtonPosition: 'end', pageButtonPosition: 'end',
}, },
series: [ series: [
{ {
type: 'pie', type: 'pie',
radius: '55%', radius: '55%',
center: ['50%', '40%'], center: ['50%', '50%'],
data: data, data: data,
emphasis: { emphasis: {
itemStyle: { itemStyle: {
...@@ -318,6 +320,11 @@ export default { ...@@ -318,6 +320,11 @@ export default {
} }
.table-item{ .table-item{
margin-top: 22px; margin-top: 22px;
::v-deep .el-table{
td.el-table__cell{
border-bottom: 0;
}
}
} }
} }
</style> </style>
...@@ -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="handleSearch"> <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch">
<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>
...@@ -316,6 +316,9 @@ ...@@ -316,6 +316,9 @@
.el-form{ .el-form{
margin-left: 24px; margin-left: 24px;
} }
.form-content-width{
width: 110px;
}
::v-deep .el-cascader{ ::v-deep .el-cascader{
.el-cascader__tags{ .el-cascader__tags{
flex-wrap: inherit; flex-wrap: inherit;
...@@ -366,18 +369,12 @@ ...@@ -366,18 +369,12 @@
.el-table__fixed-header-wrapper th{ .el-table__fixed-header-wrapper th{
background: #F0F3FA; background: #F0F3FA;
} }
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{ .caret-wrapper{
width: 10px; width: 10px;
/*<!--position: absolute;-->*/
/*<!--right: 12px;-->*/
/*<!--top: -3px;-->*/
} }
/*.sort-caret{*/
/*position: initial;*/
/*}*/
/*.ascending{*/
/*margin-bottom: 3px;*/
/*}*/
} }
} }
} }
......
...@@ -377,7 +377,7 @@ export default { ...@@ -377,7 +377,7 @@ export default {
let option ={ let option ={
legend: { legend: {
x:'right', x:'right',
padding:[0,120,0,0], padding:[0,30,0,0],
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="city" label="区域" :formatter="formatStatus" width="150"> <el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link"> <router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId}}" tag="a" class="a-link">
{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}} {{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
</router-link> </router-link>
<!--<span v-else>-</span>--> <!--<span v-else>-</span>-->
......
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