From d53fe2390628caa2ac99424c6961dc6a92aa47ca Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Jul 2018 13:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

---
 _mock/_chart.ts |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/_mock/_chart.ts b/_mock/_chart.ts
index f59a20e..72c6a6f 100644
--- a/_mock/_chart.ts
+++ b/_mock/_chart.ts
@@ -112,7 +112,36 @@
 		y: 1231
 	}
 ];
-
+const salesTypeDataOnline2 = [
+	{
+		x: "PM2.5",
+		y: 220
+	},
+	{
+		x: "PM10",
+		y: 280
+	},
+	{
+		x: "������������",
+		y: 290
+	},
+	{
+		x: "������������",
+		y: 30
+	},
+	{
+		x: "������",
+		y: 98
+	},
+	{
+		x: '������������',
+		y: 99
+	},
+	{
+		x: "���������0.3",
+		y: 890
+	}
+];
 const salesTypeDataOffline = [
 	{
 		x: 'PM2.5',
@@ -220,6 +249,7 @@
         offlineChartData,
         salesTypeData,
         salesTypeDataOnline,
+        salesTypeDataOnline2,
         salesTypeDataOffline,
         radarData
     }),

--
Gitblit v1.8.0