sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/map_source'

Browse Source 
Former-commit-id: b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly 9febb86f744acac92e4cb425b72dd370d41221bf [formerly 6ae9e818984c2e99697c16aec56e436999058b86]]]]]
Former-commit-id: c1e810682ef36311a715948257958c24e2affce3
Former-commit-id: 844a830d93799a4e2daffb4550e7d899a92dc177
Former-commit-id: a83596ebf83cde1473eb6f781f93a8058405568f [formerly c545080a81ada6b07fbdb22cc22780e49c883c4f]
Former-commit-id: 65563c7377cd5c3fcad33a9510d37d2fecbe88c8
Former-commit-id: df3eb9737db54113550c83212b4bd9980fb228cc
Former-commit-id: 13e1ceff2d3a161b03df14c403cc6d8c756acbf3
Former-commit-id: f8b57c6fbf3e8b81144147a8096bdd438a1e9547
Former-commit-id: 995649388e53b32d8486556f4e1cc49b0774a86f
This commit is contained in:
liyang
2018-09-13 01:57:28 +08:00
parent a297e2ae84 ec6597e429
commit afc1097a1d
5 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/demo/charts/list/_data/beijing.json.REMOVED.git-id Normal file
View File

@@ -0,0 +1 @@
8a2b03e0745b33a15d68fd8c98c73b68ba057482

1
src/pages/demo/charts/list/_data/china.json.REMOVED.git-id Normal file
View File

@@ -0,0 +1 @@
28bbf7a8cf2cd33dc30fba1bd876a43acd4743f5

11
src/pages/demo/charts/list/map/demo1/index.vue
View File

@@ -1,10 +1,9 @@
<template>
<d2-container>
<template slot="header">一般</template>
<!-- <div class="inner">
<ve-map :data="chartData" v-bind="pubSetting"></ve-map>
</div> -->
大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示
<div class="inner">
<ve-map :data="chartData" v-bind="pubSetting" :settings="chartSettings"></ve-map>
</div>
<template slot="footer">
<d2-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
</template>
@@ -13,12 +12,16 @@
<script>
import list from '@/pages/demo/charts/list/_mixin/list.js'
import mapOrigin from '@/pages/demo/charts/list/_data/china'
export default {
mixins: [
list
],
data () {
return {
chartSettings: {
mapOrigin
},
chartData: {
columns: ['位置', '税收', '人口', '面积'],
rows: [

13
src/pages/demo/charts/list/map/demo2/index.vue
View File

@@ -1,10 +1,9 @@
<template>
<d2-container>
<template slot="header">设置城市</template>
<!-- <div class="inner">
<div class="inner">
<ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
</div> -->
大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示
</div>
<template slot="footer">
<d2-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
</template>
@@ -13,15 +12,17 @@
<script>
import list from '@/pages/demo/charts/list/_mixin/list.js'
import mapOrigin from '@/pages/demo/charts/list/_data/beijing'
export default {
mixins: [
list
],
data () {
this.chartSettings = {
position: 'province/beijing'
}
return {
chartSettings: {
position: 'province/beijing',
mapOrigin
},
chartData: {
columns: ['位置', '人口'],
rows: [

27
src/pages/demo/charts/list/map/demo3/index.vue
View File

@@ -1,10 +1,9 @@
<template>
<d2-container>
<template slot="header">设置样式</template>
<!-- <div class="inner">
<div class="inner">
<ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
</div> -->
<!-- 大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示 -->
</div>
<template slot="footer">
<d2-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
</template>
@@ -13,22 +12,24 @@
<script>
import list from '@/pages/demo/charts/list/_mixin/list.js'
import mapOrigin from '@/pages/demo/charts/list/_data/china'
export default {
mixins: [
list
],
data () {
this.chartSettings = {
position: 'china',
label: false,
itemStyle: {
normal: {
borderColor: '#00f'
}
},
zoom: 1.2
}
return {
chartSettings: {
position: 'china',
mapOrigin,
label: false,
itemStyle: {
normal: {
borderColor: '#00f'
}
},
zoom: 1.2
},
chartData: {
columns: ['位置', '人口'],
rows: [