From b97b20778a1dd3930dd1069ad06750147c34a1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sun, 18 Feb 2018 18:19:29 +0800
Subject: [PATCH] no message

Former-commit-id: 951c6ce9b4a57f8c07c65586925030c9b9e94fa6
Former-commit-id: 87f333c6e517968c432408f84b1a0a546a739de7
Former-commit-id: 2cefb451e934f118b87cb05a2ba430aaecebce55
---
 src/mock/chart/G2Column.js | 10 +---------
 src/mock/chart/G2Line.js   | 26 +++++++-------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/mock/chart/G2Column.js b/src/mock/chart/G2Column.js
index 852d8228..8c4db93c 100644
--- a/src/mock/chart/G2Column.js
+++ b/src/mock/chart/G2Column.js
@@ -6,15 +6,7 @@ Mock.mock('/api/chart/G2Column', 'post', ({body, type, url}) => {
   switch (_body.type) {
     // 基础折线图
     case 'base': {
-      const year = ['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月']
-      const data = year.map(e => ({
-        year: e,
-        value: fn.r()
-      })).map(e => ({
-        x: e.year,
-        y: e.value
-      }))
-      return fn.returnMaker(data)
+      return fn.returnMaker(['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'].map(x => ({x, y: fn.r()})))
     }
     default:
       return {}
diff --git a/src/mock/chart/G2Line.js b/src/mock/chart/G2Line.js
index 365e56af..1b90771a 100644
--- a/src/mock/chart/G2Line.js
+++ b/src/mock/chart/G2Line.js
@@ -7,32 +7,20 @@ Mock.mock('/api/chart/G2Line', 'post', ({body, type, url}) => {
     // 基础折线图
     case 'base': {
       let last = 0
-      const year = ['1991', '1992', '1993', '1994', '1995', '1996', '1997', '1998', '1999']
-      const data = year.map(e => ({
-        year: e,
-        value: 0
+      const data = ['2010', '2011', '2012', '2013', '2014', '2015', '2016', '2017', '2018'].map(x => ({
+        x,
+        y: 0
       })).map(e => {
-        e.value = last + fn.r()
-        last = e.value
+        e.y = last + fn.r()
+        last = e.y
         return e
-      }).map(e => ({
-        x: e.year,
-        y: e.value
-      }))
+      })
       last = 0
       return fn.returnMaker(data)
     }
     // 阶梯折线图
     case 'step': {
-      const month = ['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月']
-      const data = month.map(e => ({
-        month: e,
-        value: fn.r()
-      })).map(e => ({
-        x: e.month,
-        y: e.value
-      }))
-      return fn.returnMaker(data)
+      return fn.returnMaker(['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'].map(x => ({x, y: fn.r()})))
     }
     default:
       return {}