|
@@ -27,12 +27,13 @@
|
|
|
|
|
|
<!-- 林业经济 -->
|
|
|
<section class="left-wrap " v-if="page==5">
|
|
|
+ <Typeslide :data="typeSlideData" />
|
|
|
<Numerical class="blur-wrap" :data="page5numerical" />
|
|
|
<MyEcharts class="blur-wrap u-p-t" mid="page5Char1" ref="page5Char1" :option="page5Char1" height="30vh" />
|
|
|
<MyEcharts class="blur-wrap u-m-t u-p-t" mid="page5Char2" ref="page5Char2" :option="page5Char2" height="30vh" />
|
|
|
</section>
|
|
|
|
|
|
- <!-- 林业经济 -->
|
|
|
+ <!-- 事件信息 -->
|
|
|
<section class="left-wrap " v-if="page==6">
|
|
|
<Numerical class="blur-wrap" :data="page6numerical" />
|
|
|
<MyEcharts class="blur-wrap u-p-t" mid="page6Char1" ref="page6Char1" :option="page6Char1" height="30vh" />
|
|
@@ -40,12 +41,6 @@
|
|
|
|
|
|
<section class="right-wrap">
|
|
|
<PickerAddr />
|
|
|
- <!-- <el-cascader
|
|
|
- size="large"
|
|
|
- :options="addrOptions"
|
|
|
- v-model="addrSelectedOptions"
|
|
|
- @change="addrChange">
|
|
|
- </el-cascader> -->
|
|
|
<div class="xiaoban u-flex">
|
|
|
<div class="title">小班查询:</div>
|
|
|
<el-input v-model="xiaobaninput" placeholder="请输入小班号">
|
|
@@ -70,9 +65,13 @@
|
|
|
import Numerical from "../components/numerical";
|
|
|
import Alarm from "../components/alarm";
|
|
|
import PickerAddr from "../components/pickerAddr";
|
|
|
+ import Typeslide from "../components/typeslide";
|
|
|
|
|
|
import { Message } from 'element-ui';
|
|
|
|
|
|
+ import { debounce } from '@/utils/mdebounce';
|
|
|
+ import {sliceArray} from '@/utils/sliceArray';
|
|
|
+
|
|
|
import {
|
|
|
page1numerical,
|
|
|
page1echarts01,
|
|
@@ -82,6 +81,7 @@
|
|
|
page2echarts01,
|
|
|
page2echarts02,
|
|
|
page5numerical,
|
|
|
+ typeSlideApi,
|
|
|
page5echarts01,
|
|
|
page5echarts02,
|
|
|
page6numerical,
|
|
@@ -98,7 +98,8 @@
|
|
|
MyEcharts,
|
|
|
Numerical,
|
|
|
Alarm,
|
|
|
- PickerAddr
|
|
|
+ PickerAddr,
|
|
|
+ Typeslide
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
@@ -175,6 +176,7 @@
|
|
|
page2Char1:{},
|
|
|
page2Char2:{},
|
|
|
page5numerical:[],
|
|
|
+ typeSlideData:[],
|
|
|
page5Char1:{},
|
|
|
page5Char2:{},
|
|
|
page6numerical:[],
|
|
@@ -203,6 +205,13 @@
|
|
|
this.getPageData();
|
|
|
}, 111115000);
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ xiaobaninput: {
|
|
|
+ handler: function() {
|
|
|
+ debounce(this.xiaobansearch, 1000, false)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
methods: {
|
|
|
addrChange(value){
|
|
|
console.log('addrChange',value);
|
|
@@ -225,6 +234,7 @@
|
|
|
this.getPage2echarts02();
|
|
|
}else if(this.page==5){
|
|
|
this.getPage5numerical();
|
|
|
+ this.getTypeSlideData();
|
|
|
this.getPage5echarts01();
|
|
|
this.getPage5echarts02();
|
|
|
}
|
|
@@ -293,13 +303,20 @@
|
|
|
},
|
|
|
|
|
|
getPage5numerical(){
|
|
|
- //第一屏统计
|
|
|
page5numerical().then(res=>{
|
|
|
// console.log('res',res);
|
|
|
this.page5numerical = res.data;
|
|
|
}).catch(err=>{
|
|
|
console.log('echarts01 err',err);
|
|
|
})
|
|
|
+ },
|
|
|
+ getTypeSlideData(){
|
|
|
+ typeSlideApi().then(res=>{
|
|
|
+ this.typeSlideData = sliceArray(res.data,3);
|
|
|
+ // console.log(' this.typeSlideData', this.typeSlideData);
|
|
|
+ }).catch(err=>{
|
|
|
+ console.log('getTypeSlideData err',err);
|
|
|
+ })
|
|
|
},
|
|
|
getPage5echarts01(){
|
|
|
page5echarts01().then(res=>{
|
|
@@ -343,7 +360,8 @@
|
|
|
},
|
|
|
|
|
|
xiaobansearch(){
|
|
|
- console.log('xiaobansearch');
|
|
|
+ // console.log('xiaobansearch');
|
|
|
+ this.getRightScrollData();
|
|
|
}
|
|
|
|
|
|
},
|