Skip to content

D
dsk-cr20g
Commit 7579f082 authored by danfuman's avatar danfuman
Browse files
Options

修改

parent 3016cfb9
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 82 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ 7579f082
......@@ -307,6 +307,11 @@ ul, li {
background: #F0F3FA;
}
}
.el-table__fixed{
box-shadow:none;
height: auto !important;
bottom: 12px;
}
.caret-wrapper{
width: 10px;
}
......
dsk-operate-ui/src/assets/styles/public.css
View file @ 7579f082
......@@ -342,10 +342,9 @@ select {
width: 100px;
display: inline-block;
margin: 0px 8px;
.el-input__inner {
}
.jabph_popper_box .jabph_popper_wrap .jabph_popper_input .el-input__inner {
width: 100px;
}
}
.jabph_popper_box div:last-child {
......
dsk-operate-ui/src/views/index.vue
View file @ 7579f082
......@@ -774,6 +774,9 @@ export default {
]
}
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
initChart1(){
var rankPic = [
......@@ -910,6 +913,9 @@ export default {
],
}
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
handleClickTab(){
......@@ -1430,6 +1436,7 @@ export default {
line-height: 32px;
background: #F3F3F4;
padding-left: 37px;
border: 0;
}
.el-icon-search{
font-size: 16px;
......
dsk-operate-ui/src/views/login.vue
View file @ 7579f082
......@@ -169,7 +169,7 @@ export default {
.content{
width: 1320px;
margin: 0 auto;
padding-top: 160px;
/*padding-top: 180px;*/
}
.left{
float: left;
......@@ -177,13 +177,14 @@ export default {
margin-right: 170px;
}
.logo{
width: 317px;
height: 69px;
margin-bottom: 58px;
width: 253px;
height: 55px;
margin-bottom: 53px;
margin-left: 127px;
}
.img{
width: 730px;
height: 624px;
width: 662px;
height: 566px;
}
}
.title {
......@@ -221,6 +222,7 @@ export default {
}
.el-input__inner{
padding-left: 73px;
border: 0;
}
}
.el-input__prefix{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ 7579f082
......@@ -52,25 +52,25 @@
</template>
</el-table-column>
<el-table-column label="GDP（亿元）" prop="gdp" :formatter="formatStatus" sortable="custom" min-width="115" align="right"></el-table-column>
<el-table-column label="GDP增速（%）" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="100" 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="人口（万人）" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
<el-table-column label="一般公共预算收入 (亿元)" prop="gbr" sortable="custom" width="170" 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="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
<el-table-column label="一般公共预算支出（亿元）" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="left"></el-table-column>
<el-table-column label="政府性基金收入（亿元）" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="left"></el-table-column>
<el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" width="150" align="left"></el-table-column>
<el-table-column label="政府性基金支出（亿元）" prop="govFundExpenditure" :formatter="formatStatus" width="170" sortable="custom" align="left"></el-table-column>
<el-table-column label="国有资本经营收入（亿元）" prop="soecoi" width="160" :formatter="formatStatus" align="left"></el-table-column>
<el-table-column label="国有资本经营支出（亿元）" prop="soecoe" width="160" :formatter="formatStatus" align="left"></el-table-column>
<el-table-column label="固定资产投资（亿元）" prop="fixedInvestment" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="财政自给率（%）" prop="fiscalSelfSufficiencyRate" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="地方政府债务余额（亿元）" prop="govDebtBalance" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="一般债余额（亿元）" prop="generalDebtBalance" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="专项债余额（亿元）" prop="specialDebtBalance" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="地方政府债务限额（亿元）" prop="govDebtLimit" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="城投平台有息债务（亿元）" prop="uipInterestBearingDebt" :formatter="formatStatus" width="160" align="left" >
<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="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" width="150" align="right"></el-table-column>
<el-table-column label="政府性基金支出（亿元）" prop="govFundExpenditure" :formatter="formatStatus" width="170" sortable="custom" align="right"></el-table-column>
<el-table-column label="国有资本经营收入（亿元）" prop="soecoi" width="160" :formatter="formatStatus" align="right"></el-table-column>
<el-table-column label="国有资本经营支出（亿元）" prop="soecoe" width="160" :formatter="formatStatus" align="right"></el-table-column>
<el-table-column label="固定资产投资（亿元）" prop="fixedInvestment" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="财政自给率（%）" prop="fiscalSelfSufficiencyRate" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="地方政府债务余额（亿元）" prop="govDebtBalance" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="一般债余额（亿元）" prop="generalDebtBalance" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="专项债余额（亿元）" prop="specialDebtBalance" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="地方政府债务限额（亿元）" prop="govDebtLimit" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="城投平台有息债务（亿元）" prop="uipInterestBearingDebt" :formatter="formatStatus" width="160" align="right" >
<template slot="header" slot-scope="scope">
<span>城投平台有息债务（亿元）
<el-tooltip popper-class="tips" effect="light" content="城投平台有息债务是该地区行政区划下所有的城投公司的短期债务与长期债务合计。其中，短期债务=短期借款+一年内到期的非流动负债+应付短期债券，长期债务=长期借款+应付长期债券。" placement="top">
......@@ -79,20 +79,20 @@
</span>
</template>
</el-table-column>
<el-table-column label="负债率（%）" prop="govDebtToGdpRate" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="负债率（宽口径）（%）" prop="govDebtToGdpRateWild" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="债务率（%）" prop="govDebtRate" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="债务率（宽口径）（%）" prop="govDebtRateWild" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="负债率（%）" prop="govDebtToGdpRate" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="负债率（宽口径）（%）" prop="govDebtToGdpRateWild" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="债务率（%）" prop="govDebtRate" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="债务率（宽口径）（%）" prop="govDebtRateWild" :formatter="formatStatus" width="160" align="right"></el-table-column>
<!--<el-table-column label="金融机构存款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />-->
<!--<el-table-column label="金融机构贷款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />-->
<el-table-column label="第一产业增加值（亿元）" prop="piAddValue" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="第二产业增加值（亿元）" prop="siAddValue" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="第三产业增加值（亿元）" prop="tiAddValue" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="工业增加值（亿元）" prop="industryAddValue" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="工业总产值（亿元）" prop="industryTotalValue" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="进出口总额（亿美元）" prop="eximTotalValue" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="社会消费品零售总额（亿元）" prop="trscg" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="城镇居民人均可支配收入（元）" prop="urbanPcdi" :formatter="formatStatus" width="160" align="left"></el-table-column>
<el-table-column label="第一产业增加值（亿元）" prop="piAddValue" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="第二产业增加值（亿元）" prop="siAddValue" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="第三产业增加值（亿元）" prop="tiAddValue" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="工业增加值（亿元）" prop="industryAddValue" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="工业总产值（亿元）" prop="industryTotalValue" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="进出口总额（亿美元）" prop="eximTotalValue" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="社会消费品零售总额（亿元）" prop="trscg" :formatter="formatStatus" width="160" align="right"></el-table-column>
<el-table-column label="城镇居民人均可支配收入（元）" prop="urbanPcdi" :formatter="formatStatus" width="160" align="right"></el-table-column>
</el-table>
</div>
<!--<template slot-scope="scope">-->
......@@ -225,6 +225,17 @@
if(countyCode.length > 0){
params.areaIds=countyCode
}
}else {
if(params.provinceIds){
delete params.provinceIds
}
if(params.cityIds){
delete params.cityIds
}
if(params.areaIds){
delete params.areaIds
}
}
if(this.queryParams.field){
......@@ -276,8 +287,10 @@
this.querySubmit()
},
handleSearch(){
this.$nextTick(() => {
this.pageIndex = 1
this.querySubmit()
})
},
handleMessage(){
this.$message({
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ 7579f082
......@@ -68,8 +68,8 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="type" label="地区"/>
<el-table-column prop="count" sortable label="招标数量"/>
<el-table-column prop="rate" sortable label="占比"/>
<el-table-column prop="count" sortable label="招标数量" align="right"/>
<el-table-column prop="rate" sortable label="占比" align="right"/>
</el-table>
</div>
</div>
......@@ -103,8 +103,8 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="label" label="月份"/>
<el-table-column prop="count" sortable label="招标数量"/>
<el-table-column prop="rate" sortable label="占比"/>
<el-table-column prop="count" sortable label="招标数量" align="right"/>
<el-table-column prop="rate" sortable label="占比" align="right"/>
</el-table>
</div>
</div>
......@@ -163,7 +163,9 @@ export default {
value:'近五年',
punishDateShowPopper: false,
punishDate: "",
yearData:[]
yearData:[],
myChart:'',
myChart1:'',
}
},
created() {
......@@ -177,8 +179,22 @@ export default {
getYear().then(res => {
this.yearData=res.rows;
})
window.addEventListener("resize", this.resizeEcharts);
},
beforeDestroy(){
window.removeEventListener("resize", this.resizeEcharts);
},
activated() {
this.resizeEcharts()
},
methods: {
resizeEcharts (){
const self = this
setTimeout(function(){ //图表跟随页面大小变化宽度
self.myChart.resize()
self.myChart1.resize()
}, 10)
},
getDataByProvince(params){
countGroupByProvince(params).then(res => {
this.tableData=res.data.provinceDate;
......@@ -199,7 +215,7 @@ export default {
})
},
initChart() {
let myChart = echarts.init(document.getElementById("zb-echarts"))
this.myChart = echarts.init(document.getElementById("zb-echarts"))
let option = {
tooltip: {
trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
......@@ -252,10 +268,10 @@ export default {
}
]
};
myChart.setOption(option);
this.myChart.setOption(option);
},
initChart1() {
let myChart = echarts.init(document.getElementById("gl-echarts"))
this.myChart1 = echarts.init(document.getElementById("gl-echarts"))
let dataList=this.tableData1;
let option = {
tooltip: {
......@@ -282,7 +298,7 @@ export default {
{
data: this.tableData1.map(item => item.count),
type: 'bar',
barWidth: 20,
barWidth: 16,
itemStyle: {
normal: {
barBorderRadius: [4, 4, 0, 0],
......@@ -291,12 +307,12 @@ export default {
var colorList = [] //定义一个存储颜色的数组
//更改前二位柱形颜色
//定义一个变量 保存柱形图数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
let companyValue1 = JSON.parse(JSON.stringify(dataList))
let dataArr = JSON.parse(JSON.stringify(dataList))
let arr = dataList.sort((a, b) => {
return b.count - a.count
})
//将原数组数据赋值回去 保持数据不变
dataList = JSON.parse(JSON.stringify(companyValue1))
dataList = JSON.parse(JSON.stringify(dataArr))
//遍历数据 将原数组和排序后的数组比较
dataList.map(i => {
if (i.count == arr[0].count) {
......@@ -315,7 +331,7 @@ export default {
}
]
};
myChart.setOption(option);
this.myChart1.setOption(option);
},
handleDate(command) {
if (command && command != "自定义") {
......@@ -433,6 +449,7 @@ export default {
i{
color:#909399;
margin-right: 9px;
font-size: 14px;
}
}
.content1{
......@@ -507,6 +524,9 @@ export default {
padding: 0;
}
}
.el-table__cell.is-right{
text-align: right;
}
}
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ 7579f082
......@@ -37,21 +37,21 @@
</el-table-column>
<el-table-column prop="major" label="资质类型"/>
<el-table-column label="特级" align="center">
<el-table-column prop="tjCount" label="数量（个）"/>
<el-table-column prop="tjRate" label="占比（%）"/>
<el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量（个）" align="right"/>
<el-table-column prop="tjRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="一级" align="center">
<el-table-column prop="oneCount" label="数量（个）"/>
<el-table-column prop="oneRate" label="占比（%）"/>
<el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量（个）" align="right"/>
<el-table-column prop="oneRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="二级">
<el-table-column prop="twoCount" label="数量（个）"/>
<el-table-column prop="twoRate" label="占比（%）"/>
<el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量（个）" align="right"/>
<el-table-column prop="twoRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="三级">
<el-table-column prop="threeCount" label="数量（个）"/>
<el-table-column prop="threeRate" label="占比（%）"/>
<el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量（个）" align="right"/>
<el-table-column prop="threeRate" label="占比（%）" align="right"/>
</el-table-column>
</el-table>
</div>
......@@ -82,21 +82,21 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="province" label="地区"/>
<el-table-column label="特级" align="center">
<el-table-column prop="tjCount" label="数量（个）"/>
<el-table-column prop="tjRate" label="占比（%）"/>
<el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量（个）" align="right"/>
<el-table-column prop="tjRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="一级" align="center">
<el-table-column prop="oneCount" label="数量（个）"/>
<el-table-column prop="oneRate" label="占比（%）"/>
<el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量（个）" align="right"/>
<el-table-column prop="oneRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="二级">
<el-table-column prop="twoCount" label="数量（个）"/>
<el-table-column prop="twoRate" label="占比（%）"/>
<el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量（个）" align="right"/>
<el-table-column prop="twoRate" label="占比（%）" align="right"/>
</el-table-column>
<el-table-column label="三级">
<el-table-column prop="threeCount" label="数量（个）"/>
<el-table-column prop="threeRate" label="占比（%）"/>
<el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量（个）" align="right"/>
<el-table-column prop="threeRate" label="占比（%）" align="right"/>
</el-table-column>
</el-table>
</div>
......@@ -124,8 +124,8 @@
<el-table-column label="序号" width="50" align="left">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="province" label="地区"/>
<el-table-column prop="count" label="企业异地备案数量（个）" sortable/>
<el-table-column prop="province" label="地区" />
<el-table-column prop="count" label="企业异地备案数量（个）" sortable align="right"/>
<!--<el-table-column prop="zb" label="占比"/>-->
</el-table>
</div>
......@@ -298,8 +298,9 @@ export default {
})
areaGroupByProvince().then(res => {
this.zbData=res.data;
let arr=this.zbData.sort((old,New)=>{
//定义一个变量 保存数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
let dataArr = JSON.parse(JSON.stringify(res.data))
let arr=res.data.sort((old,New)=>{
return New.count - old.count
})
let data=[]
......@@ -307,6 +308,8 @@ export default {
data.push(arr[i])
}
this.rankList=data;
//将原数组数据赋值回去 保持数据不变
this.zbData = JSON.parse(JSON.stringify(dataArr))
this.initChart2()
})
},
......@@ -363,8 +366,11 @@ export default {
}
]
}
myChart.clear();
myChart.clear(); //图表清除
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
initChart1() {
let myChart = echarts.init(document.getElementById("jzqy-echarts"))
......@@ -529,6 +535,9 @@ export default {
}
myChart.clear();
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
initChart2() {
let myChart = echarts.init(document.getElementById("ba-echarts"))
......@@ -585,6 +594,9 @@ export default {
]
}
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度
});
},
handleClick(type,index){
if(type === 1){
......@@ -663,6 +675,7 @@ export default {
i{
color:#909399;
margin-right: 9px;
font-size: 14px;
}
}
.content1{
......@@ -778,6 +791,9 @@ export default {
padding: 0;
}
}
.el-table__cell.is-right{
text-align: right;
}
}
}
}
......
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