From 44280203af25006efc4b8939b4fc01477041e9b8 Mon Sep 17 00:00:00 2001
From: wangrui <zephyrs0894@163.com>
Date: 星期六, 19 十二月 2020 01:01:47 +0800
Subject: [PATCH] 重构基础图层加载的代码

---
 /dev/null                                    |   10 
 src/components/mapmodules/CommonLayerLoad.js |   36 +-
 src/api/index.js                             |    9 
 src/conf/MapConfig.js                        |  201 ++--------------
 src/api/mapApi.js                            |  129 ----------
 src/views/MapTemplate.vue                    |    6 
 src/api/mapUrl.js                            |   10 
 src/components/helpers/BasemapHelper.js      |   48 +++-
 src/components/helpers/ServiceLayerHelper.js |   85 +++++++
 src/Sgis.js                                  |   47 ++-
 src/base/BaseLayer.js                        |  136 +++++++++++
 11 files changed, 353 insertions(+), 364 deletions(-)

diff --git a/src/Sgis.js b/src/Sgis.js
index 7ade0f1..378fcba 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -22,32 +22,23 @@
         commonLayerLoad = null
     }
 
-    // Editable.init(L)
-    // PathDrag.init(L)
-    // MagicMarker.init(L)
-    // CanvasIcon.init(L)
+    // Leaflet鎵╁睍浠g爜
+    // Editable.init(L) // 鍥惧眰缂栬緫
+    // PathDrag.init(L) // 璺緞鎷栨嫿
+    // MagicMarker.init(L) // 鍔ㄧ敾Marker
+    // CanvasIcon.init(L) // 浣跨敤canvas缁樺埗Marker
 
-    // CustomPopup.init(L)
-    // DashFlow.DashFlow(L)
+    // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
+    // DashFlow.DashFlow(L) // 娴佸姩绾垮浘
+    // Leaflet鎵╁睍浠g爜
+
     map = L.map(div, MapConfig.mapOptions)
-    // DashFlow.DashFlow(L, map)
-    commonLayerLoad = new CommonLayerLoad()
-    // const blueMap = commonLayerLoad.loadBlueMap()
-    // baseMapGroup = L.layerGroup([blueMap]).addTo(map)
 
-    const imgMapm = commonLayerLoad.loadImgMapm()
-    const imgMapa = commonLayerLoad.loadImgMapa()
-    
-    L.layerGroup([imgMapm, imgMapa]).addTo(map)
     
     // getToken()
     // L.control.scale({ maxWidth: 200, metric: true, imperial: false }).addTo(map)
     // L.control.layers(SgisConfig.baseLayers, SgisConfig.overlayLayers, { position: 'bottomright' }).addTo(map)
-    // 鍔犺浇鍥界晫鍜岄搧璺�
-    const nationalBoundaries = commonLayerLoad.loadGuoJie()
-    const railWay = commonLayerLoad.loadRailWay()
-    nationalBoundaries.addTo(map)
-    railWay.addTo(map)
+
     window.map = map
     window.L = L
 
@@ -67,6 +58,7 @@
 //     baseMapGroup.addLayer(imgMapm)
 //     baseMapGroup.addLayer(imgMapa)
 // }
+
 /**
  * 鐡︾墖搴曞浘鍒濆鍖�
  * @param map
@@ -75,6 +67,18 @@
     // todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
     var basemapHelper = new BasemapHelper(map, L)
     return basemapHelper
+}
+
+const initTileLayers = (map, L) => {
+    // DashFlow.DashFlow(L, map)
+    commonLayerLoad = new CommonLayerLoad()
+    // const blueMap = commonLayerLoad.loadBlueMap()
+    // baseMapGroup = L.layerGroup([blueMap]).addTo(map)
+
+    const imgMapm = commonLayerLoad.loadImgMapm()
+    const imgMapa = commonLayerLoad.loadImgMapa()
+    
+    L.layerGroup([imgMapm, imgMapa]).addTo(map)
 }
 
 /**
@@ -88,7 +92,7 @@
  * @param obj { name: 'trackPlayer', ref: this.$refs.trackPlayer }  缁勪欢鐨勫悕绉� 鍜� 缁勪欢鐨勫紩鐢�
  * @param loadMethodNames
  */
