From 612b812ca9f6244c5cbf776785576ebad63bac98 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 27 Jun 2018 13:25:41 +0800
Subject: [PATCH] no message

Former-commit-id: 6f35446f87e4b9d590df85bf05f0dd7c105f17fd [formerly 6f35446f87e4b9d590df85bf05f0dd7c105f17fd [formerly 6f35446f87e4b9d590df85bf05f0dd7c105f17fd [formerly 6f35446f87e4b9d590df85bf05f0dd7c105f17fd [formerly 57cfbebb0bc2d13f6dabdfa90a3c645c1d68f40d [formerly 84fd8c923d3039d42e0107634e1e721221c3da5d]]]]]
Former-commit-id: bf171443a797ac149fc42e538c6dd05ad8a6f30d
Former-commit-id: 1e8f42beda0626d3137a0bf87dc564a01a844796
Former-commit-id: afe20a078202a1a76ae49d8c349d471bcf5c7fbf [formerly f8b48c0c4c82809ca0793233d8f12789b4ab1ca9]
Former-commit-id: 46e73d3b6b8ae878b32e79803f2f8840ea485a01
Former-commit-id: 9ffb357622348038a4555dfd19e26ffc44606101
Former-commit-id: 12fe98f68832909330fd881e66ab6ecf8093eb8b
Former-commit-id: 40c2b9828ebe5fabd75586ba155e7ed062f9c674
Former-commit-id: ffb7c2780bd6bd9a3d3fc22ac454fbd7de5bcec6
---
 src/menu/index.js.REMOVED.git-id              |  2 +-
 .../demo/charts/list/pie/demo6/index.vue      |  2 +-
 .../demo/charts/list/ring/demo1/index.vue     | 45 +++++++++++++++++
 .../demo/charts/list/ring/demo2/index.vue     | 49 +++++++++++++++++++
 .../demo/charts/list/ring/demo3/index.vue     | 48 ++++++++++++++++++
 .../demo/charts/list/ring/demo4/index.vue     | 48 ++++++++++++++++++
 .../demo/charts/list/ring/demo5/index.vue     | 49 +++++++++++++++++++
 src/router/index.js.REMOVED.git-id            |  2 +-
 8 files changed, 242 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/charts/list/ring/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/ring/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/ring/demo3/index.vue
 create mode 100644 src/pages/demo/charts/list/ring/demo4/index.vue
 create mode 100644 src/pages/demo/charts/list/ring/demo5/index.vue

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 82c16eae..0e627d15 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-b1a19ac8b53aa01e582a29119c729b52011799e7
\ No newline at end of file
+bf6d527e9d3ed7e689157c558539c615f6d69190
\ No newline at end of file
diff --git a/src/pages/demo/charts/list/pie/demo6/index.vue b/src/pages/demo/charts/list/pie/demo6/index.vue
index a6c8f228..a670c8c5 100644
--- a/src/pages/demo/charts/list/pie/demo6/index.vue
+++ b/src/pages/demo/charts/list/pie/demo6/index.vue
@@ -19,7 +19,7 @@ export default {
   data () {
     this.chartSettings = {
       radius: 150,
-      offsetY: 300
+      offsetY: 250
     }
     return {
       chartData: {
diff --git a/src/pages/demo/charts/list/ring/demo1/index.vue b/src/pages/demo/charts/list/ring/demo1/index.vue
new file mode 100644
index 00000000..5186c954
--- /dev/null
+++ b/src/pages/demo/charts/list/ring/demo1/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-ring :data="chartData" v-bind="pubSetting"></ve-ring>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['日期', '访问用户'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393 },
+          { '日期': '1/2', '访问用户': 3530 },
+          { '日期': '1/3', '访问用户': 2923 },
+          { '日期': '1/4', '访问用户': 1723 },
+          { '日期': '1/5', '访问用户': 3792 },
+          { '日期': '1/6', '访问用户': 4593 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/ring/demo2/index.vue b/src/pages/demo/charts/list/ring/demo2/index.vue
new file mode 100644
index 00000000..6a39ca05
--- /dev/null
+++ b/src/pages/demo/charts/list/ring/demo2/index.vue
@@ -0,0 +1,49 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">指定指标维度</template>
+    <div class="inner">
+      <ve-ring :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-ring>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      dimension: '日期',
+      metrics: '访问用户'
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393 },
+          { '日期': '1/2', '访问用户': 3530 },
+          { '日期': '1/3', '访问用户': 2923 },
+          { '日期': '1/4', '访问用户': 1723 },
+          { '日期': '1/5', '访问用户': 3792 },
+          { '日期': '1/6', '访问用户': 4593 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/ring/demo3/index.vue b/src/pages/demo/charts/list/ring/demo3/index.vue
new file mode 100644
index 00000000..b715eef8
--- /dev/null
+++ b/src/pages/demo/charts/list/ring/demo3/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">玫瑰图</template>
+    <div class="inner">
+      <ve-ring :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-ring>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      roseType: 'radius'
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393 },
+          { '日期': '1/2', '访问用户': 3530 },
+          { '日期': '1/3', '访问用户': 2923 },
+          { '日期': '1/4', '访问用户': 1723 },
+          { '日期': '1/5', '访问用户': 3792 },
+          { '日期': '1/6', '访问用户': 4593 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/ring/demo4/index.vue b/src/pages/demo/charts/list/ring/demo4/index.vue
new file mode 100644
index 00000000..ee253dc0
--- /dev/null
+++ b/src/pages/demo/charts/list/ring/demo4/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">限制显示条数环图</template>
+    <div class="inner">
+      <ve-ring :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-ring>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      limitShowNum: 3
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393 },
+          { '日期': '1/2', '访问用户': 3530 },
+          { '日期': '1/3', '访问用户': 2923 },
+          { '日期': '1/4', '访问用户': 1723 },
+          { '日期': '1/5', '访问用户': 3792 },
+          { '日期': '1/6', '访问用户': 4593 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/ring/demo5/index.vue b/src/pages/demo/charts/list/ring/demo5/index.vue
new file mode 100644
index 00000000..cbcf7c70
--- /dev/null
+++ b/src/pages/demo/charts/list/ring/demo5/index.vue
@@ -0,0 +1,49 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">设置环图半径</template>
+    <div class="inner">
+      <ve-ring :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-ring>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      radius: [30, 100],
+      offsetY: 250
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393 },
+          { '日期': '1/2', '访问用户': 3530 },
+          { '日期': '1/3', '访问用户': 2923 },
+          { '日期': '1/4', '访问用户': 1723 },
+          { '日期': '1/5', '访问用户': 3792 },
+          { '日期': '1/6', '访问用户': 4593 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index 6ae6487f..3e2ed69a 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-9ab0a4c438087beeca12aa5d54dd50a2086378a6
\ No newline at end of file
+7eb3cd864713c8759bde7f4bc1e79f1e6a2051af
\ No newline at end of file