From ad06c4e27fea1966fccf47de9157e8fa0b9ee54f Mon Sep 17 00:00:00 2001 From: bobi Date: Sat, 24 Aug 2019 23:27:51 +0800 Subject: [PATCH] fixed:echartsResize --- js/console.js | 4 +-- js/console1.js | 53 +++++++++++++++++++++++++++ js/home2.js | 57 ------------------------------ lib/layui/lay/okmodules/okUtils.js | 5 ++- pages/console1.html | 2 +- 5 files changed, 60 insertions(+), 61 deletions(-) create mode 100644 js/console1.js delete mode 100644 js/home2.js diff --git a/js/console.js b/js/console.js index 158661a..5e88972 100644 --- a/js/console.js +++ b/js/console.js @@ -74,7 +74,7 @@ layui.use(useModel, function () { function userSource() { var userSourceMap = echarts.init($("#userSourceMap")[0], "mytheme"); userSourceMap.setOption(userSourceOption); - okUtils.echartsResize(userSourceMap); + okUtils.echartsResize([userSourceMap]); } /** @@ -149,7 +149,7 @@ layui.use(useModel, function () { var data = [{"name":"北京","value":100},{"name":"天津","value":83},{"name":"上海","value":113},{"name":"重庆","value":188},{"name":"河北","value":197},{"name":"河南","value":327},{"name":"云南","value":371},{"name":"辽宁","value":224},{"name":"黑龙江","value":295},{"name":"湖南","value":463},{"name":"安徽","value":7},{"name":"山东","value":176},{"name":"新疆","value":0},{"name":"江苏","value":396},{"name":"浙江","value":472},{"name":"江西","value":243},{"name":"湖北","value":226},{"name":"广西","value":404},{"name":"甘肃","value":210},{"name":"山西","value":451},{"name":"内蒙古","value":97},{"name":"陕西","value":369},{"name":"吉林","value":221},{"name":"福建","value":216},{"name":"贵州","value":221},{"name":"广东","value":85},{"name":"青海","value":21},{"name":"西藏","value":414},{"name":"四川","value":380},{"name":"宁夏","value":205},{"name":"海南","value":73},{"name":"台湾","value":348},{"name":"香港","value":54},{"name":"澳门","value":340}]; userLocationOption.series.data = data; userLocationMap.setOption(userLocationOption); - okUtils.echartsResize(userLocationMap); + okUtils.echartsResize([userLocationMap]); } statText(); diff --git a/js/console1.js b/js/console1.js new file mode 100644 index 0000000..b3478fd --- /dev/null +++ b/js/console1.js @@ -0,0 +1,53 @@ +"use strict"; +var useModel = ["form", "okUtils", "table", "laytpl", "laydate", "element", "jquery", "countUp", "home2Data"];//需要引入的模块 +layui.config({ + base: "../js/" +}).use(useModel, function () { + var $form = layui.form, + countUp = layui.countUp, + laydate = layui.laydate, + element = layui.element, + table = layui.table, + okUtils = layui.okUtils, + $ = layui.jquery, + laytpl = layui.laytpl; + /**静态数据**/ + var echartsData = layui.home2Data; + init(); + + function init() { + /**今日访问量**/ + var elem_nums = $(".media-cont .num"); + elem_nums.each(function (i, j) { + let ran = parseInt(Math.random() * 1900 + 100); //[100,2000)包括100不包括2000 + !new countUp({ + target: j, + endVal: ran + }).start(); + }); + + /**4个图表**/ + var echIncome = echarts.init($("#echIncome")[0]); + var echGoods = echarts.init($('#echGoods')[0]); + var echBlogs = echarts.init($("#echBlogs")[0]); + var echUser = echarts.init($('#echUser')[0]); + okUtils.echartsResize([echIncome, echGoods, echBlogs, echUser]); + + echIncome.setOption(echartsData.income);//数据图 + echGoods.setOption(echartsData.goods);//数据图 + echBlogs.setOption(echartsData.blogs);//数据图 + echUser.setOption(echartsData.user);//数据图 + + //用户活跃量,用户访问来源 + 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]); + + echOne.setOption(echartsData.echOne);//数据图 + echTwo.setOption(echartsData.echTwo);//数据图 + mapThree.setOption(echartsData.mapThree);//数据图 + } +}); + + diff --git a/js/home2.js b/js/home2.js deleted file mode 100644 index 095b773..0000000 --- a/js/home2.js +++ /dev/null @@ -1,57 +0,0 @@ -"use strict"; -var useModel = ["form", "okUtils", "table", "laytpl", "laydate", - "element", "jquery", "countUp", "home2Data"];//需要引入的模块 -layui.config({ - base: "../js/" -}).use(useModel, function () { - var $form = layui.form, - countUp = layui.countUp, - laydate = layui.laydate, - element = layui.element, - table = layui.table, - okUtils = layui.okUtils, - $ = layui.jquery, - laytpl = layui.laytpl; - /**静态数据**/ - var echartsData = layui.home2Data; - init(); - - function init() { - /**今日访问量**/ - var elem_nums = $(".media-cont .num"); - elem_nums.each(function (i, j) { - let ran = parseInt(Math.random() * 1900 + 100); //[100,2000)包括100不包括2000 - !new countUp({ - target: j, - endVal: ran - }).start(); - }); - - /**4个图表**/ - var echIncome = echarts.init($("#echIncome")[0]); - var echGoods = echarts.init($('#echGoods')[0]); - var echBlogs = echarts.init($("#echBlogs")[0]); - var echUser = echarts.init($('#echUser')[0]); - okUtils.echartsResize([echIncome, echGoods, echBlogs, echUser]); - - echIncome.setOption(echartsData.income);//数据图 - echGoods.setOption(echartsData.goods);//数据图 - echBlogs.setOption(echartsData.blogs);//数据图 - echUser.setOption(echartsData.user);//数据图 - - //用户活跃量,用户访问来源 - 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]); - - echOne.setOption(echartsData.echOne);//数据图 - echTwo.setOption(echartsData.echTwo);//数据图 - mapThree.setOption(echartsData.mapThree);//数据图 - - - } - -}); - - diff --git a/lib/layui/lay/okmodules/okUtils.js b/lib/layui/lay/okmodules/okUtils.js index da17498..0781b0b 100644 --- a/lib/layui/lay/okmodules/okUtils.js +++ b/lib/layui/lay/okmodules/okUtils.js @@ -20,10 +20,13 @@ layui.define(["layer"], function (exprots) { * 主要用于对ECharts视图自动适应宽度 */ echartsResize: function (element) { + var element = element || []; window.addEventListener("resize", function () { var isResize = localStorage.getItem("isResize"); if (isResize == "false") { - element.resize(); + for (var i = 0; i < element.length; i++) { + element[i].resize(); + } } }); }, diff --git a/pages/console1.html b/pages/console1.html index 5ea20a4..47e9ccb 100644 --- a/pages/console1.html +++ b/pages/console1.html @@ -122,7 +122,7 @@ - +