diff --git a/src/components/charts/G2/components/Line/1.vue b/src/components/charts/G2/components/Line/base.vue similarity index 100% rename from src/components/charts/G2/components/Line/1.vue rename to src/components/charts/G2/components/Line/base.vue diff --git a/src/components/charts/index.js b/src/components/charts/index.js index 5c53fd7f..2e6279f4 100644 --- a/src/components/charts/index.js +++ b/src/components/charts/index.js @@ -1,3 +1,3 @@ -// import Vue from 'vue' +import Vue from 'vue' -// Vue.component('G2Line1', resolve => { require(['@/components/G2/charts/Line/1.vue'], resolve) }) +Vue.component('G2LineBase', resolve => { require(['@/components/charts/G2/components/Line/base.vue'], resolve) }) diff --git a/src/components/index.js b/src/components/index.js index e800037c..61d5e570 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -2,5 +2,5 @@ import './core' // 非核心组件 只是在很多演示页面中用到的组件 import './demo' -// 图表组件 G2 -import './charts/G2' +// 图表组件 +import './charts' diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue index 42c4c25e..3b4a7d0e 100644 --- a/src/pages/demo/chart/index/index.vue +++ b/src/pages/demo/chart/index/index.vue @@ -7,7 +7,7 @@ @resized="resizedHandler('G2Line1')">
近年趋势
- +
diff --git a/src/pages/demo/chart/index/mixins/chart.js b/src/pages/demo/chart/index/mixins/chart.js index 5797ec01..31c154e8 100644 --- a/src/pages/demo/chart/index/mixins/chart.js +++ b/src/pages/demo/chart/index/mixins/chart.js @@ -1,27 +1,29 @@ export default { data () { - return {} + return { + chart: [ + { + data: [] + } + ] + } }, mounted () { // 请求图表数据 - // this.syncData() + this.syncData() }, methods: { // 请求图表数据 syncData () { - // const api = [ - // {url: '/api/chart/G2Line', data: {code: 1}}, - // {url: '/api/chart/G2Pie', data: {code: 1}}, - // {url: '/api/chart/G2Column', data: {code: 1}} - // ] - // this.$axios.all(api.map(e => this.$axios.post(e.url, e.data))) - // .then(this.$axios.spread((G2Line1, G2Pie1, G2Column1) => { - // this.chartData = { - // G2Line1, - // G2Pie1, - // G2Column1 - // } - // })) + const api = [ + {url: '/api/chart/G2Line', data: {code: 1}} + ] + this.$axios.all(api.map(e => this.$axios.post(e.url, e.data))) + .then(this.$axios.spread((...res) => { + res.forEach((e, index) => { + this.chart[index].data = e + }) + })) } } }