-const initLayers = (map, L, obj, env) => {
+const initVectorLayers = (map, L, obj, env) => {
     // todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
     var vectorLayerHelper = new VectorLayerHelper(map, L, env)
     if (obj != null) {
@@ -103,5 +107,6 @@
 export default {
     initMap,
     initBasemaps,
-    initLayers
+    initTileLayers,
+    initVectorLayers
 }
diff --git a/src/api/app.js b/src/api/app.js
deleted file mode 100644
index 94e9562..0000000
--- a/src/api/app.js
+++ /dev/null
@@ -1,246 +0,0 @@
-import { $HOST } from './host'
-
-/**
- * 妗嗘灦鐢╝pi,涓嶇敤care,鎵撳寘鐢熶骇鐜鐨勫満鏅嚜鍔ㄥ幓闄�
- *
- * API鍛藉悕瑙勫垯
- * {妯″潡鍚峿_{璇锋眰鏂规硶}_{鍏蜂綋涓氬姟鍔熻兘鎻忚堪}_{缁撴瀯鎻忚堪}
- *
- * {妯″潡鍚峿锛�
- *  渚嬪锛歟mdm emew
- * {璇锋眰鏂规硶}锛�
- *  1.涓�涓猘pi瀵瑰簲涓�涓姹傛柟娉�
- *    渚嬪 get post delete put
- *  2.涓�涓猘pi瀵瑰簲澶氫釜璇锋眰鏂规硶 // todo 濡備綍鑳界湅鍑烘槸浠�涔堣姹�
- *    鈶� get post delete put =銆� all
- *    鈶� post delete put =銆� pdp
- *    鈶� post delete=銆� pd
- *    鈶� delete put =銆媎p
- *    鈶� get post delete => gpd
- *
- * {鍏蜂綋涓氬姟鍔熻兘鎻忚堪}:
- *
- * {缁撴瀯鎻忚堪}:
- *  杩斿洖澶氭潯鏁版嵁鐢� list
- *  杩斿洖涓�鏉℃暟鎹敤 detail 鎴栨槸 one
- *
- */
-// 鑿滃崟
-export const BASE_GET_MENU = $HOST + '/v1/permissions/menu'
-
-/**
- * AAA鏉冮檺鐩稿叧
- *
- */
-// 鐢ㄦ埛鐧诲叆
-export const AAA_POST_USER_LOGIN = $HOST + '/api/public/v1/permissions/user/login'
-// 鐢ㄦ埛鐧诲嚭
-export const AAA_POST_USER_LOGOUT = $HOST + '/api/public/v1/permissions/user/logout'
-// 鑾峰彇鐢ㄦ埛淇℃伅
-export const AAA_GET_USER_INFO = $HOST + '/api/public/v1/permissions/user/info'
-// 鑾峰彇椤甸潰璧勬簮
-export const AAA_GET_PAGES_RESOURCE = $HOST + '/api/public/v1/permissions/pagesResource'
-// 鑾峰彇鍏ㄩ儴浜哄憳鍒楄〃
-export const AAA_GET_USER_LIST = $HOST + '/api/public/v1/permissions/user/list'
-
-/************************************************************************************************************
- * 涓氬姟api鍖哄煙
- *
- ************************************************************************************************************/
-
-/**
- * 涓绘暟鎹鐞�
- *
- */
-// 鏂囦欢涓嬭浇涓婁紶
-export const MDM_POST_FILE_UPLOAD = $HOST + '/hcstms/client/file/upload'
-
-// 鑾峰彇褰撳墠鐧诲綍鐨勬墍灞炰紒涓�
-export const MDM_GET_USER_ORG = $HOST + '/hcstms/client/organization/getUserOrg'
-
-// 鍏ㄩ儴鐨勬壙杩愬晢銆佽鍗稿彴銆佸嵄搴熷悕褰曘�佷紒涓氬嵄搴熶俊鎭�佷紒涓氬嵄鍖栧搧淇℃伅
-export const MDM_GET_CARRIER_TOTAL = $HOST + '/hcstms/client/carriers/list'
-export const MDM_GET_LOADDOCK_TOTAL = $HOST + '/hcstms/client/load-dock/list'
-export const MDM_GET_HWSITEMS_TOTAL = $HOST + '/hcstms/client/hws-items/list'
-export const MDM_GET_COMPANY_HWS_ITEMS = $HOST + '/hcstms/client/company-hws-items/list/'
-export const MDM_GET_COMPANY_HCS_ITEMS = $HOST + '/hcstms/client/company-hcs-items/list/'
-
-// 鑾峰彇浼佷笟璧勬簮搴撳叧鑱旀壙杩愬晢鎴栬�呭缃晢 resourceType浼佷笟璧勬簮搴撶被鍨�
-export const MDM_GET_COMPANY_RESOURCE_LIB_ITEMS = $HOST + '/hcstms/client/company-resource-lib/resource/list'
-
-// 鑾峰彇鐧诲綍浜虹浉鍏虫壙杩愬晢
-export const MDM_GET_USER_CARRIERS = $HOST + '/hcstms/client/company-resource-lib/user/carriers'
-
-// 璧勬簮搴撶鐞�
-export const MDM_GET_HWSITEMS_PAGINATION = $HOST + '/hcstms/client/hws-items/pager'
-export const MDM_GET_HWSITEMS_DETAIL = $HOST + '/hcstms/client/hws-items/id/{$hwsItemId}'
-export const MDM_DELETE_HWSITEMS = $HOST + '/hcstms/client/hws-items/batch'
-export const MDM_ALL_HWSITEMS = $HOST + '/hcstms/client/hws-items/item'
-export const MDM_POST_IMPORT_HWSITEMS = $HOST + '/hcstms/client/hws-items/importExcel'
-// 杞Щ搴�
-export const MDM_GET_TRANSTOR_LIST = $HOST + '/hcstms/client/hws-transit-depot/pager'
-export const MDM_GET_TRANSTOR_DETAIL = $HOST + '/hcstms/client/hws-transit-depot/id/{$hwsTransitId}'
-export const MDM_DELETE_TRANSTOR = $HOST + '/hcstms/client/hws-transit-depot/batch'
-export const MDM_ALL_TRANSTOR = $HOST + '/hcstms/client/hws-transit-depot/item'
-export const MDM_GET_IMPORT_TRANSTOR = $HOST + '/hcstms/client/hws-transit-depot/import/excel'
-export const MDM_GET_EXPORT_TRANSTOR = $HOST + '/hcstms/client/hws-transit-depot/export/excel/template'
-// 澶勭疆鍟�
-export const MDM_GET_DISPONER_LIST = $HOST + '/hcstms/client/hws-disposal-agent/pager'
-export const MDM_GET_DISPONER_DETAIL = $HOST + '/hcstms/client/hws-disposal-agent/id/{$hwsAgentId}'
-export const MDM_DELETE_DISPONER = $HOST + '/hcstms/client/hws-disposal-agent/batch'
-export const MDM_ALL_DISPONER = $HOST + '/hcstms/client/hws-disposal-agent/item'
-// 鎵胯繍鍟�
-export const MDM_GET_CARRIER_LIST = $HOST + '/hcstms/client/carriers/pager'
-export const MDM_GET_CARRIER_DETAIL = $HOST + '/hcstms/client/carriers/id/{$carrierId}'
-export const MDM_DELETE_CARRIER = $HOST + '/hcstms/client/carriers/batch'
-export const MDM_ALL_CARRIER = $HOST + '/hcstms/client/carriers/item'
-// 杞﹁締
-export const MDM_GET_VEHICLES_LIST = $HOST + '/hcstms/client/vehicles/pager'
-export const MDM_GET_VEHICLES_DETAIL = $HOST + '/hcstms/client/vehicles/id/{$vehicleId}'
-export const MDM_DELETE_VEHICLES = $HOST + '/hcstms/client/vehicles/batch'
-export const MDM_ALL_VEHICLES = $HOST + '/hcstms/client/vehicles/item'
-export const MDM_POST_IMPORT_VEHICLES = $HOST + '/hcstms/client/vehicles/import/excel'
-export const MDM_GET_EXPORT_VEHICLES = $HOST + '/hcstms/client/vehicles/export/excel'
-// 鑸硅埗
-export const MDM_GET_SHIPS_LIST = $HOST + '/hcstms/client/ships/pager'
-export const MDM_GET_SHIPS_DETAIL = $HOST + '/hcstms/client/ships/id/{$shipId}'
-export const MDM_DELETE_SHIPS = $HOST + '/hcstms/client/ships/batch'
-export const MDM_ALL_SHIPS = $HOST + '/hcstms/client/ships/item'
-export const MDM_POST_IMPORT_SHIPS = $HOST + '/hcstms/client/ships/import/excel'
-export const MDM_GET_EXPORT_SHIPS = $HOST + '/hcstms/client/ships/export/excel'
-// 閾佽矾鑷杞�
-export const MDM_GET_TRAINSOWNED_LIST = $HOST + '/hcstms/client/trains-owned/pager'
-export const MDM_GET_TRAINSOWNED_DETAIL = $HOST + '/hcstms/client/trains-owned/id/{$trainsId}'
-export const MDM_DELETE_TRAINSOWNED = $HOST + '/hcstms/client/trains-owned/batch'
-export const MDM_ALL_TRAINSOWNED = $HOST + '/hcstms/client/trains-owned/item'
-export const MDM_GET_IMPORT_TRAINSOWNED = $HOST + '/hcstms/client/trains-owned/importExcel'
-export const MDM_GET_EXPORT_TRAINSOWNED = $HOST + '/hcstms/client/trains-owned/exportExcel'
-// 椹炬娂浜哄憳
-export const MDM_GET_DRIVERS_LIST = $HOST + '/hcstms/client/drivers/pager'
-export const MDM_GET_DRIVERS_DETAIL = $HOST + '/hcstms/client/drivers/id/{$driverId}'
-export const MDM_DELETE_DRIVERS = $HOST + '/hcstms/client/drivers/batch'
-export const MDM_ALL_DRIVERS = $HOST + '/hcstms/client/drivers/item'
-export const MDM_GET_IMPORT_DRIVERS = $HOST + '/hcstms/client/drivers/importExcel'
-export const MDM_GET_EXPORT_DRIVERS = $HOST + '/hcstms/client/drivers/exportExcel'
-// 瑁呭嵏鍙扮淮鎶�
-export const MDM_GET_LOADDOCK_LIST = $HOST + '/hcstms/client/load-dock/pager'
-export const MDM_GET_LOADDOCK_DETAIL = $HOST + '/hcstms/client/load-dock/id/{$loadDockId}'
-export const MDM_DELETE_LOADDOCK = $HOST + '/hcstms/client/load-dock/batch'
-export const MDM_ALL_LOADDOCK = $HOST + '/hcstms/client/load-dock/item'
-export const MDM_GET_IMPORT_LOADDOCK = $HOST + '/hcstms/client/load-dock/importExcel'
-export const MDM_GET_EXPORT_LOADDOCK = $HOST + '/hcstms/client/load-dock/exportExcel'
-// 瑙嗛鐩戞帶
-export const MDM_GET_VIDEOMON_LIST = $HOST + '/hcstms/client/video-monitor/pager'
-export const MDM_GET_VIDEOMON_DETAIL = $HOST + '/hcstms/client/video-monitor/id/{$videoMonitorId}'
-export const MDM_DELETE_VIDEOMON = $HOST + '/hcstms/client/video-monitor/batch'
-export const MDM_ALL_VIDEOMON = $HOST + '/hcstms/client/video-monitor/item'
-// 浼佷笟璧勬簮搴�
-export const MDM_GET_COMPANYLIB = $HOST + '/hcstms/client/company-resource-lib/pager'
-export const MDM_POST_COMPANYLIB = $HOST + '/hcstms/client/company-resource-lib/item'
-export const MDM_DELETE_COMPANYLIB = $HOST + '/hcstms/client/company-resource-lib/batch'
-export const MDM_GET_COMPANY_BLACKLIST = $HOST + '/hcstms/client/company-blacklist/id'
-export const MDM_GET_COMPANY_BLACKLISTHISTORY = $HOST + '/hcstms/client/company-blacklist-history/pager'
-export const MDM_GET_BLACKLISTHISTORY = $HOST + '/hcstms/client/company-blacklist-history/id/'
-export const MDM_GET_BLACKLISTHISTORY_DETAIL = $HOST + '/hcstms/client/company-blacklist-history/id/{$companyBlacklistId}'
-export const MDM_POST_COMPANY_BLACKLIST = $HOST + '/hcstms/client/company-blacklist/item'
-export const MDM_DELETE_COMPANY_BLACKLIST = $HOST + '/hcstms/client/company-blacklist/batch'
-export const MDM_DELETE_COMPANY_FOCUS = $HOST + '/hcstms/client/company-resource-lib/focus'
-// 缁勭粐鏈烘瀯
-export const MDM_GET_ORGANIZATION = $HOST + '/hcstms/client/organization/list'
-export const MDM_GET_ORGANIZATION_TABLE = $HOST + '/hcstms/client/organization/pager'
-export const HWM_GET_ORGANIZATION_DETAIL = $HOST + '/hcstms/client/organization/id/{$orgId}'
-export const MDM_ALL_ORGANIZATION = $HOST + '/hcstms/client/organization/item'
-export const MDM_DELETE_ORGANIZATION = $HOST + '/hcstms/client/organization/batch'
-export const MDM_GET_CHECKORGCODE = $HOST + '/hcstms/client/organization/checkOrgCode'
-
-// 杩愯緭瀹夊叏绠$悊---鏁忔劅鍖哄煙绠$悊
-export const HWM_GET_SENSITIVE_AREA_LIST = $HOST + '/hcstms/client/hws-sensitive-area/pager'
-export const HWM_GET_SENSITIVE_AREA_DETAIL = $HOST + '/hcstms/client/hws-sensitive-area/id/{$hwsSensitiveAreaId}'
-export const HWM_GET_SENSITIVE_AREA_CAR = $HOST + '/hcstms/client/hws-sensitive-area/findVehiclePage'
-export const HWM_GET_SENSITIVE_AREA_SHIP = $HOST + '/hcstms/client/hws-sensitive-area/findShipsPage'
-
-export const HWM_ALL_SENSITIVE_AREA = $HOST + '/hcstms/client/hws-sensitive-area/item'
-export const HWM_DELETE_SENSITIVE_AREA = $HOST + '/hcstms/client/hws-sensitive-area/batch'
-export const HWM_GET_SENSITIVE_TRANSINFO = $HOST + '/hcstms/client/hws-sensitive-area/getTransInfo'
-
-// 杩愯緭瀹夊叏绠$悊---杩愬崟绠$悊
-export const HWM_GET_TRANSORDER_LIST = $HOST + '/hcstms/client/trans-order/pager'
-export const HWM_GET_TRANSORDER_DETAIL = $HOST + '/hcstms/client/trans-order/id/{$id}'
-export const HWM_ALL_TRANSORDER = $HOST + '/hcstms/client/trans-order/item'
-export const HWM_DELETE_TRANSORDER = $HOST + '/hcstms/client/trans-order/batch'
-
-// 鍗卞簾---鏁忔劅鍖哄煙鎻愰啋
-export const HWM_GET_SENSITIVE_AREA_WARN_LIST = $HOST + '/hcstms/client/sensitive-area-warn/pager'
-export const HWM_EXPORT_SENSITIVE_AREA_WARN = $HOST + '/hcstms/client/sensitive-area-warn/export/excel'
-export const HWM_GET_SENSITIVE_AREA_WARN = $HOST + '/hcstms/client/sensitive-area-warn /item'
-
-// 鍗卞簾---琛岄┒璺緞绠$悊
-export const HWM_GET_TRAVELPATH_LIST = $HOST + '/hcstms/client/hws-travel-path/pager'
-export const HWM_GET_TRAVELPATH_DETAIL = $HOST + '/hcstms/client/hws-travel-path/id/{$hwsTravelPathId}'
-export const HWM_DELETE_TRAVELPATH = $HOST + '/hcstms/client/hws-travel-path/batch'
-export const HWM_ALL_TRAVELPATH = $HOST + '/hcstms/client/hws-travel-path/item'
-export const HWM_GET_TRAVELPATH_CAR = $HOST + '/hcstms/client/hws-travel-path/findVehiclePage'
-export const HWM_GET_TRAVELPATH_SHIP = $HOST + '/hcstms/client/hws-travel-path/findShipsPage'
-// 鍗卞簾---琛岄┒璺緞鎻愰啋
-export const HWM_GET_TRAVEL_PATH_REMIND_LIST = $HOST + '/hcstms/client/travel-path-warn/pager'
-export const HWM_EXPORT_TRAVEL_PATH_REMIND = $HOST + '/hcstms/client/travel-path-warn/export/excel'
-
-// 鏁忔劅鍖哄煙鎻愰啋锛岃椹惰矾缁忔彁閱掕繍鍗曡鎯�
-export const HWM_GET_TRANS_ORDER = $HOST + '/hcstms/client/trans-order/list'
-
-// 鐢ㄦ埛绠$悊
-export const MDM_GET_USER_MANAGE_LIST = $HOST + '/hcstms/client/users/pager'
-export const MDM_GET_USER_MANAGE_DETAIL = $HOST + '/hcstms/client/users/id/{$userId}'
-export const MDM_GET_USER_ACCOUNT_DETAIL = $HOST + '/hcstms/client/users/account/{$account}'
-export const MDM_ALL_USER_MANAGE = $HOST + '/hcstms/client/users/item'
-export const MDM_DELETE_USER_MANAGE = $HOST + '/hcstms/client/users/batch'
-export const MDM_POST_USER_MANAGE = $HOST + '/hcstms/client/users/importExcel'
-export const MDM_GET_USER_MANAGE = $HOST + '/hcstms/client/users/importExcelTemp'
-
-// 閫氱煡閰嶇疆
-export const MDM_GET_NOTICE_CONFIG_LIST = $HOST + '/hcstms/client/notice-config/pager'
-export const MDM_GET_NOTICE_CONFIG_DETAIL = $HOST + '/hcstms/client/notice-config/id/{$noticeConfigId}'
-export const MDM_ALL_NOTICE_CONFIG = $HOST + '/hcstms/client/notice-config/item'
-export const MDM_DELETE_NOTICE_CONFIG = $HOST + '/hcstms/client/notice-config/batch'
-// export const MDM_GET_USER_MANAGE = $HOST + '/hcstms/client/users/importExcelTemp'
-
-// 浼佷笟鍗卞簾淇℃伅
-export const MDM_GET_COMHWSITEMS_LIST = $HOST + '/hcstms/client/company-hws-items/pager'
-export const MDM_GET_COMHWSITEMS_DETAIL = $HOST + '/hcstms/client/company-hws-items/id/{$companyHwsItemId}'
-export const MDM_ALL_COMHWSITEMS = $HOST + '/hcstms/client/company-hws-items/item'
-export const MDM_DELETE_COMHWSITEMS = $HOST + '/hcstms/client/company-hws-items/batch'
-
-// 鍗卞寲鍝佸悕褰�
-export const MDM_GET_HAZARDOUS_CHEMICALS_LIST = $HOST + '/hcstms/client/hcs-items/pager'
-export const MDM_GET_HAZARDOUS_CHEMICALS_DETAIL = $HOST + '/hcstms/client/hcs-items/id/{$hcsItemId}'
-export const MDM_ALL_HAZARDOUS_CHEMICALS = $HOST + '/hcstms/client/hcs-items/item'
-export const MDM_DELETE_HAZARDOUS_CHEMICALS = $HOST + '/hcstms/client/hcs-items/batch'
-export const MDM_POST_IMPORT_HAZARDOUS_CHEMICALS = $HOST + '/hcstms/client/hcs-items/importExcel'
-export const MDM_GET_HAZARDOUS_CHEMICALS_CAS = $HOST + '/hcstms/client/hcs-items/list'
-
-// 浼佷笟鍗卞寲鍝佷俊鎭�
-export const MDM_GET_HAZARDOUS_CHEMICALS_ENTERPRISES_LIST = $HOST + '/hcstms/client/company-hcs-items/pager'
-export const MDM_GET_HAZARDOUS_CHEMICALS_ENTERPRISES_DETAIL = $HOST + '/hcstms/client/company-hcs-items/id/{$companyHcsItemId}'
-export const MDM_ALL_HAZARDOUS_CHEMICALS_ENTERPRISES = $HOST + '/hcstms/client/company-hcs-items/item'
-export const MDM_DELETE_HAZARDOUS_CHEMICALS_ENTERPRISES = $HOST + '/hcstms/client/company-hcs-items/batch'
-
-// 杞Щ鑱斿崟绠$悊
-export const MDM_GET_HWSTRANSFER_LIST = $HOST + '/hcstms/client/hws-transfer-order/pager'
-export const MDM_GET_HWSTRANSFER_DETAIL = $HOST + '/hcstms/client/hws-transfer-order/id/{$hwsTransferOrderId}'
-export const MDM_ALL_HWSTRANSFER = $HOST + '/hcstms/client/hws-transfer-order/item'
-export const MDM_DELETE_HWSTRANSFER = $HOST + '/hcstms/client/hws-transfer-order/batch'
-// 鏍规嵁鎵胯繍鍟唅d鏌ヨ杞﹂噺鏁版嵁
-export const MDM_GET_HWSTRANSFER_VEHICLES_DETAIL = $HOST + '/hcstms/client/vehicles/list'
-
-// 鍗卞簾杩愯緭棣栭〉
-export const HWS_GET_TRANSPORTATION = $HOST + '/hcstms/client/statistics/hws/transportation'
-export const HWS_GET_TRANSFER_TREND = $HOST + '/hcstms/client/statistics/hws/trend'
-export const HWS_GET_KIND = $HOST + '/hcstms/client/statistics/hws/kind'
-export const HWS_GET_SGIS = $HOST + '/hcstms/data/hws-sgis/groupByOrgCode'
-
-// 缁煎悎鏌ヨ
-export const TMM_GET_ACCESS = $HOST + '/hcstms/client/organization/link/pager'
-export const TMM_GET_CAR = $HOST + '/hcstms/client/company-resource-lib/transport/pager'
-export const TMM_GET_BUSINESS = $HOST + '/hcstms/client/company-resource-lib/transport/pager'
-export const TMM_GET_ALERT = $HOST + '/hcstms/client/alarm/vehicle/statistics/pager'
-export const TMM_GET_LEVEL = $HOST + '/hcstms/client/company-resource-lib/qualification/pager'
diff --git a/src/api/host.js b/src/api/host.js
deleted file mode 100644
index 952df8f..0000000
--- a/src/api/host.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * 鏈嶅姟HOST瀹氫箟
- */
-export const $HOST = process.env.VUE_APP_API_HOST
-// map鏈嶅姟
-export const $HOST_MAP_SERVICE = process.env.VUE_APP_MAP_SERVICE
diff --git a/src/api/index.js b/src/api/index.js
index ebe4694..5654a60 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,4 +1,7 @@
-import * as map from './map'
-import * as app from './app'
+import * as mapApi from './mapApi'
+import * as mapUrl from './mapUrl'
 
-export default Object.assign({}, map, app)
+export default {
+    mapApi,
+    mapUrl
+}
diff --git a/src/api/map.js b/src/api/map.js
deleted file mode 100644
index d09fe71..0000000
--- a/src/api/map.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { $HOST } from './host'
-
-/**
- * 妗嗘灦鐢╝pi,涓嶇敤care,鎵撳寘鐢熶骇鐜鐨勫満鏅嚜鍔ㄥ幓闄�
- *
- * API鍛藉悕瑙勫垯
- * {妯″潡鍚峿_{璇锋眰鏂规硶}_{鍏蜂綋涓氬姟鍔熻兘鎻忚堪}_{缁撴瀯鎻忚堪}
- *
- * {妯″潡鍚峿锛�
- *  渚嬪锛歟mdm emew
- * {璇锋眰鏂规硶}锛�
- *  1.涓�涓猘pi瀵瑰簲涓�涓姹傛柟娉�
- *    渚嬪 get post delete put
- *  2.涓�涓猘pi瀵瑰簲澶氫釜璇锋眰鏂规硶 // todo 濡備綍鑳界湅鍑烘槸浠�涔堣姹�
- *    鈶� get post delete put =銆� all
- *    鈶� post delete put =銆� pdp
- *    鈶� post delete=銆� pd
- *    鈶� delete put =銆媎p
- *    鈶� get post delete => gpd
- *
- * {鍏蜂綋涓氬姟鍔熻兘鎻忚堪}:
- *
- * {缁撴瀯鎻忚堪}:
- *  杩斿洖澶氭潯鏁版嵁鐢� list
- *  杩斿洖涓�鏉℃暟鎹敤 detail 鎴栨槸 one
- *
- */
-
-// map鍦板浘
-export const MAP_GET_TRANSPORTATION = $HOST + '/hcstms/client/hws-statistics/transportation/getBySector'
-export const MAP_GET_TRANSFER_TREND = $HOST + '/hcstms/client/hws-statistics/trend/groupBySector'
-export const MAP_GET_KIND = $HOST + '/hcstms/client/hws-statistics/stats/groupBySector?orgSector='
-export const MAP_GET_SGIS = $HOST + '/hcstms/data/hws-sgis/groupByOrgCode'
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 555d1c5..e7ebbc3 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -1,125 +1,14 @@
-import $http from '@utils/axios'
-import * as Service from './services'
+// import $http from '@utils/axios'
+// import * as Service from './services'
 // const $HOST = 'http://10.238.221.113'
 // 娴嬭瘯鐜IP锛歨ttp://10.238.221.113
-export default {
 
-    /** **************** 涓�銆佽椹惰矾寰勭鐞嗘帴鍙o細*****************/
-    // 1銆� 鍒嗛〉鏌ヨ琛岄┒璺緞鏁版嵁
-    getTravelPath(data) {
-        return $http.get(Service.HcstmsClientHwsTravelPathPager, data)
-    },
-    // 2.鏍规嵁ID鏌ヨ琛岄┒璺緞鏁版嵁 hwsTravelPathId
-    getTravelPathByID(id) {
-        return $http.get(Service.HcstmsClientHwsTravelPathId + id, {})
-        // return $http.get($HOST + '/hcstms/client/hws-travel-path/id/', data)
-    },
-    // 3. 鑾峰彇杞﹁締鍜岃埞鑸朵俊鎭暟鎹� transType  carriersName
-    getTravelPathTransInfo(data) {
-        return $http.get(Service.HcstmsClientHwsTravelPathGetTransInfo, data)
-    },
-    // 4. 鍒嗛〉鑾峰彇鍏宠仈杞﹁締淇℃伅鏁版嵁 current=1&size=10&hwsTravelPathId=21
-    getTravelPathFindVehiclePage(data) {
-        return $http.get(Service.HcstmsClientHwsTravePathFindVehiclePage, data)
-    },
-    // 5. 鍒嗛〉鑾峰彇鍏宠仈鑸硅埗淇℃伅鏁版嵁 current=1&size=10&hwsTravelPathId=18
-    getTravelPathFindShipsPage(data) {
-        return $http.get(Service.HcstmsClientHwsTravelPathFindShipsPage, data)
-    },
-    /** ******************************* 浜屻�佽椹惰矾寰勬彁閱掓帴鍙o細*********************************/
-    // 1.鍒嗛〉鏌ヨ琛岄┒璺緞鎻愰啋鏁版嵁 current=1&size=10
-    getTravelPathWarnPager(data) {
-        return $http.get(Service.HcstmsClientTravelPathWarnPager, data)
-    },
-    // 2.娣诲姞琛岄┒璺緞鎻愰啋鏁版嵁 transNumber  transType  hwsTravelPathName  warnReason  enterTime
-    postTravelPathItem(data) {
-        return $http.post(Service.HcstmsClientTravelPathItem, data)
-    },
 
-    /* ********************************   涓夈�佺粍缁囨満鏋勬帴鍙o細*********************************/
-    // 1銆佹牴鎹澘鍧楃紪鐮佹煡璇紒涓氬垪琛ㄤ俊鎭帴鍙� sector=1111& serviceType=1111
-    getOrganizationCompanyList(data) {
-        return $http.get(Service.GetOrganizationCompanyList, data)
-    },
-    /*  ******************************** 鍥涖�佹�婚儴-鍗卞寲鍝侀椤垫帴鍙o細*********************************/
-    // 1銆佹煡璇㈠湪閫旇浇鍏枫�佸綋鏃ヨ繍閲忋�佸綋鏃ヨ繍鍗曘�侀璀︽暟閲忔帴鍙� sector=111&orgCode=1111
-    getStatistics(data) {
-        return $http.get(Service.GetStatistics, data)
-    },
-    // 2銆佹煡璇㈡澘鍧楃殑杞﹁締鏈�鏂颁綅缃俊鎭� ?sector=111&orgCode=1111
-    getVehiclePositionReal(data) {
-        return $http.get(Service.GetVehiclePositionReal, data)
-    },
-    // 3銆佹煡璇㈣溅杈嗗巻鍙茶建杩逛俊鎭� ?vehicleNumber =111&queryDate =2020-11-20
-    getVehiclePositionHistory(data) {
-        return $http.get(Service.GetVehiclePositionHistory, data)
-    },
-    // 4銆佽溅杈嗘帴鍏ユ儏鍐电粺璁℃帴鍙�
-    getStatisticsVehiclePosition(data) {
-        return $http.get(Service.GetStatisticsVehiclePosition, data)
-    },
-    // 5銆佹姤璀︾骇鍒粺璁℃帴鍙� startDate endDate
-    getStatisticsAlarmTrend(data) {
-        return $http.get(Service.GetStatisticsAlarmTrend, data)
-    },
-    // 6銆佹姤璀︿簨浠�(澶х被)缁熻鎺ュ彛  startDate endDate
-    getStatisticsAlarmEventType(data) {
-        return $http.get(Service.GetStatisticsAlarmEventType, data)
-    },
-    // 7銆佹澘鍧楁姤璀︾粺璁℃帴鍙� startDate endDate
-    getStatisticsVehicleAlarm(data) {
-        return $http.get(Service.GetStatisticsVehicleAlarm, data)
-    },
-
-    /* ******************************** 浜斻�佺患鍚堢洃鎺ч椤�-鍗卞寲鍝侊細******************************** */
-    // 1銆佹牴鎹溅杈嗙姸鎬佹煡璇㈣溅杈嗕俊鎭� 鏍规嵁杞﹁締鐘舵��(姝e父銆佹姤璀︺�佺绾�)鏌ヨ杩愬崟杞﹁締浣嶇疆淇℃伅 orgSector orgCode vehicleStatus
-
-    getTransOrderVehiclePosition(data) { // todo 杩欓噷鐨勬帴鍙i厤缃病鏈夌悊鏄庣櫧
-        return $http.get(Service.vehiclePosition, data)
-        // return $http.get($HOST + '/hcstms/client/trans-order/vehicle/position', data)
-    },
-    // 2銆佹煡璇㈠嵄鍖栧搧鍦ㄩ�旇溅杈嗐�佸綋鏃ヨ繍閲忋�佸綋鏃ヨ繍鍗曘�侀璀︽暟閲忔帴鍙� 鎺ュ彛鍜屾�婚儴-鍗卞寲鍝侀椤电1涓帴鍙d竴鏍�
-
-    // 3銆佸垎椤垫煡璇㈠嵄鍖栧搧杩愬崟淇℃伅 transNo=111&carrierName=1111&transMode=1&vehicleNo=111&orderState=1
-    // transNo carrierName transMode vehicleNo orderState size current
-    getTransOrderlist(data) { // todo 杩欓噷鐨勬帴鍙i厤缃病鏈夌悊鏄庣櫧
-        return $http.get(Service.HcstmsClientTransOrderPager, data)
-        // return $http.get($HOST + '/hcstms/client/trans-order/pager', data)
-    },
-
-    getTransOrderlists(data) { // todo 杩欓噷鐨勬帴鍙i厤缃病鏈夌悊鏄庣櫧
-        return $http.get(Service.HcstmsClientTransOrderPagers, data)
-        // return $http.get($HOST + '/hcstms/client/trans-order/pager', data)
-    },
-
-    /* ********************************   鍏�� 瀹夊叏棰勮鎶ヨ锛�******************************** */
-    // 1銆佹牴鎹姤璀﹀ぇ灏忕被銆佺骇鍒煡璇㈡姤璀︿俊鎭� ?alarmCategory=1&alarmType=1&alarmlevel=3
-    getVehicleAlarmList(data) {
-        return $http.get(Service.HcstmsClientAlarmVehicleRealPager, data)
-        // return $http.get($HOST + '/hcstms/client/vehicle/alarm/list', data)
-    },
-    // 2銆佹姤璀︽暟閲忕粺璁℃帴鍙� startDate:String  endDate:String  orgCode:String  orgSector:String
-    getAlarmVehicleReal(data) {
-        return $http.get(Service.HcstmsClientAlarmVehicleRealPager, data)
-    },
-    // 3銆佹牴鎹溅鐗屽彿鏌ヨ杞﹁締鏈�鏂拌建杩逛俊鎭帴鍙� ?vehicleNumber =111
-    getRealVehiclePosition(data) {
-        return $http.get(Service.HcstmsClientPositionVehicleRealVehiclePosition, data)
-    },
-    // 4銆佹牴鎹溅鐗屽彿鏌ヨ杩愬崟(杩愯緭涓�)鎺ュ彛 ?vehicleNo=3&orderState=
-    getTransOrderList(data) {
-        return $http.get(Service.HcstmsClientTransorderList, data)
-    },
-    // 5銆佹牴鎹溅鐗屽彿鏌ヨ瀹炴椂鎶ヨ淇℃伅鎺ュ彛 ?vehicleNo=娌狣86519
-    getAlarmVehicleRealDetail(data) {
-        return $http.get(Service.HcstmsClientAlarmVehicleRealDetail, data)
-    },
-
-    /*  ******************************** 涓冦�佸嵄搴熻繍杈撻椤碉細******************************** */
-    // 1銆佹煡璇㈠湪閫旇浇鍏枫�佽浆绉婚噺銆佽浆绉诲崟鏁版嵁 orgSector orgCode
-    getStatisticsSgisGroupByOrgCode(data) {
-        // return $http.get($HOST + '/hcstms/client/hws-statistics/sgis/groupByOrgCode', data)
-        return $http.get(Service.HcstmsClientStatisticsHwsSgis, data)
-    }
-
+/**
+ * 璇ユ柟娉曢厤缃�
+ */
+class MapAPI{
+    
 }
+
+export default new MapAPI()
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
new file mode 100644
index 0000000..c337552
--- /dev/null
+++ b/src/api/mapUrl.js
@@ -0,0 +1,10 @@
+/**
+ * 璇ユ枃浠堕厤缃帴鍙g殑URL鍦板潃 
+ */ 
+class ApiURLs{
+    constructor(){
+        this.APIURL_HELLOWORLD = 'http://www.baidu.com'
+    }
+}
+
+export default new ApiURLs()
diff --git a/src/api/services.js b/src/api/services.js
deleted file mode 100644
index a2426ed..0000000
--- a/src/api/services.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import { $HOST } from './host'
-
-const $TESTHOST = $HOST
-
-let $MAIN_HOST = $TESTHOST
-// let $MAIN_HOST = $HOST
-
-export const WAYBILL = $HOST + '/hcstms/client/trans-order/list'
-export const FENCELIST = $HOST + '/route/select'
-// 浜嬩欢绫诲瀷 /hcstms/client/hcs-statistics/alarm/eventType
-export const eventTypeList = $TESTHOST + '/hcstms/client/hcs-statistics/alarm/eventType'
-// 鏉垮潡缁熻 /hcstms/client/hcs-statistics/vehicle/alarm
-export const vehicleAlarmList = $TESTHOST + '/hcstms/client/hcs-statistics/vehicle/alarm'
-
-/** * 椤堕儴闈㈡澘 缁熻淇℃伅 */
-// 鍦ㄩ�旇繍杞藉伐鍏锋�绘暟
-// export const CountRoadVehicle = $HOST + '/warning/warningStats/getCountRoadVehicle'
-//  褰撴棩杩愰噺缁熻
-// export const CountDayVolume = $HOST + '/warning/warningStats/getCountDayVolume'
-// 褰撴棩杩愬崟缁熻
-// export const CountDayWaybill = $HOST + '/warning/warningStats/getCountDayWaybill'
-// 棰勮鎬绘暟
-// export const CountTotal = $HOST + '/warning/warningStats/getCountTotal'
-
-// 鏂版帴鍙�
-export const Summary = $TESTHOST + '/hcstms/client/hws/statistics'
-// 杞﹁締鎺ュ叆鎯呭喌缁熻鎺ュ彛
-export const VehicleAccessStatisticsInterface = $TESTHOST + '/hcstms/client/hcs-statistics/vehicle/position'
-// 鍦ㄩ�旇溅杈�
-export const SysAuthCode = '0'
-export const WarningInit = $HOST + '/warning/rewrite/transOrder/getWarningInit'
-// 杞﹁締鎶ヨ淇℃伅鏌ヨ鎺ュ彛
-export const alarmInfo = $TESTHOST + '/hcstms/client/vehicle/alarm/list'
-
-// 鍗卞寲浼佷笟鎺ュ彛
-export const CompanyList = $TESTHOST + '/hcstms/client/organization/company/list'
-// 杞﹁締鎺ュ彛
-export const vehiclePosition = $TESTHOST + '/hcstms/client/trans-order/vehicle/position'
-
-// 浼佷笟瀹屾垚杞Щ閲�
-export const CorpTransVolumeUrl = $HOST + '/hcstms/client/hws-statistics/sgis/groupByOrgCode'
-// 鍒嗛〉鏌ヨ鍗卞寲鍝佽繍鍗曚俊鎭�
-export const TransOrder = $TESTHOST + '/hcstms/client/trans-order/list'
-
-export const alarmTrend = $TESTHOST + '/hcstms/client/hcs-statistics/alarm/trend'
-
-// 鏂扮増API鍦板潃閰嶇疆 20201126鐗�  --鐜嬮攼
-/* ********************************* 1銆佽椹惰矾寰勭鐞嗘帴鍙�    *********************************** */
-// 1.1. 鍒嗛〉鏌ヨ琛岄┒璺緞鏁版嵁
-export const HcstmsClientHwsTravelPathPager = $MAIN_HOST + '/hcstms/client/hws-travel-path/pager'
-// 1.2. 鏍规嵁ID鏌ヨ琛岄┒璺緞鏁版嵁
-export const HcstmsClientHwsTravelPathId = $MAIN_HOST + '/hcstms/client/hws-travel-path/id/'
-// 1.3. 鑾峰彇杞﹁締鍜岃埞鑸朵俊鎭暟鎹�
-export const HcstmsClientHwsTravelPathGetTransInfo = $MAIN_HOST + '/hcstms/client/hws-travel-path/getTransInfo'
-// 1.4. 鍒嗛〉鑾峰彇鍏宠仈杞﹁締淇℃伅鏁版嵁
-export const HcstmsClientHwsTravePathFindVehiclePage = $MAIN_HOST + '/hcstms/client/hws-travel-path/findVehiclePage'
-// 1.5. 鍒嗛〉鑾峰彇鍏宠仈鑸硅埗淇℃伅鏁版嵁
-export const HcstmsClientHwsTravelPathFindShipsPage = $MAIN_HOST + '/hcstms/client/hws-travel-path/findShipsPage'
-
-/* ********************************* 2銆佽椹惰矾寰勬彁閱掓帴鍙�     *********************************** */
-// 2.1.鍒嗛〉鏌ヨ琛岄┒璺緞鎻愰啋鏁版嵁
-export const HcstmsClientTravelPathWarnPager = $MAIN_HOST + '/hsctms/client/travel-path-warn/pager'
-// 2.2.娣诲姞琛岄┒璺緞鎻愰啋鏁版嵁
-export const HcstmsClientTravelPathItem = $MAIN_HOST + '/hcstms/client/hws-travel-path/item'
-
-/* ********************************* 3銆佺粍缁囨満鏋勬帴鍙o細*********************************/
-export const GetOrganizationCompanyList = $MAIN_HOST + '/hcstms/client/organization/company/list'
-
-/*  ******************************** 4銆佹�婚儴-鍗卞寲鍝侀椤垫帴鍙o細*********************************/
-// 1銆佹牴鎹澘鍧楃紪鐮佹煡璇紒涓氬垪琛ㄤ俊鎭帴鍙� orgSector orgCode queryAlarm
-export const GetStatistics = $MAIN_HOST + '/hcstms/client/statistics/hcs/sgis'
-// 2銆佹煡璇㈡澘鍧楃殑杞﹁締鏈�鏂颁綅缃俊鎭�  orgSector orgCode
-export const GetVehiclePositionReal = $MAIN_HOST + '/hcstms/client/position/vehicle/real'
-// 3銆佹煡璇㈣溅杈嗗巻鍙茶建杩逛俊鎭� ?vehicleNumber =111&queryDate =2020-11-20
-export const GetVehiclePositionHistory = $MAIN_HOST + '/hcstms/client/position/vehicle/history/pager'
-// 4銆佽溅杈嗘帴鍏ユ儏鍐电粺璁℃帴鍙�
-export const GetStatisticsVehiclePosition = $MAIN_HOST + '/hcstms/client/statistics/hcs/position/vehicle/sector'
-// 5銆佽溅杈嗘姤璀︾骇鍒粺璁℃帴鍙� startDate endDate
-export const GetStatisticsAlarmTrend = $MAIN_HOST + '/hcstms/client/statistics/hcs/alarm/vehicle/level'
-// 6銆佹姤璀︿簨浠�(澶х被)缁熻鎺ュ彛  startDate endDate
-export const GetStatisticsAlarmEventType = $MAIN_HOST + '/hcstms/client/statistics/hcs/alarm/vehicle/category'
-// 7銆佹澘鍧楁姤璀︾粺璁℃帴鍙� startDate endDate
-export const GetStatisticsVehicleAlarm = $MAIN_HOST + '/hcstms/client/statistics/hcs/alarm/vehicle/sector'
-// 8銆丼GIS鍦板浘鏌ヨ涓嶅悓棰滆壊杞﹁締鎺ュ彛 鍚�5.2鎺ュ彛
-
-/*  ******************************** 5銆佹�婚儴-鍗卞寲鍝侀椤垫帴鍙o細*********************************/
-// 1銆佹煡璇㈠嵄鍖栧搧鍦ㄩ�旇溅杈嗐�佸綋鏃ヨ繍閲忋�佸綋鏃ヨ繍鍗曘�侀璀︽暟閲忔帴鍙� ?transNo=111&carrierName=1111&transMode=1&vehicleNo=111&orderState=1
-export const HcstmsClientStatisticsHcsSgis = $MAIN_HOST + '/hcstms/client/statistics/hcs/sgis'
-// 2銆佸垎椤垫煡璇㈠嵄鍖栧搧杩愬崟鍙婅溅杈嗕俊鎭�  ?transNo=111&carrierName=1111&transMode=1&vehicleNo=111&orderState=1
-export const HcstmsClientTransOrderPager = $MAIN_HOST + '/hcstms/client/trans-order/pager'
-export const HcstmsClientTransOrderPagers = $MAIN_HOST + '/hcstms/client/trans-order/pagers'
-
-/* ********************************* 6銆佸畨鍏ㄩ璀︽姤璀�     *********************************** */
-// 1. 鏍规嵁鎶ヨ澶у皬绫汇�佺骇鍒煡璇㈡姤璀︿俊鎭�
-export const HcstmsClientAlarmVehicleRealPager = $MAIN_HOST + '/hcstms/client/alarm/vehicle/real/pager'
-// 2. 鎶ヨ浜嬩欢(澶х被)缁熻鎺ュ彛
-export const HcstmsClientStatisticsHcsAlarmVehicleCategory = $MAIN_HOST + '/hcstms/client/statistics/hcs/alarm/vehicle/category'
-// 3. 鏍规嵁杞︾墝鍙锋煡璇㈣溅杈嗘渶鏂拌建杩逛俊鎭帴鍙�
-export const HcstmsClientPositionVehicleRealVehiclePosition = $MAIN_HOST + '/hcstms/client/position/vehicle/real/vehiclePosition'
-// 4. 鏍规嵁杞︾墝鍙锋煡璇㈣繍鍗�(杩愯緭涓�)鎺ュ彛
-export const HcstmsClientTransorderList = $MAIN_HOST + '/hcstms/client/trans-order/list'
-// 5. 鏍规嵁杞︾墝鍙锋煡璇㈠疄鏃舵姤璀︿俊鎭帴鍙�
-export const HcstmsClientAlarmVehicleRealDetail = $MAIN_HOST + '/hcstms/client/alarm/vehicle/real/detail'
-
-/* ********************************* 7銆佹�婚儴-鍗卞簾杩愯緭棣栭〉 *********************************** */
-// 1. 鏌ヨ鍦ㄩ�旇浇鍏枫�佽浆绉婚噺銆佽浆绉诲崟鏁版嵁
-export const HcstmsClientStatisticsHwsSgis = $MAIN_HOST + '/hcstms/client/statistics/hws/sgis'
diff --git a/src/base/BaseLayer.js b/src/base/BaseLayer.js
new file mode 100644
index 0000000..aae9cad
--- /dev/null
+++ b/src/base/BaseLayer.js
@@ -0,0 +1,136 @@
+import L from 'leaflet'
+
+/**
+ * 鍩虹鍥惧眰绫伙紝 鍖呭惈鍥惧眰鐨勫垱寤猴紝鍔犺浇鍜屾竻闄ょ瓑鍩虹鍔熻兘銆�
+ */
+class BaseLayer {
+    LOAD_TYPE_JSON = 'json' // GeoJson鍔犺浇鏂规硶
+    LOAD_TYPE_URL = 'url' // ajax鍔犺浇鏂规硶
+    /**
+     * 鍒濆鍖栧浘灞�
+     * @param {*} options 
+     * <code>
+     * {
+     *   map : '鍦板浘寮曠敤'
+     *   params : 鍦板浘鍔犺浇鍙傛暟
+     *   
+     *   code : 鍥惧眰缂栧彿
+     *   name : 鍥惧眰鍚嶇О
+     *   loadType : 鍥惧眰鍔犺浇绫诲瀷锛� json鎴栬�卽rl
+     *   url : 璇锋眰鏁版嵁鐨剈rl鍦板潃
+     *   data : 鍒濆鐨凣eoJson鏁版嵁
+     * }
+     * </code>
+     */
+    constructor(options){
+        this.map = options.map // 蹇呭~椤�
+        this.params = options.params // 蹇呭~椤癸紝鍔犺浇鍥惧眰鏁版嵁鐨勫弬鏁帮紝 瀛愮被闇�瑕侊紝鍙互鏄瘂}绌哄璞�
+
+        this.layerCode = options.code || '' // 鍥惧眰缂栫爜
+        this.layerName = options.name || '' // 鍥惧眰鍚嶇О
+        this.layerLoadType = options.loadType || BaseLayer.LOAD_TYPE_JSON // 鍥惧眰鍔犺浇绫诲瀷
+        this.layerUrl = options.url || '' // 鏁版嵁璇锋眰鍦板潃
+        this.layerData = options.data || '' // 鍘熷GeoJson鏁版嵁
+
+        this.layerHandler = null // 鍥惧眰寮曠敤
+
+        this.features = [] // 鎵�鏈夎鏋勫缓鍑烘潵鐨凢eatures
+        this.featuresArray = [] // 鎵�鏈夎鏋勫缓鍑烘潵鐨凢eatures淇濆瓨澶囦唤锛岄伩鍏嶅啀娆¤鍔犺浇銆� load鏂规硶鍏ㄧ敓鍛藉懆鏈熷彧琚皟鐢ㄤ竴娆�
+
+        this.featuresGroup = new Map() // 瀵瑰姞杞界殑鏁版嵁杩涜鍒嗙粍锛屼究浜庡悗缁帶鍒躲�� 浣嗗湪鏁版嵁鍒濆鍖栨椂锛岄渶瑕佹墜鍔ㄥ垎缁勩�傚惁鍒欙紝鍒嗙粍
+
+        this._init(this.map, this.params)
+    }
+
+    /**
+     * 鍒濆鍖栧熀鏈殑鍥惧眰骞跺姞杞藉埌map涓�
+     */
+    _init(map){
+        this.layerHandler = L.layerGroup().addTo(map)
+    }
+
+    /**
+     * 鍔犺浇鏁版嵁
+     * @param boolean isAddToMap 鏄惁鐩存帴灏唌arker娣诲姞鍒板湴鍥句腑, 榛樿鏄姞杞�
+     */
+    load(isAddToMap = true){
+        if(this.layerHandler) { // 榛樿锛屽簲璇ュ彧浼氬姞杞戒竴娆★紝浣嗘槸濡傛灉鏈夌殑鍥惧眰瑕佸畾鏃跺埛鏂帮紝鍒欓渶瑕佸厛娓呴櫎鍘熷浘灞傜殑鏁版嵁
+            this.layerHandler.clearLayers()
+        }
+
+        let features = [] 
+
+        // 渚濇嵁鍔犺浇鏂瑰紡鍔犺浇鏁版嵁
+        if(this.layerLoadType === BaseLayer.LOAD_TYPE_JSON) {
+            this.features = this._loadFromJSON()
+            
+        }else if(this.layerLoadType === BaseLayer.LOAD_TYPE_URL) {
+            this.features = this._loadFromURL()
+        }else {
+            console.log('鍥惧眰銆�'+this.layerCode+'_'+this.layerName+'銆戠殑'+this.loadType+'鍔犺浇鏂瑰紡鏆備笉鏀寔锛�')
+        }
+
+        if(isAddToMap){ // 娣诲姞鍒板湴鍥句腑
+            this.layerHandler.addLayer(features)
+        }
+    }
+
+    _loadFromJSON(){
+        console.log('璇ユ柟娉曟槸鎶借薄鏂规硶锛屽湪瀛愮被灏氭湭瀹炵幇锛�')
+    }
+    _loadFromURL(){
+        console.log('璇ユ柟娉曟槸鎶借薄鏂规硶锛屽湪瀛愮被灏氭湭瀹炵幇锛�')
+    }
+
+    /**
+     * 鏄剧ず鍥惧眰锛� 濡傛灉groups鍙傛暟锛屽垯鍙樉绀篻roup瀵瑰簲鐨勫浘灞�
+     * @param {} groups 鏁扮粍锛屽厓绱犱箣涓巐ayerGroups閿�煎搴斻��
+     */
+    show(groups){
+        if(typeof groups !== 'undefined') { // 濡傛灉浼犻�掍簡groups锛� 鍒欐寜鍒嗙粍鐨勮姹傚姞杞藉浘灞�
+            if(this.layerHandler) {
+                for(let i = 0, len = groups.length; i < len; i++) {
+                    let gFeaturesArray = this.featuresGroup.get(groups[i])
+                    if(gFeaturesArray || gFeaturesArray.length > 0){
+                        gFeaturesArray.forEach(element => {
+                            this.layerHandler.removeLayer(element) // 閬垮厤琚噸澶嶅姞杞�
+                            this.layerHandler.addLayer(element)
+                        });
+                    }
+                }
+            }
+        } else { // 鍚﹀垯鍔犺浇鍏ㄩ儴鐨勬暟鎹�
+            if(this.layerHandler) {
+                this.layerHandler.clearLayers()
+                for(let i = 0, len = this.featuresArray.length; i < len; ++i){
+                    this.layerHandler.addLayer(this.featuresArray[i])
+                }
+            }
+        }
+    }
+
+    /**
+     * 闅愯棌鍥惧眰锛� 濡傛灉groups鍙傛暟锛屽垯鍙殣钘廹roup瀵瑰簲鐨勫浘灞�
+     * @param {} groups 鏁扮粍锛屽厓绱犱箣涓巐ayerGroups閿�煎搴斻�� 濡傛灉鍥惧眰鍦ㄥ垵濮嬪姞杞芥椂锛屾病鏈夊鏁版嵁鍒嗙粍锛岃鏂规硶涓嶄細鏈夋晥鏋溿��
+     */
+    hide(groups){
+        if(typeof groups !== 'undefined') { // 濡傛灉浼犻�掍簡groups锛� 鍒欐寜鍒嗙粍鐨勮姹傚姞杞藉浘灞�
+            if(this.layerHandler) {
+                for(let i = 0, len = groups.length; i < len; i++) {
+                    let gFeaturesArray = this.featuresGroup.get(groups[i])
+                    if(gFeaturesArray || gFeaturesArray.length > 0){
+                        gFeaturesArray.forEach(element => {
+                            this.layerHandler.removeLayer(element)
+                        });
+                    }
+                }
+            }
+        } else { // 鍚﹀垯鍗歌浇鍏ㄩ儴鐨勬暟鎹�
+            if(this.layerHandler) {
+                this.layerHandler.clearLayers()
+            }
+        }
+    }
+}
+
+export default BaseLayer
diff --git a/src/components/helpers/BasemapHelper.js b/src/components/helpers/BasemapHelper.js
index d608cf8..ddd6c32 100644
--- a/src/components/helpers/BasemapHelper.js
+++ b/src/components/helpers/BasemapHelper.js
@@ -1,28 +1,37 @@
+import AjaxUtils from '@/utils/AjaxUtils'
+import CommonLayerLoad from '../mapmodules/CommonLayerLoad'
 /**
  * 搴曞浘绠$悊鍔╂墜锛岃礋璐e簳鍥惧垱寤哄強寮�鍏�
  */
-function BasemapHelper(map, L) {
-    this.map = map
-    this.L = L
-    this.basemapList = []
+class BasemapHelper{
+    constructor(map, L) {
+        this.map = map
+        this.L = L
+        this.basemapList = []
+        this.basemapMap = new Map()
+        this.basemapLayerGroup = L.layerGroup().addTo(map)
+    }
 
     /**
      * 璇ユ柟娉曡礋璐e悇绉嶅簳鍥惧姞杞藉埌鍦板浘涓�
      * @param map
      * @param defBasemapName 鍒濆鍖栧畬鎴愬悗锛岄粯璁ゆ樉绀虹殑鍥惧眰
      */
-    this.initBasemap = (map, defBasemapName) => {
-        console.log(map, defBasemapName)
-        // todo 鍒涘缓瀹屼互鍚庯紝鎶婂浘灞傞兘鏀惧埌basemapList瀵硅薄淇濆瓨璧锋潵锛屾柟渚垮叾浠栨帴鍙h皟鐢�
+    initBasemap = (mapConfig, isIntranet) => {
+        if(isIntranet) {
+            this._getToken(mapConfig);
+        }else {
+            //
+        }
 
-        return null
+        return this.basemapMap
     }
 
     /**
      * 鑾峰彇鎵�鏈夌殑搴曞浘鍒楄〃
      * @returns {null} 缁撴瀯锛歔{鍚嶇О, 鍥惧眰寮曠敤}]
      */
-    this.getBasemapList = (map) => {
+    getBasemapList = (map) => {
         console.log(map)
         return null
     }
@@ -32,7 +41,7 @@
      * @param map 缁撴瀯锛歔{鍚嶇О, 鍥惧眰寮曠敤}]
      * @param name 鍚嶇О
      */
-    this.getBasemap = (map, name) => {
+    getBasemap = (map, name) => {
         console.log(map, name)
     }
 
@@ -42,7 +51,7 @@
      * @param layer 寰呮樉绀哄浘灞傚紩鐢�
      * @param isHideOthers 鏄惁鍏堝叧闂叾浠栧浘灞傦紝榛樿鏄痶rue
      */
-    this.showBasemap = (map, layer, isHideOthers) => {
+    showBasemap = (map, layer, isHideOthers) => {
         console.log(map, layer, isHideOthers)
     }
 
@@ -51,9 +60,24 @@
      * @param map 鍦板浘瀵硅薄
      * @param layer 寰呭叧闂浘灞傚紩鐢�
      */
-    this.hideBasemap = (map, layer) => {
+    hideBasemap = (map, layer) => {
         console.log(map, layer)
     }
+
+    _getToken = (mapConfig) => {
+        let params = mapConfig.TokenConfig
+        AjaxUtils.GetDataAsynByUrl(params.url, params.option, (token) => {
+            this._showTDT(token)
+        })
+    }
+
+    _showTDT = (token) => {
+        let commonLayerLoad = new CommonLayerLoad()
+        const imgMapm = commonLayerLoad.loadIntranetImgMap(token)
+        const imgMapa = commonLayerLoad.loadIntranetImgMapCia(token)
+        this.basemapLayerGroup.addLayer(imgMapm)
+        this.basemapLayerGroup.addLayer(imgMapa)
+    }
 }
 
 export default BasemapHelper
diff --git a/src/components/helpers/LayerHelper.js b/src/components/helpers/LayerHelper.js
deleted file mode 100644
index 326da20..0000000
--- a/src/components/helpers/LayerHelper.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * 鍒涘缓鍥惧眰鐩稿叧鐨勭被
- */
-import L from 'leaflet'
-class LayerHelper {
-    loadTileLayer(options) {
-        return L.tileLayer(options.url + '?x={x}&y={y}&z={z}', options)
-    }
-}
-export default LayerHelper
diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
new file mode 100644
index 0000000..2ca252a
--- /dev/null
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -0,0 +1,85 @@
+/**
+ * 鍒涘缓鍥惧眰鐩稿叧鐨勭被
+ */
+import L from 'leaflet'
+class ServiceLayerHelper {
+    constructor(options){
+        this.map = options.map
+        this.tileLayersMap = new Map()
+        this.tileLayersArray = []
+    }
+
+    /**
+     * 寰�鍦板浘涓姞鍏ヤ竴涓猼ile鏈嶅姟
+     * @param {}} options 
+     * @param {*} isAddToMap 
+     */
+    loadWmtsLayer(options, isAddToMap) {
+        const layer =L.tileLayer.wmts(options.url, {
+            layers: options.layers || 'all',//country
+            format: options.format || "image/png",
+            transparent: options.true || true,
+            crs:options.crs || L.CRS.EPSG4326
+        });
+   
+        if(isAddToMap) {
+            layer.addTo(this.map)
+        }
+        this.tileLayersMap.put(options.name, layer)
+        this.tileLayersArray.push(layer)
+    }
+    /**
+     * 寰�鍦板浘涓姞鍏ヤ竴涓猈MS鏈嶅姟
+     * @param {}} options 
+     * @param {*} isAddToMap 
+     */
+    loadWmsLayer(options, isAddToMap) {
+        const layer =L.tileLayer.wms(options.url, {
+            layers: options.layers || 'all',//country
+            format: options.format || "image/png",
+            transparent: options.true || true,
+            crs:options.crs || L.CRS.EPSG4326
+        });
+   
+        if(isAddToMap) {
+            layer.addTo(this.map)
+        }
+        this.tileLayersMap.put(options.name, layer)
+        this.tileLayersArray.push(layer)
+    }
+
+    /**
+     * 寰�鍦板浘涓姞鍏ヤ竴涓猈MS鏈嶅姟
+     * @param {}} options 
+     * @param {*} isAddToMap 
+     */
+    loadTileLayer(options, isAddToMap) {
+        const layer =L.tileLayer(options.url, {
+            layers: options.layers || 'all',//country
+            format: options.format || "image/png",
+            transparent: options.true || true,
+            crs:options.crs || L.CRS.EPSG4326,
+            maxZoom: options.maxZoom || 21,
+            minZoom: options.minZoom || 1,
+            zoomOffset: options.zoomOffset || 0
+        });
+   
+        if(isAddToMap) {
+            layer.addTo(this.map)
+        }
+        this.tileLayersMap.put(options.name, layer)
+        this.tileLayersArray.push(layer)
+    }
+
+    hideTileLayer(name){
+        if(this.tileLayersMap){
+            let tileLayer = this.tileLayersMap.get(name)
+            this.map.removeLayer(tileLayer)
+        }
+    }
+
+    getTileLayers(){
+        return this.tilelayersArray
+    }
+}
+export default ServiceLayerHelper
diff --git a/src/components/mapmodules/CommonLayerLoad.js b/src/components/mapmodules/CommonLayerLoad.js
index 851529b..f42cd55 100644
--- a/src/components/mapmodules/CommonLayerLoad.js
+++ b/src/components/mapmodules/CommonLayerLoad.js
@@ -2,29 +2,30 @@
  * 鍔犺浇鍏叡鐨勫浘灞傦紝渚嬪鍥界晫锛岄搧璺紝钃濊壊鍦板浘绛夊浘灞�
  */
 import L from 'leaflet'
+
 import MapConfig from '@/conf/MapConfig'
-import LayerHelper from '@components/helpers/LayerHelper'
-import { $HOST } from '@/api/host'
 const tokenStr = 'tk=' + 'f1b72b5e7cb1175acddfa485f1bc9770' + '&'
 class CommonLayerLoad {
-     loadBlueMap() {
-        return L.tileLayer($HOST + '/server/ogcserver/whp_basemap_tile/wmts?x={x}&y={y}&z={z}', {
+    // 涓浗钃濊壊瑕嗙洊灞�
+    loadBlueMap() {
+        return L.tileLayer(MapConfig.BLUEMAP_HOST + '/server/ogcserver/whp_basemap_tile/wmts?x={x}&y={y}&z={z}', {
             maxZoom: 7,
             minZoom: 1,
             zoomOffset: 1
 
         })
     }
-     loadNormalMap() {
+    // 閬撹矾璺�
+    loadNormalMap() {
         return L.tileLayer('http://t0.tianditu.gov.cn/vec_c/wmts?' + tokenStr +
             'layer=cva&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
             maxZoom: 18,
             minZoom: 1,
             zoomOffset: 1
-
         })
     }
-     loadNormalMapa() {
+    // 閬撹矾鏍囨敞
+    loadNormalMapa() {
         return L.tileLayer('http://t0.tianditu.gov.cn/cva_c/wmts?' + tokenStr +
             'layer=cva&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
             maxZoom: 18,
@@ -33,7 +34,8 @@
 
         })
     }
-     loadImgMapm() {
+    // 褰卞儚鍥�
+    loadImgMapm() {
         return L.tileLayer('http://t0.tianditu.gov.cn/img_c/wmts?' + tokenStr +
             'layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
             maxZoom: 18,
@@ -41,7 +43,8 @@
             zoomOffset: 1
         })
     }
-     loadImgMapa() {
+    // 褰卞儚鏍囨敞
+    loadImgMapa() {
         return L.tileLayer('http://t0.tianditu.gov.cn/cia_c/wmts?' + tokenStr +
             'layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
             maxZoom: 18,
@@ -49,6 +52,7 @@
             zoomOffset: 1
         })
     }
+    // 涓煶鍖栧唴缃戝奖鍍忓浘
     loadIntranetImgMap(token) {
         return L.tileLayer('http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-image-globe/WMTS?token=' + token + '&' +
             'layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
@@ -57,24 +61,12 @@
             zoomOffset: 1
         })
     }
-
+    // 涓煶鍖栧唴缃戝奖鍍忓浘鏍囨敞
     loadIntranetImgMapCia(token) {
         return L.tileLayer('http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-label-image/WMTS?token=' + token + '&' +
             'layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
             maxZoom: 18,
             minZoom: 1,
-            zoomOffset: 1
-        })
-    }
-     loadGuoJie() {
-        return new LayerHelper().loadTileLayer({
-            url: MapConfig.mapConfig.ChinaGj,
-            zoomOffset: 1
-        })
-    }
-     loadRailWay() {
-        return new LayerHelper().loadTileLayer({
-            url: MapConfig.mapConfig.RailwayUrl,
             zoomOffset: 1
         })
     }
diff --git a/src/conf/MODE.js b/src/conf/MODE.js
deleted file mode 100644
index 4fb465d..0000000
--- a/src/conf/MODE.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// 甯搁噺
-const MODE_BIGSCREEN = 0
-const MODE_MONITOR = 1
-const MODE_ALARM = 2
-
-export default {
-    MODE_BIGSCREEN,
-    MODE_MONITOR,
-    MODE_ALARM
-}
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 8776d85..f1f4cb6 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,25 +1,33 @@
 锘縤mport * as L from 'leaflet'
-import { $HOST } from '@/api/host'
 
 let curWwwPath = window.document.location.href
 let pathname = window.document.location.pathname
 let pos = curWwwPath.indexOf(pathname)
 let HOST_URL = curWwwPath.substring(0, pos)
-const sconfig = {
-    // 'ip' : '10.246.151.116',
-    // 'port' : '8093',
-    'ip': '10.238.221.80',
-    'port': '8088',
-    'ifS': 'http',
-    'name': '/hcss'
-}
-// const DMHttpService='http://10.246.146.111/IPMSAPI/' // 娴嬭瘯
-// var DMHttpService1='http://10.246.151.16:8094/'
-const DMHttpService1 = sconfig.ifS + '://' + sconfig.ip + ':' + sconfig.port + sconfig.name + '/'
+// const sconfig = {
+//     // 'ip' : '10.246.151.116',
+//     // 'port' : '8093',
+//     'ip': '10.238.221.80',
+//     'port': '8088',
+//     'ifS': 'http',
+//     'name': '/hcss'
+// }
+
+// const DMHttpService1 = sconfig.ifS + '://' + sconfig.ip + ':' + sconfig.port + sconfig.name + '/'
 const GIS_URL = 'http://10.238.221.80:6080'
-/* const config = {
-    ArcGisApiService: 'http://10.246.146.111/DigitalSand'
-} */
+const BLUEMAP_HOST = 'http://xearth.cn:6288/'
+
+const mapOptions = {
+    crs: L.CRS.EPSG4326,
+    minZoom: 3,
+    maxZoom: 18,
+    center: [26, 104],
+    zoom: 3,
+    zoomControl: false,
+    attributionControl: false,
+    editable: true
+}
+
 const mapConfig = {
     IsLoadMapByToken: true, // 鏄惁閫氳繃token鍔犺浇鍦板浘
     showBaseMapType: 1, // 1鏄剧ず澶╁湴鍥撅紝2鏄剧ずarcgis鍦板浘
@@ -66,55 +74,8 @@
             isLoadMapByToken: false,
             url: 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-globe/MapServer'
         }],
- GeometryServer: GIS_URL + '/arcgis/rest/services/Utilities/Geometry/GeometryServer',
- FenceUrl: GIS_URL + '/arcgis/rest/services/fence',
-    ChinaGj: $HOST + '/server/ogcserver/whp_guojie/wmts',
-    RailwayUrl: $HOST + '/server/ogcserver/railway_network_tile/wmts'
-}
-
-const mapOptions = {
-    crs: L.CRS.EPSG4326,
-    minZoom: 3,
-    maxZoom: 18,
-    center: [26, 104],
-    zoom: 3,
-    zoomControl: false,
-    attributionControl: false,
-    editable: true
-}
-
-const layerNameNew = {
-    TransportEnterprise: 'T_Carrier', // 杩愯緭浼佷笟
-    Petrochemical: 'CHEMICAL_OIL_ENTERPRISE', // 鐐煎寲浼佷笟
-    Chemical: 'CHEMICAL_ENTERPRISE', // 鍖栧伐浼佷笟
-    Refinery: 'OIL_REFINING_ENTERPRISE', // 鐐兼补浼佷笟
-    SalesEnterprise: 'SALES_ENTERPRISE', // 閿�鍞紒涓�
-    Dock: 'WHARF', // 鐮佸ご
-    StoreHouse: 'Warehouse', // 浠撳簱
-    Sales: 'CHEMICAL_SALES_OUTLETS', // 鍖栭攢缁忚惀缃戠偣
-    Petroleum: 'CRUDE_OIL_DEPOT', // 鍘熸补娌瑰簱
-    ProductOil: 'PRODUCT_OIL_DEPOT', // 鎴愬搧娌规补搴�
-    LNGStation: 'LNG_RECEIVING_STATION', // LNG鎺ユ敹绔�
-    LNGStorage: 'LNG_TANK', // LNG鍌ㄧ綈
-    TrainStation: 'TrainStation', // 閾佽矾鑷杞︾伀杞︾珯
-    Railway: 'TrainWay', // 閾佽矾
-    TransportPath: 'TRANS_PATH', // 杩愯緭璺緞
-    TransportNode: 'TRANS_NODE_TOPOLOGY', // 杩愯緭鑺傜偣鎷撴墤
-    FillingStation: 'FillingStation', // 鍔犳补绔�
-    TransportWarning: '杩愯緭鐩戞帶',
-    TransportWaste: '鍗卞簾鐩戞帶',
-    Train: 'Train',
-    Truck: 'Truck',
-    Ship: 'Ship',
-    Warning: '缁煎悎棰勮',
-    Track: '鍘嗗彶杞ㄨ抗',
-    Weather: '澶╂皵棰勮',
-    WarningLayer: 'warning',
-    RainFall: 'RainFall',
-    WindAndTemperature: 'WindAndTemperature',
-    Dust: 'Dust',
-    FogWarning: 'FogWarning',
-    HazeLayer: 'HazeLayer'
+    GeometryServer: GIS_URL + '/arcgis/rest/services/Utilities/Geometry/GeometryServer',
+    FenceUrl: GIS_URL + '/arcgis/rest/services/fence',
 }
 
 const TokenConfig = {
@@ -127,115 +88,11 @@
         clientid: 'ref.' + HOST_URL// 鑾峰彇token鐨勫簲鐢ㄦ湇鍔″櫒鍦板潃
     }
 }
-const layerNames = {
-    TransportEnterprise: '杩愯緭浼佷笟',
-    Petrochemical: '鐐煎寲浼佷笟',
-    Chemical: '鍖栧伐浼佷笟',
-    Refinery: '鐐兼补浼佷笟',
-    SalesEnterprise: '閿�鍞紒涓�',
-    Dock: '鐮佸ご',
-    StoreHouse: '浠撳簱',
-    Sales: '鍖栭攢缁忚惀缃戠偣',
-    Petroleum: '鍘熸补娌瑰簱',
-    ProductOil: '鎴愬搧娌规补搴�',
-    LNGStation: 'LNG鎺ユ敹绔�',
-    LNGStorage: 'LNG鍌ㄧ綈',
-    TrainStation: '閾佽矾鑷杞︾伀杞︾珯',
-    Railway: '閾佽矾',
-    TransportPath: '杩愯緭璺緞',
-    TransportNode: '杩愯緭鑺傜偣鎷撴墤',
-    FillingStation: '鍔犳补绔�',
-    TransportWarning: '杩愯緭鐩戞帶',
-    TransportWaste: '鍗卞簾鐩戞帶',
-    Train: '閾佽矾鑷杞�',
-    Ship: '鑸硅埗',
-    Warning: '缁煎悎棰勮',
-    Track: '鍘嗗彶杞ㄨ抗',
-    Weather: '澶╂皵棰勮'
-}
-
-const moduleNames = {
-    Analysis: '缁忚惀鍒嗘瀽',
-    Facilities: '璁炬柦鍒嗗竷',
-    Pipeline: '绠$嚎',
-    CrudeOil: '鍘熸补',
-    NaturalGas: '澶╃劧姘�',
-    OilRefining: '鐐兼补',
-    Chemical: '鍖栧伐',
-    ProductOilSales: '鎴愬搧娌归攢鍞�',
-    ChemicalSales: '鍖栧伐閿�鍞�',
-    ProductOil_dq_Sales: '鎴愬搧娌瑰ぇ鍖洪攢鍞�',
-    ProductOli_ss_Sales: '鎴愬搧娌圭渷甯傞攢鍞�',
-    ImportedCrudeOil: '杩涘彛鍘熸补',
-    ImportedCrudeOil_dz: '杩涘彛鍘熸补澶ф床',
-    ImportedCrudeOil_dq: '杩涘彛鍘熸补鍦板尯',
-    ImportedCrudeOil_gj: '杩涘彛鍘熸补鍥藉',
-    ImportedCrudeOil_jc: '杩涘彛鍘熸补杩涘満',
-    Refining_ImportedCrudeOil: '鐐兼补杩涘彛鍘熸补',
-    Refining_HomeCrudeOil: '鐐兼补鍥藉唴鍘熸补',
-    Refining_Cpylx: '鐐兼补鎴愬搧娌规祦鍚�',
-    Dock_Yyly: '鐮佸ご鍘熸补鏉ユ簮',
-    Dock_Yylxqy: '鐮佸ご鍘熸补娴佸悜浼佷笟',
-    Oil_Yylxqy: '娌圭敯鍘熸补娴佸悜浼佷笟',
-    ProductOilSales_dq_drdc: '鎴愬搧娌归攢鍞ぇ鍖鸿皟鍏ヨ皟鍑�',
-
-    jyfx_tb: '缁忚惀鍒嗘瀽鍥捐〃',
-    gx_tb: '绠$嚎鍥捐〃',
-    yq_tb: '娌规皵鍥捐〃',
-    ly_tb: '鐐兼补鍥捐〃',
-    hg_tb: '鍖栧伐鍥捐〃',
-    cpyxs_tb: '鎴愬搧娌归攢鍞浘琛�',
-    cpyxs_dq_tb: '鎴愬搧娌归攢鍞ぇ鍖哄浘琛�',
-    cpyxs_ck_tb: '鎴愬搧娌归攢鍞嚭鍙e浘琛�'
-}
-const imageIDlayerCode = {
-        '1_1': 'sinopec_yout',
-        '1_2': 'petro_yout',
-        '1_3': 'cnooc_yout',
-        '1_4': 'other_yout',
-        '2_1': 'sinopec_qit',
-        '2_2': 'petro_qit',
-        '2_3': 'cnooc_qit',
-        '2_4': 'other_qit',
-        '3_1': 'sinopec_jinkyy',
-        '3_2': 'petro_jinkyy',
-        '3_3': 'cnooc_jinkyy',
-        '3_4': 'other_jinkyy',
-        '4_1': 'sinopec_mat',
-        '4_2': 'petro_mat',
-        '4_3': 'cnooc_mat',
-        '4_4': 'other_mat',
-        '5_1': 'sinopec_lianyqy',
-        '5_2': 'petro_lianyqy',
-        '5_3': 'cnooc_lianyqy',
-        '5_4': 'other_lianyqy',
-        '6_1': 'sinopec_huagqy',
-        '6_2': 'petro_huagqy',
-        '6_3': 'cnooc_huagqy',
-        '6_4': 'other_huagqy',
-        '7_1': 'sinopec_chengpy',
-        '7_2': 'petro_chengpy',
-        '7_3': 'cnooc_chengpy',
-        '7_4': 'other_chengpy',
-        '8_1': 'sinopec_huag',
-        '8_2': 'petro_huag',
-        '8_3': 'cnooc_huag',
-        '8_4': 'other_huag'
-    }
-
-const API_URLS = {
-    vehicleAlarmUrl: '',
-    corpTransVolumeUrl: ''
-}
 
 export default {
-   mapConfig,
-   layerNameNew,
-   imageIDlayerCode,
-    moduleNames,
-    TokenConfig,
-    layerNames,
     mapOptions,
-    DMHttpService1,
-    API_URLS
+    mapConfig,
+    TokenConfig,
+
+    BLUEMAP_HOST
 }
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index b45b042..a441c66 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -33,12 +33,10 @@
         const mapcontainer = this.$refs.rootmap
         this.mapObj = Sgis.initMap(mapcontainer)
         this.basemapHelper = Sgis.initBasemaps(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栧簳鍥�
-        this.vectorLayerHelper = Sgis.initLayers(this.mapObj.map, this.mapObj.L, {}, this.$nodeEnv) // 鍒濆鍖栦笟鍔″浘灞�
+        this.serviceLayerHelper = Sgis.initTileLayers(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栧簳鍥�
+        this.vectorLayerHelper = Sgis.initVectorLayers(this.mapObj.map, this.mapObj.L, {}) // 鍒濆鍖栦笟鍔″浘灞�
         this.setLayerHelper(this.vectorLayerHelper)
         return this.map
-      },
-      setLayerHelper(){
-
       }
   }
 }

--
Gitblit v1.8.0