From 98f1aa4fd93aeb07ea2e0e941dfb718527390b2c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 27 Jun 2018 11:15:44 +0800
Subject: [PATCH] no message

Former-commit-id: db4f84a7c4d5be3a05bbe471319848ea82a3470e [formerly db4f84a7c4d5be3a05bbe471319848ea82a3470e [formerly db4f84a7c4d5be3a05bbe471319848ea82a3470e [formerly db4f84a7c4d5be3a05bbe471319848ea82a3470e [formerly 5c59272022b24d204659f746774dfb20865e659a [formerly 798abf46236e5c735cbf958bc21aea8e54b8212e]]]]]
Former-commit-id: 1a173665a00a4330bf01ba7769149d7d28390ebd
Former-commit-id: 43b1a7ba72db9c80e01427688ebf1c3e58a25438
Former-commit-id: 162274af963ac1adc3bb2c2762c009f757c786b9 [formerly 4158313593d0a230809cc17642b8c44a178c8156]
Former-commit-id: 4aa8ead25066d265625450e8ab5c771e922b0f2d
Former-commit-id: b137b0c922cbbfdb53a4cada2b4c77b7e9430ad3
Former-commit-id: 640665f8df4a8356cad8a15477fbdd28c66384d6
Former-commit-id: 469c822927998dbffa0bd669eec419122efce148
Former-commit-id: 077870d678a65c921946c7dc28b89c85751ff808
---
 src/menu/index.js                             | 11 ++++
 .../demo/charts/list/bar/demo1/index.vue      | 45 ++++++++++++++++
 .../demo/charts/list/bar/demo2/index.vue      | 49 +++++++++++++++++
 .../demo/charts/list/bar/demo3/index.vue      | 52 +++++++++++++++++++
 .../demo/charts/list/bar/demo4/index.vue      | 50 ++++++++++++++++++
 .../demo/charts/list/bar/demo5/index.vue      | 48 +++++++++++++++++
 .../charts/list/histogram/demo1/index.vue     |  2 +-
 .../demo/charts/list/line/demo1/index.vue     |  2 +-
 src/router/index.js.REMOVED.git-id            |  2 +-
 9 files changed, 258 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/charts/list/bar/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/bar/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/bar/demo3/index.vue
 create mode 100644 src/pages/demo/charts/list/bar/demo4/index.vue
 create mode 100644 src/pages/demo/charts/list/bar/demo5/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index 73df245a..58479f05 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -149,6 +149,17 @@ const demoCharts = {
             { path: `${pre}list/histogram/demo5`, title: '默认显示柱状图数据' },
             { path: `${pre}list/histogram/demo6`, title: '横轴为连续的数值轴' }
           ]
+        },
+        {
+          path: `${pre}list/bar`,
+          title: '条形图',
+          children: [
+            { path: `${pre}list/bar/demo1`, title: '一般' },
+            { path: `${pre}list/bar/demo2`, title: '指定指标维度' },
+            { path: `${pre}list/bar/demo3`, title: '排序条形图' },
+            { path: `${pre}list/bar/demo4`, title: '堆叠条形图' },
+            { path: `${pre}list/bar/demo5`, title: '纵轴为连续的数值轴' }
+          ]
         }
       ]
     }
diff --git a/src/pages/demo/charts/list/bar/demo1/index.vue b/src/pages/demo/charts/list/bar/demo1/index.vue
new file mode 100644
index 00000000..fa5cfcf0
--- /dev/null
+++ b/src/pages/demo/charts/list/bar/demo1/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-bar :data="chartData" v-bind="pubSetting"></ve-bar>
+    </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, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</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/bar/demo2/index.vue b/src/pages/demo/charts/list/bar/demo2/index.vue
new file mode 100644
index 00000000..79cc7cff
--- /dev/null
+++ b/src/pages/demo/charts/list/bar/demo2/index.vue
@@ -0,0 +1,49 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">指定指标维度</template>
+    <div class="inner">
+      <ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
+    </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, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</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/bar/demo3/index.vue b/src/pages/demo/charts/list/bar/demo3/index.vue
new file mode 100644
index 00000000..861c1e89
--- /dev/null
+++ b/src/pages/demo/charts/list/bar/demo3/index.vue
@@ -0,0 +1,52 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">排序条形图</template>
+    <div class="inner">
+      <ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
+    </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 = {
+      metrics: ['访问用户'],
+      dataOrder: {
+        label: '访问用户',
+        order: 'desc'
+      }
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</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/bar/demo4/index.vue b/src/pages/demo/charts/list/bar/demo4/index.vue
new file mode 100644
index 00000000..af1e1cfa
--- /dev/null
+++ b/src/pages/demo/charts/list/bar/demo4/index.vue
@@ -0,0 +1,50 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">堆叠条形图</template>
+    <div class="inner">
+      <ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
+    </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 =  {
+      stack: {
+        'xxx': ['访问用户', '下单用户']
+      }
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</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/bar/demo5/index.vue b/src/pages/demo/charts/list/bar/demo5/index.vue
new file mode 100644
index 00000000..275de283
--- /dev/null
+++ b/src/pages/demo/charts/list/bar/demo5/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">纵轴为连续的数值轴</template>
+    <div class="inner">
+      <ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
+    </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 = {
+      yAxisType: 'value'
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户'],
+        rows: [
+          { '日期': 1, '访问用户': 1393 },
+          { '日期': 2, '访问用户': 3530 },
+          { '日期': 5, '访问用户': 2923 },
+          { '日期': 10, '访问用户': 1723 },
+          { '日期': 15, '访问用户': 3792 },
+          { '日期': 36, '访问用户': 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/histogram/demo1/index.vue b/src/pages/demo/charts/list/histogram/demo1/index.vue
index b33f2309..b2b7215e 100644
--- a/src/pages/demo/charts/list/histogram/demo1/index.vue
+++ b/src/pages/demo/charts/list/histogram/demo1/index.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container type="full">
-    <template slot="header">示例</template>
+    <template slot="header">一般</template>
     <div class="inner">
       <ve-histogram :data="chartData" v-bind="pubSetting"></ve-histogram>
     </div>
diff --git a/src/pages/demo/charts/list/line/demo1/index.vue b/src/pages/demo/charts/list/line/demo1/index.vue
index 80ed2854..0c3b282a 100644
--- a/src/pages/demo/charts/list/line/demo1/index.vue
+++ b/src/pages/demo/charts/list/line/demo1/index.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container type="full">
-    <template slot="header">示例</template>
+    <template slot="header">一般</template>
     <div class="inner">
       <ve-line :data="chartData" v-bind="pubSetting"></ve-line>
     </div>
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index 519773bf..eea53fb1 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-b88fea69da2540d699da2fb35dc84ba4434bee74
\ No newline at end of file
+f3726e2cebb4b51db3760164df947dcfe8b94092
\ No newline at end of file