From ec6597e429aef926c30f4fdb3ce4501d5f45cb66 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 13 Sep 2018 01:56:48 +0800
Subject: [PATCH] local map data

Former-commit-id: 4b6b7341014900e583f602e7c951cbcb4ff01e1d [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9] [formerly 4b6b7341014900e583f602e7c951cbcb4ff01e1d [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9] [formerly 4b6b7341014900e583f602e7c951cbcb4ff01e1d [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9] [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9 [formerly 37508c4b27a91ccdc48775080ff3593cb8aefb2c [formerly e0fc7b2ec6d144f19636d25a4d0eb77509790b76]]]]]
Former-commit-id: 0c4340be663716a6e7aa764f24ae57b177827dc9
Former-commit-id: 59d150d9419b42d6e185df0af57e4ada5118d07b
Former-commit-id: 598796cc74c53a582202d4fd357e09877b500333 [formerly bbcc39d0bbe434550a44330a5f0da223ff95d599]
Former-commit-id: 59b95938381693970abb79df93d980b3b87b7724
Former-commit-id: 67229d37f7698a6478742e16caced120c04c4d0c
Former-commit-id: cbe56d381f2bce4120e51002ac16d2aecc015672
Former-commit-id: 3c647eb4e8eb4b80c026065cd3df14fff06ce558
Former-commit-id: 0ceb088f85dd0579fbb0695d8d9a76dcf6c34650
---
 .../list/_data/beijing.json.REMOVED.git-id    |  1 +
 .../list/_data/china.json.REMOVED.git-id      |  1 +
 .../demo/charts/list/map/demo1/index.vue      | 11 +++++---
 .../demo/charts/list/map/demo2/index.vue      | 13 ++++-----
 .../demo/charts/list/map/demo3/index.vue      | 27 ++++++++++---------
 5 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 src/pages/demo/charts/list/_data/beijing.json.REMOVED.git-id
 create mode 100644 src/pages/demo/charts/list/_data/china.json.REMOVED.git-id

diff --git a/src/pages/demo/charts/list/_data/beijing.json.REMOVED.git-id b/src/pages/demo/charts/list/_data/beijing.json.REMOVED.git-id
new file mode 100644
index 00000000..eae5d532
--- /dev/null
+++ b/src/pages/demo/charts/list/_data/beijing.json.REMOVED.git-id
@@ -0,0 +1 @@
+8a2b03e0745b33a15d68fd8c98c73b68ba057482
\ No newline at end of file
diff --git a/src/pages/demo/charts/list/_data/china.json.REMOVED.git-id b/src/pages/demo/charts/list/_data/china.json.REMOVED.git-id
new file mode 100644
index 00000000..610b2a21
--- /dev/null
+++ b/src/pages/demo/charts/list/_data/china.json.REMOVED.git-id
@@ -0,0 +1 @@
+28bbf7a8cf2cd33dc30fba1bd876a43acd4743f5
\ No newline at end of file
diff --git a/src/pages/demo/charts/list/map/demo1/index.vue b/src/pages/demo/charts/list/map/demo1/index.vue
index 5eed188d..ac678bf5 100644
--- a/src/pages/demo/charts/list/map/demo1/index.vue
+++ b/src/pages/demo/charts/list/map/demo1/index.vue
@@ -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: [
diff --git a/src/pages/demo/charts/list/map/demo2/index.vue b/src/pages/demo/charts/list/map/demo2/index.vue
index edf4a58a..3c75f2ea 100644
--- a/src/pages/demo/charts/list/map/demo2/index.vue
+++ b/src/pages/demo/charts/list/map/demo2/index.vue
@@ -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: [
diff --git a/src/pages/demo/charts/list/map/demo3/index.vue b/src/pages/demo/charts/list/map/demo3/index.vue
index d3d6c453..4a48e283 100644
--- a/src/pages/demo/charts/list/map/demo3/index.vue
+++ b/src/pages/demo/charts/list/map/demo3/index.vue
@@ -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: [