diff --git a/js/mapTest.js b/js/mapArea.js similarity index 99% rename from js/mapTest.js rename to js/mapArea.js index b03ba30..b8a84c2 100644 --- a/js/mapTest.js +++ b/js/mapArea.js @@ -316,7 +316,7 @@ layui.define(function (exports) { ] }; - exports('mapTest', { + exports('mapArea', { option_a: option_a, option_b: option_b, option_c: option_c, diff --git a/pages/chart/map-area.html b/pages/chart/map-area.html index 8f41c00..81f4348 100644 --- a/pages/chart/map-area.html +++ b/pages/chart/map-area.html @@ -27,37 +27,22 @@
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
@@ -71,29 +56,24 @@ layui.config({ base: "../../js/" - }).use(["jquery", "okUtils", "mapTest", "echartsData"], function () { - var $ = layui.jquery, - mapTest = layui.mapTest, - okUtils = layui.okUtils, - echartsData = layui.echartsData; - echartsData.mapChina.series[0].data = echartsData.Address;//地图数据 + }).use(["okUtils", "mapArea"], function () { + let $ = layui.jquery; + let mapArea = layui.mapArea; + let okUtils = layui.okUtils; - var chinaData = echartsData.mapChina; - var option_a = mapTest.option_a; - var option_b = mapTest.option_b; - var option_c = mapTest.option_c; - var option_d = mapTest.option_d; + let option_a = mapArea.option_a; + let option_b = mapArea.option_b; + let option_c = mapArea.option_c; + let option_d = mapArea.option_d; - var china1 = echarts.init($('#china1')[0]); - var china_a = echarts.init($('#china_a')[0]); - 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]); - china1.setOption(chinaData); + let china_a = echarts.init($('#china_a')[0]); + let china_b = echarts.init($('#china_b')[0]); + let china_c = echarts.init($('#china_c')[0]); + let china_d = echarts.init($('#china_d')[0]); china_a.setOption(option_a); china_b.setOption(option_b); china_c.setOption(option_c); china_d.setOption(option_d); + okUtils.echartsResize([china_a, china_b, china_c, china_d]); });