From 6ba2b83189b72966459bbac1b18ebb8399816172 Mon Sep 17 00:00:00 2001
From: zhizou <jl199508026@163.com>
Date: Thu, 18 Jul 2019 10:58:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/home.js                         |  2 +-
 js/home2.js                        |  4 ++--
 js/home2Data.js                    | 16 ++++++++--------
 lib/layui/lay/okmodules/okUtils.js |  3 ++-
 pages/echarts/mapchina.html        |  2 +-
 pages/echarts/mapchina2.html       |  8 ++++----
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/js/home.js b/js/home.js
index 1dccd18..971bcff 100644
--- a/js/home.js
+++ b/js/home.js
@@ -30,7 +30,7 @@ layui.config({
     /**图表**/
     var mapTree = echarts.init($("#mapOne")[0], "mytheme");
     var mapChina = echarts.init($('#mapChina')[0]);
-    okUtils.echartsResize(mapTree, mapChina);
+    okUtils.echartsResize([mapTree, mapChina]);
     
     mapTree.setOption(echartsData.mapTree);//数据图
     
diff --git a/js/home2.js b/js/home2.js
index 1786206..2f735ea 100644
--- a/js/home2.js
+++ b/js/home2.js
@@ -32,7 +32,7 @@ layui.config({
     var echGoods = echarts.init($('#echGoods')[0]);
     var echBlogs = echarts.init($("#echBlogs")[0]);
     var echUser = echarts.init($('#echUser')[0]);
-    okUtils.echartsResize(echIncome, echGoods, echBlogs, echUser);
+    okUtils.echartsResize([echIncome, echGoods, echBlogs, echUser]);
     
     echIncome.setOption(echartsData.income);//数据图
     echGoods.setOption(echartsData.goods);//数据图
@@ -43,7 +43,7 @@ layui.config({
     var echOne = echarts.init($("#echOne")[0], "themez");
     var echTwo = echarts.init($("#echTwo")[0], "themez");
     var mapThree = echarts.init($("#mapThree")[0], "themez");
-    okUtils.echartsResize(echOne, echTwo, mapThree);
+    okUtils.echartsResize([echOne, echTwo, mapThree]);
     
     echOne.setOption(echartsData.echOne);//数据图
     echTwo.setOption(echartsData.echTwo);//数据图
diff --git a/js/home2Data.js b/js/home2Data.js
index 6af49af..feca93c 100644
--- a/js/home2Data.js
+++ b/js/home2Data.js
@@ -5,7 +5,7 @@ function randomData() {
 function ecchartData(color) {
   color = color || "#00c292";
   return {
-    color,
+    color:color,
     toolbox: {
       show: false,
       feature: {
@@ -206,13 +206,13 @@ layui.define(function (exports) {
   var user = ecchartData("#fb9678");
   
   exports('home2Data', {
-    income,
-    goods,
-    blogs,
-    user,
-    echOne,
-    echTwo,
-    mapThree,
+    income:income,
+    goods:goods,
+    blogs:blogs,
+    user:user,
+    echOne:echOne,
+    echTwo:echTwo,
+    mapThree:mapThree,
   });
 });
 
diff --git a/lib/layui/lay/okmodules/okUtils.js b/lib/layui/lay/okmodules/okUtils.js
index 0dd0bd0..ec475d0 100644
--- a/lib/layui/lay/okmodules/okUtils.js
+++ b/lib/layui/lay/okmodules/okUtils.js
@@ -7,12 +7,13 @@ layui.define(["jquery"], function (exprots) {
     echartsResize: function(elemnt) {
       /*
       * 主要用于对echart视图自动适应宽度
-      * elemnt:可变参数
       * eg:
       * var mapTree = echarts.init($("#mapOne")[0], "mytheme");
       * var mapTree2 = echarts.init($("#mapOne")[0], "mytheme");
       * resize(mapTree,mapTree2);
       * */
+      /*console.log(arguments[0]);
+      console.log(elemnt);*/
       elemnt = elemnt || [];
       window.addEventListener("resize", function(){
         for (var i = 0; i < elemnt.length; i++) {
diff --git a/pages/echarts/mapchina.html b/pages/echarts/mapchina.html
index 96c607a..d4e693e 100644
--- a/pages/echarts/mapchina.html
+++ b/pages/echarts/mapchina.html
@@ -89,7 +89,7 @@
     var china_b = echarts.init($('#china_b')[0]);
     var china_c = echarts.init($('#china_c')[0]);
     var china_d = echarts.init($('#china_d')[0]);
-    okUtils.echartsResize(china1, china_a, china_b, china_c, china_d);
+    okUtils.echartsResize([china1, china_a, china_b, china_c, china_d]);
     china1.setOption(chinaData);
     china_a.setOption(option_a);
     china_b.setOption(option_b);
diff --git a/pages/echarts/mapchina2.html b/pages/echarts/mapchina2.html
index 6b6febb..b1628e3 100644
--- a/pages/echarts/mapchina2.html
+++ b/pages/echarts/mapchina2.html
@@ -84,7 +84,7 @@
       let chinaTemp = JSON.parse(JSON.stringify(chinaData));
       let china1 = echarts.init($('#china1')[0]);
       china1.setOption(chinaTemp);
-      okUtils.echartsResize(china1);
+      okUtils.echartsResize([china1]);
     }
 
     function china2() {
@@ -92,14 +92,14 @@
       chinaTemp.visualMap.show = false;//不显示数据条
       let china1 = echarts.init($('#china2')[0]);
       china1.setOption(chinaTemp);
-      okUtils.echartsResize(china1);
+      okUtils.echartsResize([china1]);
     }
 
     function china3() {
       let chinaTemp = echartsData.mapChina3;
       let china1 = echarts.init($('#china3')[0]);
       china1.setOption(chinaTemp);
-      okUtils.echartsResize(china1);
+      okUtils.echartsResize([china1]);
     }
 
     function china4() {
@@ -107,7 +107,7 @@
       chinaTemp.visualMap.show = false;//不显示数据条
       let china1 = echarts.init($('#china4')[0]);
       china1.setOption(chinaTemp);
-      okUtils.echartsResize(china1);
+      okUtils.echartsResize([china1]);
     }