|
@@ -56,18 +56,18 @@
|
|
|
<section class="left-wrap" v-if="$store.state.addr.page=='economics'">
|
|
|
<!-- <Typeslide :data="typeSlideData" /> -->
|
|
|
<Numerical class="left-item" :data="page5numerical" />
|
|
|
- <MyEcharts
|
|
|
- class="left-item chart-wrap"
|
|
|
- mid="page5Char1"
|
|
|
- ref="page5Char1"
|
|
|
- :option="page5Char1"
|
|
|
- />
|
|
|
<MyEcharts
|
|
|
class="left-item chart-wrap"
|
|
|
mid="page5Char2"
|
|
|
ref="page5Char2"
|
|
|
:option="page5Char2"
|
|
|
/>
|
|
|
+ <MyEcharts
|
|
|
+ class="left-item chart-wrap"
|
|
|
+ mid="page5Char1"
|
|
|
+ ref="page5Char1"
|
|
|
+ :option="page5Char1"
|
|
|
+ />
|
|
|
</section>
|
|
|
|
|
|
<!-- 事件信息 -->
|
|
@@ -140,7 +140,8 @@ import page1Char1Schema from '../dataSchema/page1Char1Schema';
|
|
|
import page1Char2Schema from '../dataSchema/page1Char2Schema';
|
|
|
import page2Char1Schema from '../dataSchema/page2Char1Schema';
|
|
|
import page2Char2Schema from '../dataSchema/page2Char2Schema';
|
|
|
-// import page5Char1Schema from '../dataSchema/page5Char1Schema';
|
|
|
+import page5Char1Schema from '../dataSchema/page5Char1Schema';
|
|
|
+import page5Char2Schema from '../dataSchema/page5Char2Schema';
|
|
|
import page6Char1Schema from '../dataSchema/page6Char1Schema';
|
|
|
|
|
|
// import { provinceAndCityData, regionData, provinceAndCityDataPlus, regionDataPlus, CodeToText, TextToCode } from 'element-china-area-data';
|
|
@@ -189,8 +190,8 @@ export default {
|
|
|
page2Char2: page2Char2Schema,
|
|
|
page5numerical: [],
|
|
|
typeSlideData: [],
|
|
|
- page5Char1: {},
|
|
|
- page5Char2: {},
|
|
|
+ page5Char1: page5Char1Schema,
|
|
|
+ page5Char2: page5Char2Schema,
|
|
|
page6numerical: [],
|
|
|
page6Char1: page6Char1Schema,
|
|
|
xiaobaninput: ''
|
|
@@ -269,7 +270,7 @@ export default {
|
|
|
this.getRightScrollData();
|
|
|
} else if (this.$store.state.addr.page == 'economics') {
|
|
|
this.getPage5numerical();
|
|
|
- this.getTypeSlideData();
|
|
|
+ // this.getTypeSlideData();
|
|
|
this.getPage5echarts01();
|
|
|
this.getPage5echarts02();
|
|
|
this.getRightScrollData();
|
|
@@ -518,7 +519,13 @@ export default {
|
|
|
page5echarts01(param)
|
|
|
.then((res) => {
|
|
|
// console.log('res',res);
|
|
|
- this.page5Char1 = res.data;
|
|
|
+ // this.page5Char1 = res.data;
|
|
|
+ this.page5Char1.xAxis.data = res.data.map((item) => {
|
|
|
+ return item.baseName;
|
|
|
+ });
|
|
|
+ this.page5Char1.series[0].data = res.data.map((item) => {
|
|
|
+ return item.baseArea;
|
|
|
+ });
|
|
|
let charUuid = this.$refs.page5Char1.mid;
|
|
|
this.$refs.page5Char1.intChar(charUuid);
|
|
|
})
|
|
@@ -535,9 +542,15 @@ export default {
|
|
|
page5echarts02(param)
|
|
|
.then((res) => {
|
|
|
// console.log('res',res);
|
|
|
- this.page5Char2 = res.data;
|
|
|
+ // this.page5Char2 = res.data;
|
|
|
+ this.page5Char2.xAxis.data = res.data.map((item) => {
|
|
|
+ return item.name;
|
|
|
+ });
|
|
|
+ this.page5Char2.series[0].data = res.data.map((item) => {
|
|
|
+ return item.number;
|
|
|
+ });
|
|
|
let charUuid = this.$refs.page5Char2.mid;
|
|
|
- this.$refs.page5Char1.intChar(charUuid);
|
|
|
+ this.$refs.page5Char2.intChar(charUuid);
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
console.log('getPage5echarts02 err', err);
|