地图demo

9 years ago · 90704a0de3
21 changed files with 931 additions and 13 deletions
--- a/plugin-echarts.iml
+++ b/plugin-echarts.iml
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$USER_HOME$/Documents/finereport/env/8.0/WebReport/WEB-INF/classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module" module-name="base" />
+    <orderEntry type="module" module-name="base-basic" />
+    <orderEntry type="module" module-name="base-calculate" />
+    <orderEntry type="module" module-name="base-data" />
+    <orderEntry type="module" module-name="base-file" />
+    <orderEntry type="module" module-name="base-performance" />
+    <orderEntry type="module" module-name="base-stable" />
+    <orderEntry type="module" module-name="chart-base" />
+    <orderEntry type="module" module-name="chart-chartattr" />
+    <orderEntry type="module" module-name="chart-chartdata" />
+    <orderEntry type="module" module-name="chart-chartglyph" />
+    <orderEntry type="module" module-name="chart-web" />
+    <orderEntry type="module" module-name="designer" />
+    <orderEntry type="module" module-name="designer_base" />
+    <orderEntry type="module" module-name="designer_chart" />
+    <orderEntry type="module" module-name="designer_feedback" />
+    <orderEntry type="module" module-name="designer_form" />
+    <orderEntry type="module" module-name="engine" />
+    <orderEntry type="module" module-name="engine-page" />
+    <orderEntry type="module" module-name="engine-remote" />
+    <orderEntry type="module" module-name="engine-view" />
+    <orderEntry type="module" module-name="engine-write" />
+    <orderEntry type="module" module-name="form" />
+  </component>
+</module>
--- a/plugin.xml
+++ b/plugin.xml
@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
-    <id>com.fr.plugin.solution.chart.echarts</id>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<plugin>
+    <id>com.fr.solution.plugin.chart.echarts</id>
    <name><![CDATA[ECharts图表]]></name>
    <active>yes</active>
    <version>1.1</version>
@ -11,17 +12,19 @@
        <p>[2016-01-01]中国地图</p>
    ]]></change-notes>
    <extra-core>
-        <LocaleFinder class="com.fr.solution.plugin.chart.echarts.EChartsFileLoader"/>
+        <LocaleFinder class="com.fr.solution.plugin.chart.echarts.EChartsLocaleFinder"/>
        <JavaScriptFileHandler class="com.fr.solution.plugin.chart.echarts.EChartsFileLoader"/>
    </extra-core>
    <extra-report/>
    <extra-designer/>
    <extra-platform/>
    <extra-chart>
-        <IndependentChartProvider class="com.fr.solution.plugin.chart.echarts.ui.map.ChinaMapChartUI" plotID="ChineseMapPlot"/>
+        <IndependentChartProvider class="com.fr.solution.plugin.chart.echarts.ChineseMap"
+                                  plotID="EChartsChinaMapPlot"/>
    </extra-chart>

    <extra-chart-designer>
-        <IndependentChartUIProvider class="com.fr.solution.plugin.chart.chinesemap.ChineseMapUI" plotID="ChineseMapPlot"/>
+        <IndependentChartUIProvider class="com.fr.solution.plugin.chart.echarts.ChineseMapUI"
+                                    plotID="EChartsChinaMapPlot"/>
    </extra-chart-designer>
 </plugin>
--- a/src/com/fr/solution/plugin/chart/echarts/ChineseMap.java
+++ b/src/com/fr/solution/plugin/chart/echarts/ChineseMap.java
@ -0,0 +1,46 @@
+package com.fr.solution.plugin.chart.echarts;
+
+import com.fr.chart.chartattr.Chart;
+import com.fr.general.Inter;
+import com.fr.solution.plugin.chart.echarts.base.AbstractIndependentEChartsProvider;
+import com.fr.solution.plugin.chart.echarts.base.ECharts;
+import com.fr.solution.plugin.chart.echarts.core.map.ChineseMapPlot;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChineseMap extends AbstractIndependentEChartsProvider {
+
+    private static Chart[] createChineseMap(String imagePath) {
+        ChineseMapPlot plot = new ChineseMapPlot();
+        ECharts chart = new ECharts(plot);
+        chart.setChartImagePath(imagePath);
+        return new ECharts[]{chart};
+    }
+
+    @Override
+    public String getChartName() {
+        return "Plugin-ECharts_Chinese_Map";
+    }
+
+    @Override
+    public String getChartUseName() {
+        return Inter.getLocText("Plugin-ECharts_Chinese_Map");
+    }
+
+    @Override
+    public Chart[] getChartTypes() {
+        return createChineseMap(getChartImagePath());
+    }
+
+    @Override
+    public String getChartImagePath() {
+        return "com/fr/solution/plugin/chart/echarts/images/map/map256.png";
+    }
+
+    @Override
+    public String getWrapperName() {
+        return "EChartsFactory";
+    }
+
+}
--- a/src/com/fr/solution/plugin/chart/echarts/ui/map/ChinaMapChartUI.java
+++ b/src/com/fr/solution/plugin/chart/echarts/ui/map/ChinaMapChartUI.java
@ -1,4 +1,4 @@
-package com.fr.solution.plugin.chart.echarts.ui.map;
+package com.fr.solution.plugin.chart.echarts;

 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.fun.impl.AbstractIndependentChartUI;
