Merge branch 'master' into shibei_master

# Conflicts: # src/router/index.js # src/views/pages/index.vue
3 years ago · 90d1dd9c9f
322 changed files with 30364 additions and 7138 deletions
--- a/package.json
+++ b/package.json
@ -16,6 +16,9 @@
    "et:list": "gulp themes"
  },
  "dependencies": {
+    "@antv/l7": "^2.9.14",
+    "@antv/l7-draw": "^3.0.5",
+    "@antv/l7-maps": "^2.9.14",
    "@riophae/vue-treeselect": "^0.4.0",
    "@tinymce/tinymce-vue": "^3.2.8",
    "async-validator": "^4.2.5",
--- a/src/assets/img/file-add.png
+++ b/src/assets/img/file-add.png
--- a/src/assets/img/icon-add.png
+++ b/src/assets/img/icon-add.png
--- a/src/assets/img/icon-del.png
+++ b/src/assets/img/icon-del.png
--- a/src/assets/img/modules/visual/fenlei-box.png
+++ b/src/assets/img/modules/visual/fenlei-box.png
--- a/src/assets/img/shuju/command/arrow-right.png
+++ b/src/assets/img/shuju/command/arrow-right.png
--- a/src/assets/img/shuju/command/close.png
+++ b/src/assets/img/shuju/command/close.png
--- a/src/assets/img/shuju/command/fuwusheshi.png
+++ b/src/assets/img/shuju/command/fuwusheshi.png
--- a/src/assets/img/shuju/command/ico/anzhibangjiao.png
+++ b/src/assets/img/shuju/command/ico/anzhibangjiao.png
--- a/src/assets/img/shuju/command/ico/buliangqingshaonian.png
+++ b/src/assets/img/shuju/command/ico/buliangqingshaonian.png
--- a/src/assets/img/shuju/command/ico/cm_bhsc.png
+++ b/src/assets/img/shuju/command/ico/cm_bhsc.png
--- a/src/assets/img/shuju/command/ico/cm_cjsc.png
+++ b/src/assets/img/shuju/command/ico/cm_cjsc.png
--- a/src/assets/img/shuju/command/ico/cm_nmsc.png
+++ b/src/assets/img/shuju/command/ico/cm_nmsc.png
--- a/src/assets/img/shuju/command/ico/cm_others.png
+++ b/src/assets/img/shuju/command/ico/cm_others.png
--- a/src/assets/img/shuju/command/ico/dc_jqz.png
+++ b/src/assets/img/shuju/command/ico/dc_jqz.png
--- a/src/assets/img/shuju/command/ico/dc_jyz.png
+++ b/src/assets/img/shuju/command/ico/dc_jyz.png
--- a/src/assets/img/shuju/command/ico/dc_jzgd.png
+++ b/src/assets/img/shuju/command/ico/dc_jzgd.png
--- a/src/assets/img/shuju/command/ico/dc_whpdw.png
+++ b/src/assets/img/shuju/command/ico/dc_whpdw.png
--- a/src/assets/img/shuju/command/ico/dc_yqhjz.png
+++ b/src/assets/img/shuju/command/ico/dc_yqhjz.png
--- a/src/assets/img/shuju/command/ico/enterprise_patrol_unqualified.png
+++ b/src/assets/img/shuju/command/ico/enterprise_patrol_unqualified.png
--- a/src/assets/img/shuju/command/ico/ep_cycs.png
+++ b/src/assets/img/shuju/command/ico/ep_cycs.png
--- a/src/assets/img/shuju/command/ico/ep_gwylcs.png
+++ b/src/assets/img/shuju/command/ico/ep_gwylcs.png
--- a/src/assets/img/shuju/command/ico/ep_lg.png
+++ b/src/assets/img/shuju/command/ico/ep_lg.png
--- a/src/assets/img/shuju/command/ico/ep_lssd.png
+++ b/src/assets/img/shuju/command/ico/ep_lssd.png
--- a/src/assets/img/shuju/command/ico/ep_mrxycs.png
+++ b/src/assets/img/shuju/command/ico/ep_mrxycs.png
--- a/src/assets/img/shuju/command/ico/ep_qt.png
+++ b/src/assets/img/shuju/command/ico/ep_qt.png
--- a/src/assets/img/shuju/command/ico/ep_scjgqy.png
+++ b/src/assets/img/shuju/command/ico/ep_scjgqy.png
--- a/src/assets/img/shuju/command/ico/ep_wb.png
+++ b/src/assets/img/shuju/command/ico/ep_wb.png
--- a/src/assets/img/shuju/command/ico/ep_xx.png
+++ b/src/assets/img/shuju/command/ico/ep_xx.png
--- a/src/assets/img/shuju/command/ico/ep_yy.png
+++ b/src/assets/img/shuju/command/ico/ep_yy.png
--- a/src/assets/img/shuju/command/ico/event_tdnd.png
+++ b/src/assets/img/shuju/command/ico/event_tdnd.png
--- a/src/assets/img/shuju/command/ico/gr_czw.png
+++ b/src/assets/img/shuju/command/ico/gr_czw.png
--- a/src/assets/img/shuju/command/ico/lwh.png
+++ b/src/assets/img/shuju/command/ico/lwh.png
--- a/src/assets/img/shuju/command/ico/lyjlb.png
+++ b/src/assets/img/shuju/command/ico/lyjlb.png
--- a/src/assets/img/shuju/command/ico/other.png
+++ b/src/assets/img/shuju/command/ico/other.png
--- a/src/assets/img/shuju/command/ico/ps_jjz.png
+++ b/src/assets/img/shuju/command/ico/ps_jjz.png
--- a/src/assets/img/shuju/command/ico/ps_lyy.png
+++ b/src/assets/img/shuju/command/ico/ps_lyy.png
--- a/src/assets/img/shuju/command/ico/ps_mzb.png
+++ b/src/assets/img/shuju/command/ico/ps_mzb.png
--- a/src/assets/img/shuju/command/ico/ps_nat.png
+++ b/src/assets/img/shuju/command/ico/ps_nat.png
--- a/src/assets/img/shuju/command/ico/ps_others.png
+++ b/src/assets/img/shuju/command/ico/ps_others.png
--- a/src/assets/img/shuju/command/ico/ps_vaccine.png
+++ b/src/assets/img/shuju/command/ico/ps_vaccine.png
--- a/src/assets/img/shuju/command/ico/ps_wss.png
+++ b/src/assets/img/shuju/command/ico/ps_wss.png
--- a/src/assets/img/shuju/command/ico/ps_zs.png
+++ b/src/assets/img/shuju/command/ico/ps_zs.png
--- a/src/assets/img/shuju/command/ico/pu_0.png
+++ b/src/assets/img/shuju/command/ico/pu_0.png
--- a/src/assets/img/shuju/command/ico/pu_1.png
+++ b/src/assets/img/shuju/command/ico/pu_1.png
--- a/src/assets/img/shuju/command/ico/pu_2.png
+++ b/src/assets/img/shuju/command/ico/pu_2.png
--- a/src/assets/img/shuju/command/ico/pu_3.png
+++ b/src/assets/img/shuju/command/ico/pu_3.png
--- a/src/assets/img/shuju/command/ico/pu_4.png
+++ b/src/assets/img/shuju/command/ico/pu_4.png
--- a/src/assets/img/shuju/command/ico/pu_5.png
+++ b/src/assets/img/shuju/command/ico/pu_5.png
--- a/src/assets/img/shuju/command/ico/pu_6.png
+++ b/src/assets/img/shuju/command/ico/pu_6.png
--- a/src/assets/img/shuju/command/ico/pu_7.png
+++ b/src/assets/img/shuju/command/ico/pu_7.png
--- a/src/assets/img/shuju/command/ico/pu_jgzsbm.png
+++ b/src/assets/img/shuju/command/ico/pu_jgzsbm.png
--- a/src/assets/img/shuju/command/ico/resi_snry.png
+++ b/src/assets/img/shuju/command/ico/resi_snry.png
--- a/src/assets/img/shuju/command/ico/resi_szry.png
+++ b/src/assets/img/shuju/command/ico/resi_szry.png
--- a/src/assets/img/shuju/command/ico/resi_xfry.png
+++ b/src/assets/img/shuju/command/ico/resi_xfry.png
--- a/src/assets/img/shuju/command/ico/shequjiaozheng.png
+++ b/src/assets/img/shuju/command/ico/shequjiaozheng.png
--- a/src/assets/img/shuju/command/ico/sr_djc.png
+++ b/src/assets/img/shuju/command/ico/sr_djc.png
--- a/src/assets/img/shuju/command/ico/sr_gc.png
+++ b/src/assets/img/shuju/command/ico/sr_gc.png
--- a/src/assets/img/shuju/command/ico/sr_ggld.png
+++ b/src/assets/img/shuju/command/ico/sr_ggld.png
--- a/src/assets/img/shuju/command/ico/sr_gy.png
+++ b/src/assets/img/shuju/command/ico/sr_gy.png
--- a/src/assets/img/shuju/command/ico/sr_jzz.png
+++ b/src/assets/img/shuju/command/ico/sr_jzz.png
--- a/src/assets/img/shuju/command/ico/sr_others.png
+++ b/src/assets/img/shuju/command/ico/sr_others.png
--- a/src/assets/img/shuju/command/ico/sr_rfqck.png
+++ b/src/assets/img/shuju/command/ico/sr_rfqck.png
--- a/src/assets/img/shuju/command/ico/sr_tyc.png
+++ b/src/assets/img/shuju/command/ico/sr_tyc.png
--- a/src/assets/img/shuju/command/ico/sr_xfz.png
+++ b/src/assets/img/shuju/command/ico/sr_xfz.png
--- a/src/assets/img/shuju/command/ico/sr_yjy.png
+++ b/src/assets/img/shuju/command/ico/sr_yjy.png
--- a/src/assets/img/shuju/command/ico/volunteer_caijiyuan.png
+++ b/src/assets/img/shuju/command/ico/volunteer_caijiyuan.png
--- a/src/assets/img/shuju/command/ico/volunteer_daibanyuan.png
+++ b/src/assets/img/shuju/command/ico/volunteer_daibanyuan.png
--- a/src/assets/img/shuju/command/ico/volunteer_dangyuanzhongxinhu.png
+++ b/src/assets/img/shuju/command/ico/volunteer_dangyuanzhongxinhu.png
--- a/src/assets/img/shuju/command/ico/volunteer_nengrendaren.png
+++ b/src/assets/img/shuju/command/ico/volunteer_nengrendaren.png
--- a/src/assets/img/shuju/command/ico/volunteer_others.png
+++ b/src/assets/img/shuju/command/ico/volunteer_others.png
--- a/src/assets/img/shuju/command/ico/volunteer_tiaojieyuan.png
+++ b/src/assets/img/shuju/command/ico/volunteer_tiaojieyuan.png
--- a/src/assets/img/shuju/command/ico/volunteer_zhianxunluo.png
+++ b/src/assets/img/shuju/command/ico/volunteer_zhianxunluo.png
--- a/src/assets/img/shuju/command/ico/whdw.png
+++ b/src/assets/img/shuju/command/ico/whdw.png
--- a/src/assets/img/shuju/command/ico/xidurenyuan.png
+++ b/src/assets/img/shuju/command/ico/xidurenyuan.png
--- a/src/assets/img/shuju/command/ico/xiejiaorenyuan.png
+++ b/src/assets/img/shuju/command/ico/xiejiaorenyuan.png
--- a/src/assets/img/shuju/command/ico/yjdw.png
+++ b/src/assets/img/shuju/command/ico/yjdw.png
--- a/src/assets/img/shuju/command/ico/zaxld.png
+++ b/src/assets/img/shuju/command/ico/zaxld.png
--- a/src/assets/img/shuju/command/ico/zhaoshizhaohuojingshenbing.png
+++ b/src/assets/img/shuju/command/ico/zhaoshizhaohuojingshenbing.png
--- a/src/assets/img/shuju/command/ico2/IS_CJ.png
+++ b/src/assets/img/shuju/command/ico2/IS_CJ.png
--- a/src/assets/img/shuju/command/ico2/IS_DB.png
+++ b/src/assets/img/shuju/command/ico2/IS_DB.png
--- a/src/assets/img/shuju/command/ico2/IS_DBH.png
+++ b/src/assets/img/shuju/command/ico2/IS_DBH.png
--- a/src/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png
+++ b/src/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png
--- a/src/assets/img/shuju/command/ico2/IS_KC.png
+++ b/src/assets/img/shuju/command/ico2/IS_KC.png
--- a/src/assets/img/shuju/command/ico2/IS_MB.png
+++ b/src/assets/img/shuju/command/ico2/IS_MB.png
--- a/src/assets/img/shuju/command/ico2/IS_OLD_PEOPLE.png
+++ b/src/assets/img/shuju/command/ico2/IS_OLD_PEOPLE.png
--- a/src/assets/img/shuju/command/ico2/IS_PARTY.png
+++ b/src/assets/img/shuju/command/ico2/IS_PARTY.png
--- a/src/assets/img/shuju/command/ico2/IS_SD.png
+++ b/src/assets/img/shuju/command/ico2/IS_SD.png
--- a/src/assets/img/shuju/command/ico2/IS_SN.png
+++ b/src/assets/img/shuju/command/ico2/IS_SN.png
--- a/src/assets/img/shuju/command/ico2/IS_SPECIAL.png
+++ b/src/assets/img/shuju/command/ico2/IS_SPECIAL.png
--- a/src/assets/img/shuju/command/ico2/IS_SZ.png
+++ b/src/assets/img/shuju/command/ico2/IS_SZ.png
--- a/src/assets/img/shuju/command/ico2/IS_UNEMPLOYED.png
+++ b/src/assets/img/shuju/command/ico2/IS_UNEMPLOYED.png
--- a/src/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png
+++ b/src/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png
--- a/src/assets/img/shuju/command/ico2/IS_VETERANS.png
+++ b/src/assets/img/shuju/command/ico2/IS_VETERANS.png
--- a/src/assets/img/shuju/command/ico2/IS_VOLUNTEER.png
+++ b/src/assets/img/shuju/command/ico2/IS_VOLUNTEER.png
--- a/src/assets/img/shuju/command/ico2/IS_XFRY.png
+++ b/src/assets/img/shuju/command/ico2/IS_XFRY.png
--- a/src/assets/img/shuju/command/ico2/IS_YLFN.png
+++ b/src/assets/img/shuju/command/ico2/IS_YLFN.png
--- a/src/assets/img/shuju/command/ico2/anzhibangjiao.png
+++ b/src/assets/img/shuju/command/ico2/anzhibangjiao.png
--- a/src/assets/img/shuju/command/ico2/buliangqingshaonian.png
+++ b/src/assets/img/shuju/command/ico2/buliangqingshaonian.png
--- a/src/assets/img/shuju/command/ico2/enterprise_patrol_unqualified.png
+++ b/src/assets/img/shuju/command/ico2/enterprise_patrol_unqualified.png