Commit 58c194b1 authored by danfuman's avatar danfuman

修改

parent fa04e11f
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
.app-main { .app-main {
/* 84 = navbar + tags-view = 50 + 34 */ /* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 68px); min-height: calc(100vh - 68px);
min-width:1440px; min-width:1240px;
background: #F5F5F5; background: #F5F5F5;
overflow: initial; overflow: initial;
} }
......
...@@ -225,10 +225,7 @@ ...@@ -225,10 +225,7 @@
} }
}, },
created() { created() {
setTimeout(() => { this.getAreaGroupByProvince()
this.isSkeleton=false;
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
...@@ -274,9 +271,13 @@ ...@@ -274,9 +271,13 @@
total=total+this.jzglData[i].count total=total+this.jzglData[i].count
} }
this.total=total; this.total=total;
this.$nextTick(() => {
this.initChart() this.initChart()
}) })
})
},
getCertGroupByMajorProvinceLevel(){
certGroupByMajorProvinceLevel().then(res => { certGroupByMajorProvinceLevel().then(res => {
this.dqData=res.data; this.dqData=res.data;
let data=this.dqData[0].province; let data=this.dqData[0].province;
...@@ -305,9 +306,15 @@ ...@@ -305,9 +306,15 @@
list.push(item) list.push(item)
} }
this.jzdqData=list this.jzdqData=list
this.$nextTick(() => {
this.initChart1() this.initChart1()
}) })
})
},
getAreaGroupByProvince(){
areaGroupByProvince().then(res => { areaGroupByProvince().then(res => {
this.isSkeleton=false;
this.zbData=res.data; this.zbData=res.data;
//定义一个变量 保存数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存 //定义一个变量 保存数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
// let dataArr = JSON.parse(JSON.stringify(res.data)) // let dataArr = JSON.parse(JSON.stringify(res.data))
...@@ -321,10 +328,15 @@ ...@@ -321,10 +328,15 @@
this.rankList=data; this.rankList=data;
//将原数组数据赋值回去 保持数据不变 //将原数组数据赋值回去 保持数据不变
// this.zbData = JSON.parse(JSON.stringify(dataArr)) // this.zbData = JSON.parse(JSON.stringify(dataArr))
this.$nextTick(() => {
this.initChart2() this.initChart2()
}) })
this.getData()
this.getCertGroupByMajorProvinceLevel()
})
}, },
initChart() { initChart() {
this.$nextTick(() => {
let myChart = echarts.init(document.getElementById("gl-echarts")) let myChart = echarts.init(document.getElementById("gl-echarts"))
let option ={ let option ={
tooltip: { tooltip: {
...@@ -382,8 +394,10 @@ ...@@ -382,8 +394,10 @@
window.addEventListener("resize", function () { window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度 myChart.resize();//图表跟随页面大小变化宽度
}); });
})
}, },
initChart1() { initChart1() {
this.$nextTick(() => {
let myChart = echarts.init(document.getElementById("jzqy-echarts")) let myChart = echarts.init(document.getElementById("jzqy-echarts"))
let option ={ let option ={
legend: { legend: {
...@@ -549,8 +563,11 @@ ...@@ -549,8 +563,11 @@
window.addEventListener("resize", function () { window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度 myChart.resize();//图表跟随页面大小变化宽度
}); });
})
}, },
initChart2() { initChart2() {
this.$nextTick(() => {
let myChart = echarts.init(document.getElementById("ba-echarts")) let myChart = echarts.init(document.getElementById("ba-echarts"))
let option ={ let option ={
tooltip: { tooltip: {
...@@ -615,6 +632,7 @@ ...@@ -615,6 +632,7 @@
window.addEventListener("resize", function () { window.addEventListener("resize", function () {
myChart.resize();//图表跟随页面大小变化宽度 myChart.resize();//图表跟随页面大小变化宽度
}); });
})
}, },
handleClick(type,index){ handleClick(type,index){
if(type === 1){ if(type === 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