@ -6,28 +6,36 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.solution.plugin.chart.echarts.core.map.ChineseMapReportDataContentPane;
+import com.fr.solution.plugin.chart.echarts.core.map.ChineseMapTableDataContentPane;
+import com.fr.solution.plugin.chart.echarts.ui.map.ChineseChartTypePane;

 /**
 * Created by richie on 16/1/29.
 */
-public class ChinaMapChartUI extends AbstractIndependentChartUI  {
+public class ChineseMapUI extends AbstractIndependentChartUI  {
    @Override
    public AbstractChartTypePane getPlotTypePane() {
-        return null;
+        return new ChineseChartTypePane();
    }

    @Override
    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
-        return null;
+        return new ChineseMapTableDataContentPane(parent);
    }

    @Override
    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
-        return null;
+        return new ChineseMapReportDataContentPane(parent);
    }

    @Override
    public String getIconPath() {
-        return null;
+        return "com/fr/solution/plugin/chart/echarts/images/map/chinese.png";
+    }
+
+    @Override
+    public boolean isUseDefaultPane() {
+        return false;
    }
 }
--- a/src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java
+++ b/src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java
@ -1,5 +1,6 @@
 package com.fr.solution.plugin.chart.echarts;

+import com.fr.stable.EncodeConstants;
 import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler;

 /**
@ -9,7 +10,12 @@ public class EChartsFileLoader extends AbstractJavaScriptFileHandler {
    @Override
    public String[] pathsForFiles() {
        return new String[]{
-                "/com/fr/solution/plugin/chart/echarts/web/lib/echarts.min.js"
+                "/com/fr/solution/plugin/chart/echarts/web/lib/echarts-all.js"
        };
    }
+
+    @Override
+    public String encode() {
+        return EncodeConstants.ENCODING_UTF_8;
+    }
 }
--- a/src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java
+++ b/src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java
@ -8,6 +8,6 @@ import com.fr.stable.fun.impl.AbstractLocaleFinder;
 public class EChartsLocaleFinder extends AbstractLocaleFinder {
    @Override
    public String find() {
-        return "/com/fr/solution/plugin/chart/echarts/locale/echarts";
+        return "com/fr/solution/plugin/chart/echarts/locale/echarts";
    }
 }
--- a/src/com/fr/solution/plugin/chart/echarts/base/AbstractIndependentEChartsProvider.java
+++ b/src/com/fr/solution/plugin/chart/echarts/base/AbstractIndependentEChartsProvider.java
@ -0,0 +1,16 @@
+package com.fr.solution.plugin.chart.echarts.base;
+
+import com.fr.chart.fun.impl.AbstractIndependentChartProvider;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public abstract class AbstractIndependentEChartsProvider extends AbstractIndependentChartProvider {
+
+    @Override
+    public String[] getRequiredJS() {
+        return new String[]{
+                "/com/fr/solution/plugin/chart/echarts/web/echarts.bridge.js"
+        };
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/base/ECharts.java
+++ b/src/com/fr/solution/plugin/chart/echarts/base/ECharts.java
@ -0,0 +1,26 @@
+package com.fr.solution.plugin.chart.echarts.base;
+
+import com.fr.base.chart.BaseChartGlyph;
+import com.fr.base.chart.chartdata.ChartData;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.Plot;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ECharts extends Chart {
+
+    public ECharts() {
+        setWrapperName("EChartsFactory");
+    }
+
+    public ECharts(Plot plot) {
+        setPlot(plot);
+        setWrapperName("EChartsFactory");
+    }
+
+    @Override
+    public BaseChartGlyph createGlyph(ChartData chartData) {
+        return super.createGlyph(chartData);
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/base/EChartsGlyph.java
+++ b/src/com/fr/solution/plugin/chart/echarts/base/EChartsGlyph.java
@ -0,0 +1,17 @@
+package com.fr.solution.plugin.chart.echarts.base;
+
+import com.fr.chart.chartglyph.ChartGlyph;
+import com.fr.json.JSONException;
+import com.fr.json.JSONObject;
+import com.fr.stable.web.Repository;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class EChartsGlyph extends ChartGlyph {
+
+    @Override
+    public JSONObject toJSONObject(Repository repo) throws JSONException {
+        return new JSONObject();
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapFunctionProcessor.java
+++ b/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapFunctionProcessor.java
@ -0,0 +1,22 @@
+package com.fr.solution.plugin.chart.echarts.core.map;
+
+import com.fr.general.Inter;
+import com.fr.stable.fun.FunctionHelper;
+import com.fr.stable.fun.impl.AbstractFunctionProcessor;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChineseMapFunctionProcessor extends AbstractFunctionProcessor {
+
+
+    @Override
+    public int getId() {
+        return FunctionHelper.generateFunctionID("com.fr.solution.plugin.chart.echarts");
+    }
+
+    @Override
+    public String toString() {
+        return Inter.getLocText("Plugin-ECharts_Chinese_Map");
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlot.java
+++ b/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlot.java
@ -0,0 +1,51 @@
+package com.fr.solution.plugin.chart.echarts.core.map;
+
+import com.fr.base.chart.chartdata.ChartData;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartdata.NormalChartData;
+import com.fr.chart.chartglyph.PlotGlyph;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.Inter;
+import com.fr.stable.fun.FunctionProcessor;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChineseMapPlot extends Plot {
+
+    @Override
+    public PlotGlyph createPlotGlyph(ChartData chartData) {
+        PlotGlyph glyph = new ChineseMapPlotGlyph();
+        install4PlotGlyph(glyph, chartData);
+        return glyph;
+    }
+
+    @Override
+    public String getPlotID() {
+        return "EChartsChinaMapPlot";
+    }
+
+    @Override
+    public boolean matchPlotType(Plot newPlot) {
+        return newPlot instanceof ChineseMapPlot;
+    }
+
+    @Override
+    public ChartData defaultChartData() {
+        return new NormalChartData();
+    }
+
+    @Override
+    public FunctionProcessor getFunctionToRecord() {
+        return FunctionProcessor.EMAIL;
+    }
+
+    public boolean accept(Class<? extends Plot> obClass) {
+        return ComparatorUtils.equals(ChineseMapPlot.class, obClass);
+    }
+
+    @Override
+    public String getPlotName() {
+        return Inter.getLocText("Plugin-ECharts_Chinese_Map");
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlotGlyph.java
+++ b/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlotGlyph.java
@ -0,0 +1,28 @@
+package com.fr.solution.plugin.chart.echarts.core.map;
+
+import com.fr.chart.chartglyph.PlotGlyph;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChineseMapPlotGlyph extends PlotGlyph {
+    @Override
+    public void layoutAxisGlyph(int resolution) {
+
+    }
+
+    @Override
+    public void layoutDataSeriesGlyph(int resolution) {
+
+    }
+
+    @Override
+    public String getPlotGlyphType() {
+        return "ChineseMapPlotGlyph";
+    }
+
+    @Override
+    public String getChartType() {
+        return "ChineseMap";
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapReportDataContentPane.java
+++ b/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapReportDataContentPane.java
@ -0,0 +1,15 @@
+package com.fr.solution.plugin.chart.echarts.core.map;
+
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotMoreCateReportDataContentPane;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChineseMapReportDataContentPane extends CategoryPlotMoreCateReportDataContentPane {
+
+    public ChineseMapReportDataContentPane(ChartDataPane parent) {
+        super(parent);
+    }
+
+}
--- a/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapTableDataContentPane.java
+++ b/src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapTableDataContentPane.java
@ -0,0 +1,14 @@
+package com.fr.solution.plugin.chart.echarts.core.map;
+
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDataContentPane;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChineseMapTableDataContentPane extends CategoryPlotMoreCateTableDataContentPane {
+
+    public ChineseMapTableDataContentPane(ChartDataPane parent) {
+        super(parent);
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/images/map/chinese.png
+++ b/src/com/fr/solution/plugin/chart/echarts/images/map/chinese.png
--- a/src/com/fr/solution/plugin/chart/echarts/images/map/map256.png
+++ b/src/com/fr/solution/plugin/chart/echarts/images/map/map256.png
--- a/src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties
+++ b/src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties
@ -0,0 +1 @@
+Plugin-ECharts_Chinese_Map=Chinese Map
--- a/src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties
+++ b/src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties
@ -0,0 +1 @@
+Plugin-ECharts_Chinese_Map=\u4E2D\u56FD\u5730\u56FE
--- a/src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseChartTypePane.java
+++ b/src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseChartTypePane.java
@ -0,0 +1,35 @@
+package com.fr.solution.plugin.chart.echarts.ui.map;
+
+import com.fr.chart.chartattr.Chart;
+import com.fr.design.mainframe.chart.gui.type.UserDefinedChartTypePane;
+import com.fr.general.Inter;
+import com.fr.solution.plugin.chart.echarts.core.map.ChineseMapPlot;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChineseChartTypePane extends UserDefinedChartTypePane {
+    /**
+     * 弹出框的标题
+     *
+     * @return 弹出框的标题
+     */
+    public String title4PopupWindow() {
+        return Inter.getLocText("Plugin-ECharts_Chinese_Map");
+    }
+
+    public void updateBean(Chart chart) {
+        if (chart != null) {
+            chart.setPlot(new ChineseMapPlot());
+        }
+    }
+
+    /**
+     * 界面是否接受
+     * @param ob 对象是否为chart
+     * @return 界面是否接受对象
+     */
+    public boolean accept(Object ob) {
+        return (ob instanceof Chart)&&((Chart) ob).getPlot().accept(ChineseMapPlot.class);
+    }
+}
--- a/src/com/fr/solution/plugin/chart/echarts/web/echarts.bridge.js
+++ b/src/com/fr/solution/plugin/chart/echarts/web/echarts.bridge.js
@ -0,0 +1,559 @@
+/**
+ * Created by richie on 16/1/29.
+ */
+EChartsFactory = function(options, $dom) {
+    debugger;
+    var myChart = echarts.init($dom[0], 'dark');
+    var option = {
+        backgroundColor: '#1b1b1b',
+        color: ['gold','aqua','lime'],
+        title : {
+            text: '模拟迁徙',
+            subtext:'数据纯属虚构',
+            x:'center',
+            textStyle : {
+                color: '#fff'
+            }
+        },
+        tooltip : {
+            trigger: 'item',
+            formatter: '{b}'
+        },
+        legend: {
+            orient: 'vertical',
+            x:'left',
+            data:['北京 Top10', '上海 Top10', '广州 Top10'],
+            selectedMode: 'single',
+            selected:{
+                '上海 Top10' : false,
+                '广州 Top10' : false
+            },
+            textStyle : {
+                color: '#fff'
+            }
+        },
+        toolbox: {
+            show : true,
+            orient : 'vertical',
+            x: 'right',
+            y: 'center',
+            feature : {
+                mark : {show: true},
+                dataView : {show: true, readOnly: false},
+                restore : {show: true},
+                saveAsImage : {show: true}
+            }
+        },
+        dataRange: {
+            min : 0,
+            max : 100,
+            calculable : true,
+            color: ['#ff3333', 'orange', 'yellow','lime','aqua'],
+            textStyle:{
+                color:'#fff'
+            }
+        },
+        series : [
+            {
+                name: '全国',
+                type: 'map',
+                roam: true,
+                hoverable: false,
+                mapType: 'china',
+                itemStyle:{
+                    normal:{
+                        borderColor:'rgba(100,149,237,1)',
+                        borderWidth:0.5,
+                        areaStyle:{
+                            color: '#1b1b1b'
+                        }
+                    }
+                },
+                data:[],
+                markLine : {
+                    smooth:true,
+                    symbol: ['none', 'circle'],
+                    symbolSize : 1,
+                    itemStyle : {
+                        normal: {
+                            color:'#fff',
+                            borderWidth:1,
+                            borderColor:'rgba(30,144,255,0.5)'
+                        }
+                    },
+                    data : [
+                        [{name:'北京'},{name:'包头'}],
+                        [{name:'北京'},{name:'北海'}],
+                        [{name:'北京'},{name:'广州'}],
+                        [{name:'北京'},{name:'郑州'}],
+                        [{name:'北京'},{name:'长春'}],
+                        [{name:'北京'},{name:'长治'}],
+                        [{name:'北京'},{name:'重庆'}],
+                        [{name:'北京'},{name:'长沙'}],
+                        [{name:'北京'},{name:'成都'}],
+                        [{name:'北京'},{name:'常州'}],
+                        [{name:'北京'},{name:'丹东'}],
+                        [{name:'北京'},{name:'大连'}],
+                        [{name:'北京'},{name:'东营'}],
+                        [{name:'北京'},{name:'延安'}],
+                        [{name:'北京'},{name:'福州'}],
+                        [{name:'北京'},{name:'海口'}],
+                        [{name:'北京'},{name:'呼和浩特'}],
+                        [{name:'北京'},{name:'合肥'}],
+                        [{name:'北京'},{name:'杭州'}],
+                        [{name:'北京'},{name:'哈尔滨'}],
+                        [{name:'北京'},{name:'舟山'}],
+                        [{name:'北京'},{name:'银川'}],
+                        [{name:'北京'},{name:'衢州'}],
+                        [{name:'北京'},{name:'南昌'}],
+                        [{name:'北京'},{name:'昆明'}],
+                        [{name:'北京'},{name:'贵阳'}],
+                        [{name:'北京'},{name:'兰州'}],
+                        [{name:'北京'},{name:'拉萨'}],
+                        [{name:'北京'},{name:'连云港'}],
+                        [{name:'北京'},{name:'临沂'}],
+                        [{name:'北京'},{name:'柳州'}],
+                        [{name:'北京'},{name:'宁波'}],
+                        [{name:'北京'},{name:'南京'}],
+                        [{name:'北京'},{name:'南宁'}],
+                        [{name:'北京'},{name:'南通'}],
+                        [{name:'北京'},{name:'上海'}],
+                        [{name:'北京'},{name:'沈阳'}],
+                        [{name:'北京'},{name:'西安'}],
+                        [{name:'北京'},{name:'汕头'}],
+                        [{name:'北京'},{name:'深圳'}],
+                        [{name:'北京'},{name:'青岛'}],
+                        [{name:'北京'},{name:'济南'}],
+                        [{name:'北京'},{name:'太原'}],
+                        [{name:'北京'},{name:'乌鲁木齐'}],
+                        [{name:'北京'},{name:'潍坊'}],
+                        [{name:'北京'},{name:'威海'}],
+                        [{name:'北京'},{name:'温州'}],
+                        [{name:'北京'},{name:'武汉'}],
+                        [{name:'北京'},{name:'无锡'}],
+                        [{name:'北京'},{name:'厦门'}],
+                        [{name:'北京'},{name:'西宁'}],
+                        [{name:'北京'},{name:'徐州'}],
+                        [{name:'北京'},{name:'烟台'}],
+                        [{name:'北京'},{name:'盐城'}],
+                        [{name:'北京'},{name:'珠海'}],
+                        [{name:'上海'},{name:'包头'}],
+                        [{name:'上海'},{name:'北海'}],
+                        [{name:'上海'},{name:'广州'}],
+                        [{name:'上海'},{name:'郑州'}],
+                        [{name:'上海'},{name:'长春'}],
+                        [{name:'上海'},{name:'重庆'}],
+                        [{name:'上海'},{name:'长沙'}],
+                        [{name:'上海'},{name:'成都'}],
+                        [{name:'上海'},{name:'丹东'}],
+                        [{name:'上海'},{name:'大连'}],
+                        [{name:'上海'},{name:'福州'}],
+                        [{name:'上海'},{name:'海口'}],
+                        [{name:'上海'},{name:'呼和浩特'}],
+                        [{name:'上海'},{name:'合肥'}],
+                        [{name:'上海'},{name:'哈尔滨'}],
+                        [{name:'上海'},{name:'舟山'}],
+                        [{name:'上海'},{name:'银川'}],
+                        [{name:'上海'},{name:'南昌'}],
+                        [{name:'上海'},{name:'昆明'}],
+                        [{name:'上海'},{name:'贵阳'}],
+                        [{name:'上海'},{name:'兰州'}],
+                        [{name:'上海'},{name:'拉萨'}],
+                        [{name:'上海'},{name:'连云港'}],
+                        [{name:'上海'},{name:'临沂'}],
+                        [{name:'上海'},{name:'柳州'}],
+                        [{name:'上海'},{name:'宁波'}],
+                        [{name:'上海'},{name:'南宁'}],
+                        [{name:'上海'},{name:'北京'}],
+                        [{name:'上海'},{name:'沈阳'}],
+                        [{name:'上海'},{name:'秦皇岛'}],
+                        [{name:'上海'},{name:'西安'}],
+                        [{name:'上海'},{name:'石家庄'}],
+                        [{name:'上海'},{name:'汕头'}],
+                        [{name:'上海'},{name:'深圳'}],
+                        [{name:'上海'},{name:'青岛'}],
+                        [{name:'上海'},{name:'济南'}],
+                        [{name:'上海'},{name:'天津'}],
+                        [{name:'上海'},{name:'太原'}],
+                        [{name:'上海'},{name:'乌鲁木齐'}],
+                        [{name:'上海'},{name:'潍坊'}],
+                        [{name:'上海'},{name:'威海'}],
+                        [{name:'上海'},{name:'温州'}],
+                        [{name:'上海'},{name:'武汉'}],
+                        [{name:'上海'},{name:'厦门'}],
+                        [{name:'上海'},{name:'西宁'}],
+                        [{name:'上海'},{name:'徐州'}],
+                        [{name:'上海'},{name:'烟台'}],
+                        [{name:'上海'},{name:'珠海'}],
+                        [{name:'广州'},{name:'北海'}],
+                        [{name:'广州'},{name:'郑州'}],
+                        [{name:'广州'},{name:'长春'}],
+                        [{name:'广州'},{name:'重庆'}],
+                        [{name:'广州'},{name:'长沙'}],
+                        [{name:'广州'},{name:'成都'}],
+                        [{name:'广州'},{name:'常州'}],
+                        [{name:'广州'},{name:'大连'}],
+                        [{name:'广州'},{name:'福州'}],
+                        [{name:'广州'},{name:'海口'}],
+                        [{name:'广州'},{name:'呼和浩特'}],
+                        [{name:'广州'},{name:'合肥'}],
+                        [{name:'广州'},{name:'杭州'}],
+                        [{name:'广州'},{name:'哈尔滨'}],
+                        [{name:'广州'},{name:'舟山'}],
+                        [{name:'广州'},{name:'银川'}],
+                        [{name:'广州'},{name:'南昌'}],
+                        [{name:'广州'},{name:'昆明'}],
+                        [{name:'广州'},{name:'贵阳'}],
+                        [{name:'广州'},{name:'兰州'}],
+                        [{name:'广州'},{name:'拉萨'}],
+                        [{name:'广州'},{name:'连云港'}],
+                        [{name:'广州'},{name:'临沂'}],
+                        [{name:'广州'},{name:'柳州'}],
+                        [{name:'广州'},{name:'宁波'}],
+                        [{name:'广州'},{name:'南京'}],
+                        [{name:'广州'},{name:'南宁'}],
+                        [{name:'广州'},{name:'南通'}],
+                        [{name:'广州'},{name:'北京'}],
+                        [{name:'广州'},{name:'上海'}],
+                        [{name:'广州'},{name:'沈阳'}],
+                        [{name:'广州'},{name:'西安'}],
+                        [{name:'广州'},{name:'石家庄'}],
+                        [{name:'广州'},{name:'汕头'}],
+                        [{name:'广州'},{name:'青岛'}],
+                        [{name:'广州'},{name:'济南'}],
+                        [{name:'广州'},{name:'天津'}],
+                        [{name:'广州'},{name:'太原'}],
+                        [{name:'广州'},{name:'乌鲁木齐'}],
+                        [{name:'广州'},{name:'温州'}],
+                        [{name:'广州'},{name:'武汉'}],
+                        [{name:'广州'},{name:'无锡'}],
+                        [{name:'广州'},{name:'厦门'}],
+                        [{name:'广州'},{name:'西宁'}],
+                        [{name:'广州'},{name:'徐州'}],
+                        [{name:'广州'},{name:'烟台'}],
+                        [{name:'广州'},{name:'盐城'}]
+                    ],
+                },
+                geoCoord: {
+                    '上海': [121.4648,31.2891],
+                    '东莞': [113.8953,22.901],
+                    '东营': [118.7073,37.5513],
+                    '中山': [113.4229,22.478],
+                    '临汾': [111.4783,36.1615],
+                    '临沂': [118.3118,35.2936],
+                    '丹东': [124.541,40.4242],
+                    '丽水': [119.5642,28.1854],
+                    '乌鲁木齐': [87.9236,43.5883],
+                    '佛山': [112.8955,23.1097],
+                    '保定': [115.0488,39.0948],
+                    '兰州': [103.5901,36.3043],
+                    '包头': [110.3467,41.4899],
+                    '北京': [116.4551,40.2539],
+                    '北海': [109.314,21.6211],
+                    '南京': [118.8062,31.9208],
+                    '南宁': [108.479,23.1152],
+                    '南昌': [116.0046,28.6633],
+                    '南通': [121.1023,32.1625],
+                    '厦门': [118.1689,24.6478],
+                    '台州': [121.1353,28.6688],
+                    '合肥': [117.29,32.0581],
+                    '呼和浩特': [111.4124,40.4901],
+                    '咸阳': [108.4131,34.8706],
+                    '哈尔滨': [127.9688,45.368],
+                    '唐山': [118.4766,39.6826],
+                    '嘉兴': [120.9155,30.6354],
+                    '大同': [113.7854,39.8035],
+                    '大连': [122.2229,39.4409],
+                    '天津': [117.4219,39.4189],
+                    '太原': [112.3352,37.9413],
+                    '威海': [121.9482,37.1393],
+                    '宁波': [121.5967,29.6466],
+                    '宝鸡': [107.1826,34.3433],
+                    '宿迁': [118.5535,33.7775],
+                    '常州': [119.4543,31.5582],
+                    '广州': [113.5107,23.2196],
+                    '廊坊': [116.521,39.0509],
+                    '延安': [109.1052,36.4252],
+                    '张家口': [115.1477,40.8527],
+                    '徐州': [117.5208,34.3268],
+                    '德州': [116.6858,37.2107],
+                    '惠州': [114.6204,23.1647],
+                    '成都': [103.9526,30.7617],
+                    '扬州': [119.4653,32.8162],
+                    '承德': [117.5757,41.4075],
+                    '拉萨': [91.1865,30.1465],
+                    '无锡': [120.3442,31.5527],
+                    '日照': [119.2786,35.5023],
+                    '昆明': [102.9199,25.4663],
+                    '杭州': [119.5313,29.8773],
+                    '枣庄': [117.323,34.8926],
+                    '柳州': [109.3799,24.9774],
+                    '株洲': [113.5327,27.0319],
+                    '武汉': [114.3896,30.6628],
+                    '汕头': [117.1692,23.3405],
+                    '江门': [112.6318,22.1484],
+                    '沈阳': [123.1238,42.1216],
+                    '沧州': [116.8286,38.2104],
+                    '河源': [114.917,23.9722],
+                    '泉州': [118.3228,25.1147],
+                    '泰安': [117.0264,36.0516],
+                    '泰州': [120.0586,32.5525],
+                    '济南': [117.1582,36.8701],
+                    '济宁': [116.8286,35.3375],
+                    '海口': [110.3893,19.8516],
+                    '淄博': [118.0371,36.6064],
+                    '淮安': [118.927,33.4039],
+                    '深圳': [114.5435,22.5439],
+                    '清远': [112.9175,24.3292],
+                    '温州': [120.498,27.8119],
+                    '渭南': [109.7864,35.0299],
+                    '湖州': [119.8608,30.7782],
+                    '湘潭': [112.5439,27.7075],
+                    '滨州': [117.8174,37.4963],
+                    '潍坊': [119.0918,36.524],
+                    '烟台': [120.7397,37.5128],
+                    '玉溪': [101.9312,23.8898],
+                    '珠海': [113.7305,22.1155],
+                    '盐城': [120.2234,33.5577],
+                    '盘锦': [121.9482,41.0449],
+                    '石家庄': [114.4995,38.1006],
+                    '福州': [119.4543,25.9222],
+                    '秦皇岛': [119.2126,40.0232],
+                    '绍兴': [120.564,29.7565],
+                    '聊城': [115.9167,36.4032],
+                    '肇庆': [112.1265,23.5822],
+                    '舟山': [122.2559,30.2234],
+                    '苏州': [120.6519,31.3989],
+                    '莱芜': [117.6526,36.2714],
+                    '菏泽': [115.6201,35.2057],
+                    '营口': [122.4316,40.4297],
+                    '葫芦岛': [120.1575,40.578],
+                    '衡水': [115.8838,37.7161],
+                    '衢州': [118.6853,28.8666],
+                    '西宁': [101.4038,36.8207],
+                    '西安': [109.1162,34.2004],
+                    '贵阳': [106.6992,26.7682],
+                    '连云港': [119.1248,34.552],
+                    '邢台': [114.8071,37.2821],
+                    '邯郸': [114.4775,36.535],
+                    '郑州': [113.4668,34.6234],
+                    '鄂尔多斯': [108.9734,39.2487],
+                    '重庆': [107.7539,30.1904],
+                    '金华': [120.0037,29.1028],
+                    '铜川': [109.0393,35.1947],
+                    '银川': [106.3586,38.1775],
+                    '镇江': [119.4763,31.9702],
+                    '长春': [125.8154,44.2584],
+                    '长沙': [113.0823,28.2568],
+                    '长治': [112.8625,36.4746],
+                    '阳泉': [113.4778,38.0951],
+                    '青岛': [120.4651,36.3373],
+                    '韶关': [113.7964,24.7028]
+                }
+            },
+            {
+                name: '北京 Top10',
+                type: 'map',
+                mapType: 'china',
+                data:[],
+                markLine : {
+                    smooth:true,
+                    effect : {
+                        show: true,
+                        scaleSize: 1,
+                        period: 30,
+                        color: '#fff',
+                        shadowBlur: 10
+                    },
+                    itemStyle : {
+                        normal: {
+                            borderWidth:1,
+                            lineStyle: {
+                                type: 'solid',
+                                shadowBlur: 10
+                            }
+                        }
+                    },
+                    data : [
+                        [{name:'北京'}, {name:'上海',value:95}],
+                        [{name:'北京'}, {name:'广州',value:90}],
+                        [{name:'北京'}, {name:'大连',value:80}],
+                        [{name:'北京'}, {name:'南宁',value:70}],
+                        [{name:'北京'}, {name:'南昌',value:60}],
+                        [{name:'北京'}, {name:'拉萨',value:50}],
+                        [{name:'北京'}, {name:'长春',value:40}],
+                        [{name:'北京'}, {name:'包头',value:30}],
+                        [{name:'北京'}, {name:'重庆',value:20}],
+                        [{name:'北京'}, {name:'常州',value:10}]
+                    ]
+                },
+                markPoint : {
+                    symbol:'emptyCircle',
+                    symbolSize : function (v){
+                        return 10 + v/10
+                    },
+                    effect : {
+                        show: true,
+                        shadowBlur : 0
+                    },
+                    itemStyle:{
+                        normal:{
+                            label:{show:false}
+                        },
+                        emphasis: {
+                            label:{position:'top'}
+                        }
+                    },
+                    data : [
+                        {name:'上海',value:95},
+                        {name:'广州',value:90},
+                        {name:'大连',value:80},
+                        {name:'南宁',value:70},
+                        {name:'南昌',value:60},
+                        {name:'拉萨',value:50},
+                        {name:'长春',value:40},
+                        {name:'包头',value:30},
+                        {name:'重庆',value:20},
+                        {name:'常州',value:10}
+                    ]
+                }
+            },
+            {
+                name: '上海 Top10',
+                type: 'map',
+                mapType: 'china',
+                data:[],
+                markLine : {
+                    smooth:true,
+                    effect : {
+                        show: true,
+                        scaleSize: 1,
+                        period: 30,
+                        color: '#fff',
+                        shadowBlur: 10
+                    },
+                    itemStyle : {
+                        normal: {
+                            borderWidth:1,
+                            lineStyle: {
+                                type: 'solid',
+                                shadowBlur: 10
+                            }
+                        }
+                    },
+                    data : [
+                        [{name:'上海'},{name:'包头',value:95}],
+                        [{name:'上海'},{name:'昆明',value:90}],
+                        [{name:'上海'},{name:'广州',value:80}],
+                        [{name:'上海'},{name:'郑州',value:70}],
+                        [{name:'上海'},{name:'长春',value:60}],
+                        [{name:'上海'},{name:'重庆',value:50}],
+                        [{name:'上海'},{name:'长沙',value:40}],
+                        [{name:'上海'},{name:'北京',value:30}],
+                        [{name:'上海'},{name:'丹东',value:20}],
+                        [{name:'上海'},{name:'大连',value:10}]
+                    ]
+                },
+                markPoint : {
+                    symbol:'emptyCircle',
+                    symbolSize : function (v){
+                        return 10 + v/10
+                    },
+                    effect : {
+                        show: true,
+                        shadowBlur : 0
+                    },
+                    itemStyle:{
+                        normal:{
+                            label:{show:false}
+                        },
+                        emphasis: {
+                            label:{position:'top'}
+                        }
+                    },
+                    data : [
+                        {name:'包头',value:95},
+                        {name:'昆明',value:90},
+                        {name:'广州',value:80},
+                        {name:'郑州',value:70},
+                        {name:'长春',value:60},
+                        {name:'重庆',value:50},
+                        {name:'长沙',value:40},
+                        {name:'北京',value:30},
+                        {name:'丹东',value:20},
+                        {name:'大连',value:10}
+                    ]
+                }
+            },
+            {
+                name: '广州 Top10',
+                type: 'map',
+                mapType: 'china',
+                data:[],
+                markLine : {
+                    smooth:true,
+                    effect : {
+                        show: true,
+                        scaleSize: 1,
+                        period: 30,
+                        color: '#fff',
+                        shadowBlur: 10
+                    },
+                    itemStyle : {
+                        normal: {
+                            borderWidth:1,
+                            lineStyle: {
+                                type: 'solid',
+                                shadowBlur: 10
+                            }
+                        }
+                    },
+                    data : [
+                        [{name:'广州'},{name:'福州',value:95}],
+                        [{name:'广州'},{name:'太原',value:90}],
+                        [{name:'广州'},{name:'长春',value:80}],
+                        [{name:'广州'},{name:'重庆',value:70}],
+                        [{name:'广州'},{name:'西安',value:60}],
+                        [{name:'广州'},{name:'成都',value:50}],
+                        [{name:'广州'},{name:'常州',value:40}],
+                        [{name:'广州'},{name:'北京',value:30}],
+                        [{name:'广州'},{name:'北海',value:20}],
+                        [{name:'广州'},{name:'海口',value:10}]
+                    ]
+                },
+                markPoint : {
+                    symbol:'emptyCircle',
+                    symbolSize : function (v){
+                        return 10 + v/10
+                    },
+                    effect : {
+                        show: true,
+                        shadowBlur : 0
+                    },
+                    itemStyle:{
+                        normal:{
+                            label:{show:false}
+                        },
+                        emphasis: {
+                            label:{position:'top'}
+                        }
+                    },
+                    data : [
+                        {name:'福州',value:95},
+                        {name:'太原',value:90},
+                        {name:'长春',value:80},
+                        {name:'重庆',value:70},
+                        {name:'西安',value:60},
+                        {name:'成都',value:50},
+                        {name:'常州',value:40},
+                        {name:'北京',value:30},
+                        {name:'北海',value:20},
+                        {name:'海口',value:10}
+                    ]
+                }
+            }
+        ]
+    };
+
+    myChart.setOption(option);
+};
--- a/src/com/fr/solution/plugin/chart/echarts/web/lib/echarts-all.js
+++ b/src/com/fr/solution/plugin/chart/echarts/web/lib/echarts-all.js
				`@ -0,0 +1 @@`
				`Plugin-ECharts_Chinese_Map=\u4E2D\u56FD\u5730\u56FE`