Commit 3e2df1d5 authored by danfuman's avatar danfuman

修改

parent 827080d5
<template> <template>
<div class="regionalEconomy"> <div class="regionalEconomy">
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton> <div class="flex-box query-box">
<div v-if="!isSkeleton" class="flex-box query-box">
<div class="flex-box query-params"> <div class="flex-box query-params">
<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">
...@@ -16,7 +15,8 @@ ...@@ -16,7 +15,8 @@
<span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div v-if="!isSkeleton" class="content"> <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="content" v-if="data.length > 0 && !isSkeleton">
<div class="content-left"> <div class="content-left">
<div id="echarts" style="height: 400px"></div> <div id="echarts" style="height: 400px"></div>
<p class="tips"> 注:数据均来源于统计公报、统计年鉴,实际披露中由于部分地区最新年度数据不全,导致年份间数据差距较大</p> <p class="tips"> 注:数据均来源于统计公报、统计年鉴,实际披露中由于部分地区最新年度数据不全,导致年份间数据差距较大</p>
...@@ -47,12 +47,10 @@ ...@@ -47,12 +47,10 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<!--<div class="content content-box" v-else>--> <div class="empty" v-if="data.length === 0 && !isSkeleton">
<!--<div class="empty">--> <img class="img" src="@/assets/images/project/empty.png">
<!--<img class="img" src="@/assets/images/project/empty.png">--> <div class="p1">抱歉,暂无数据展示</div>
<!--<div class="p1">抱歉,暂无专项债项目数据</div>--> </div>
<!--</div>-->
<!--</div>-->
</div> </div>
</template> </template>
...@@ -94,8 +92,11 @@ export default { ...@@ -94,8 +92,11 @@ export default {
this.yearOptions=res.data.reverse(); this.yearOptions=res.data.reverse();
this.queryParams.year = this.yearOptions[0].year; this.queryParams.year = this.yearOptions[0].year;
}) })
// setTimeout(() => {
// this.isSkeleton=false;
// this.getData()
// this.getGroupCount()
// }, 1000);
this.$nextTick(()=>{ this.$nextTick(()=>{
this.getData() this.getData()
this.getGroupCount() this.getGroupCount()
...@@ -149,6 +150,9 @@ export default { ...@@ -149,6 +150,9 @@ export default {
} }
this.tableData=list.reverse() this.tableData=list.reverse()
this.tabData=list.reverse() this.tabData=list.reverse()
}else {
this.tableData=[]
this.tabData=[]
} }
}) })
}, },
...@@ -175,7 +179,6 @@ export default { ...@@ -175,7 +179,6 @@ export default {
params.county=this.provinceId[2] params.county=this.provinceId[2]
} }
bidGroupCountByProjectType(params).then(res => { bidGroupCountByProjectType(params).then(res => {
this.isSkeleton = false
if(res.code === 200){ if(res.code === 200){
let list=[] let list=[]
for(let i=0; i<res.data.length; i++){ for(let i=0; i<res.data.length; i++){
...@@ -185,15 +188,17 @@ export default { ...@@ -185,15 +188,17 @@ export default {
list.push(item); list.push(item);
} }
this.data=list; this.data=list;
// if(list.length > 0){ if(list.length > 0){
this.$nextTick(() => { this.$nextTick(() => {
this.initChart() this.initChart()
}) })
// }
} }
}
this.isSkeleton = false
}) })
}, },
initChart() { initChart() {
this.$nextTick(() => {
let myChart = echarts.init(document.getElementById("echarts")) let myChart = echarts.init(document.getElementById("echarts"))
let option ={ let option ={
label: { label: {
...@@ -240,6 +245,7 @@ export default { ...@@ -240,6 +245,7 @@ export default {
window.addEventListener("resize", function () { window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度 myChart.resize();//图表跟随页面大小变化宽度
}); });
})
}, },
handleMessage(){ handleMessage(){
this.$message({ this.$message({
...@@ -402,9 +408,10 @@ export default { ...@@ -402,9 +408,10 @@ export default {
} }
} }
} }
}
.empty{ .empty{
margin: 0 auto; margin: 0 auto;
height: 550px; height: 400px;
text-align: center; text-align: center;
.img{ .img{
width: 108px; width: 108px;
...@@ -416,12 +423,6 @@ export default { ...@@ -416,12 +423,6 @@ export default {
color: #333333; color: #333333;
font-size: 16px; font-size: 16px;
} }
.p2{
color: #999999;
font-size: 14px;
margin-top: 8px;
}
}
} }
} }
</style> </style>
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
} }
} }
location(params).then(res => { location(params).then(res => {
console.log(res.data) // console.log(res.data)
}) })
} }
} }
......
<template> <template>
<div class="zhongbiao"> <div>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div v-if="!isSkeleton" class="zhongbiao">
<div class="zb-content content1"> <div class="zb-content content1">
<div class="flex-box query-box"> <div class="flex-box query-box">
<div class="flex-box query-params"> <div class="flex-box query-params">
...@@ -131,13 +133,18 @@ ...@@ -131,13 +133,18 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { certGroupByMajorAndLevel,certGroupByMajorProvinceLevel,areaGroupByProvince } from '@/api/macro/macro' import { certGroupByMajorAndLevel,certGroupByMajorProvinceLevel,areaGroupByProvince } from '@/api/macro/macro'
export default { import skeleton from '../../component/skeleton'
export default {
name: 'NationalEconomies', name: 'NationalEconomies',
components: {
skeleton
},
data() { data() {
return { return {
typeIndex:0, typeIndex:0,
...@@ -214,10 +221,14 @@ export default { ...@@ -214,10 +221,14 @@ export default {
currentdate:'', currentdate:'',
total:'', total:'',
glDetail:{}, glDetail:{},
isSkeleton:true,
} }
}, },
created() { created() {
setTimeout(() => {
this.isSkeleton=false;
this.getData() this.getData()
}, 1000);
var date = new Date() var date = new Date()
var year = date.getFullYear() var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth()+ 1 var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth()+ 1
...@@ -645,7 +656,7 @@ export default { ...@@ -645,7 +656,7 @@ export default {
} }
}, },
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
this.getCountLandMarketByTypeTd() this.getCountLandMarketByTypeTd()
this.getCountLandMarketByProvince() this.getCountLandMarketByProvince()
this.getCountLandMarketByYear() this.getCountLandMarketByYear()
}, 1500); }, 1000);
}, },
mounted() { mounted() {
}, },
......
<template> <template>
<div class="zhongbiao"> <div>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div v-if="!isSkeleton" class="zhongbiao">
<div class="zb-content content1"> <div class="zb-content content1">
<div class="flex-box query-box"> <div class="flex-box query-box">
<div class="flex-box query-params"> <div class="flex-box query-params">
...@@ -131,13 +133,18 @@ ...@@ -131,13 +133,18 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { certGroupByMajorAndLevel,certGroupByMajorProvinceLevel,areaGroupByProvince } from '@/api/macro/macro' import { certGroupByMajorAndLevel,certGroupByMajorProvinceLevel,areaGroupByProvince } from '@/api/macro/macro'
import skeleton from '../../component/skeleton'
export default { export default {
name: 'NationalEconomies', name: 'NationalEconomies',
components: {
skeleton
},
data() { data() {
return { return {
typeIndex:0, typeIndex:0,
...@@ -214,10 +221,14 @@ export default { ...@@ -214,10 +221,14 @@ export default {
currentdate:'', currentdate:'',
total:'', total:'',
glDetail:{}, glDetail:{},
isSkeleton:true,
} }
}, },
created() { created() {
setTimeout(() => {
this.isSkeleton=false;
this.getData() this.getData()
}, 1000);
var date = new Date() var date = new Date()
var year = date.getFullYear() var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth()+ 1 var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth()+ 1
......
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