From d3b18d7f6ef43ff055b2b22ae91b94251f480864 Mon Sep 17 00:00:00 2001 From: bobi Date: Sun, 25 Aug 2019 15:18:41 +0800 Subject: [PATCH] rename:chart --- data/navs.json | 14 +++++++------- js/{mapArea.js => chartArea.js} | 2 +- js/chartChina.js | 0 pages/chart/{map-area.html => chart-area.html} | 12 ++++++------ pages/chart/{map-china.html => chart-china.html} | 0 pages/chart/{map1.html => chart1.html} | 0 pages/chart/{map2.html => chart2.html} | 0 pages/chart/{map3.html => chart3.html} | 0 pages/chart/{map4.html => chart4.html} | 0 pages/chart/{map5.html => chart5.html} | 0 pages/chart/{map6.html => chart6.html} | 0 11 files changed, 14 insertions(+), 14 deletions(-) rename js/{mapArea.js => chartArea.js} (99%) create mode 100644 js/chartChina.js rename pages/chart/{map-area.html => chart-area.html} (90%) rename pages/chart/{map-china.html => chart-china.html} (100%) rename pages/chart/{map1.html => chart1.html} (100%) rename pages/chart/{map2.html => chart2.html} (100%) rename pages/chart/{map3.html => chart3.html} (100%) rename pages/chart/{map4.html => chart4.html} (100%) rename pages/chart/{map5.html => chart5.html} (100%) rename pages/chart/{map6.html => chart6.html} (100%) diff --git a/data/navs.json b/data/navs.json index afc79de..c4cc434 100644 --- a/data/navs.json +++ b/data/navs.json @@ -63,13 +63,13 @@ "children": [ { "title": "中国地图", - "href": "pages/chart/map-china.html", + "href": "pages/chart/chart-china.html", "icon": "", "spread": false }, { "title": "区域地图", - "href": "pages/chart/map-area.html", + "href": "pages/chart/chart-area.html", "icon": "", "spread": false } @@ -83,31 +83,31 @@ "children": [ { "title": "统计图", - "href": "pages/chart/map1.html", + "href": "pages/chart/chart1.html", "icon": "", "spread": false }, { "title": "折线图", - "href": "pages/chart/map2.html", + "href": "pages/chart/chart2.html", "icon": "", "spread": false }, { "title": "馅饼图", - "href": "pages/chart/map4.html", + "href": "pages/chart/chart4.html", "icon": "", "spread": false }, { "title": "圆形图", - "href": "pages/chart/map5.html", + "href": "pages/chart/chart5.html", "icon": "", "spread": false }, { "title": "指数图", - "href": "pages/chart/map6.html", + "href": "pages/chart/chart6.html", "icon": "", "spread": false } diff --git a/js/mapArea.js b/js/chartArea.js similarity index 99% rename from js/mapArea.js rename to js/chartArea.js index b8a84c2..ba40c0f 100644 --- a/js/mapArea.js +++ b/js/chartArea.js @@ -316,7 +316,7 @@ layui.define(function (exports) { ] }; - exports('mapArea', { + exports('chartArea', { option_a: option_a, option_b: option_b, option_c: option_c, diff --git a/js/chartChina.js b/js/chartChina.js new file mode 100644 index 0000000..e69de29 diff --git a/pages/chart/map-area.html b/pages/chart/chart-area.html similarity index 90% rename from pages/chart/map-area.html rename to pages/chart/chart-area.html index 81f4348..646eccc 100644 --- a/pages/chart/map-area.html +++ b/pages/chart/chart-area.html @@ -56,15 +56,15 @@ layui.config({ base: "../../js/" - }).use(["okUtils", "mapArea"], function () { + }).use(["okUtils", "chartArea"], function () { let $ = layui.jquery; - let mapArea = layui.mapArea; + let chartArea = layui.chartArea; let okUtils = layui.okUtils; - let option_a = mapArea.option_a; - let option_b = mapArea.option_b; - let option_c = mapArea.option_c; - let option_d = mapArea.option_d; + let option_a = chartArea.option_a; + let option_b = chartArea.option_b; + let option_c = chartArea.option_c; + let option_d = chartArea.option_d; let china_a = echarts.init($('#china_a')[0]); let china_b = echarts.init($('#china_b')[0]); diff --git a/pages/chart/map-china.html b/pages/chart/chart-china.html similarity index 100% rename from pages/chart/map-china.html rename to pages/chart/chart-china.html diff --git a/pages/chart/map1.html b/pages/chart/chart1.html similarity index 100% rename from pages/chart/map1.html rename to pages/chart/chart1.html diff --git a/pages/chart/map2.html b/pages/chart/chart2.html similarity index 100% rename from pages/chart/map2.html rename to pages/chart/chart2.html diff --git a/pages/chart/map3.html b/pages/chart/chart3.html similarity index 100% rename from pages/chart/map3.html rename to pages/chart/chart3.html diff --git a/pages/chart/map4.html b/pages/chart/chart4.html similarity index 100% rename from pages/chart/map4.html rename to pages/chart/chart4.html diff --git a/pages/chart/map5.html b/pages/chart/chart5.html similarity index 100% rename from pages/chart/map5.html rename to pages/chart/chart5.html diff --git a/pages/chart/map6.html b/pages/chart/chart6.html similarity index 100% rename from pages/chart/map6.html rename to pages/chart/chart6.html