From c4044fb60e53e5c83da4ee645d5160f914e422a3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/conf/MapConfig.js | 129 +++++++++++++++---------------------------
1 files changed, 46 insertions(+), 83 deletions(-)
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index f1f4cb6..4512d66 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,98 +1,61 @@
锘縤mport * as L from 'leaflet'
+import TDT from './TDT'
+import { LayerSewersLine, LayerSewersPoint } from './LayerSewers'
+const curWwwPath = window.document.location.href
+const pathname = window.document.location.pathname
+const pos = curWwwPath.indexOf(pathname)
+const HOST_URL = curWwwPath.substring(0, pos)
-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'
-// }
+// service涓绘満閰嶇疆
+// const APP_GIS_HOST = 'http://xearth.cn:6299'
+const APP_GIS_HOST = 'http://xearth.cn:6289'
-// const DMHttpService1 = sconfig.ifS + '://' + sconfig.ip + ':' + sconfig.port + sconfig.name + '/'
-const GIS_URL = 'http://10.238.221.80:6080'
-const BLUEMAP_HOST = 'http://xearth.cn:6288/'
+// 鑷畾涔変富鏈洪厤缃�
+const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
+
+// const GEOM_POLYLINE = 'POLYLINE'
+// const GEOM_POLYGON = 'POLYGON'
const mapOptions = {
- crs: L.CRS.EPSG4326,
- minZoom: 3,
- maxZoom: 18,
- center: [26, 104],
- zoom: 3,
- zoomControl: false,
- attributionControl: false,
- editable: true
+ crs: L.CRS.EPSG4326,
+ minZoom: 3,
+ maxZoom: 18,
+ // center: [26, 104],
+ center: [32.224016189575195, 118.77070426940918],
+ zoom: 14,
+ worldCopyJump: true,
+ inertia: true,
+ zoomControl: false,
+ attributionControl: false,
+ editable: true,
+ preferCanvas: true
}
const mapConfig = {
- IsLoadMapByToken: true, // 鏄惁閫氳繃token鍔犺浇鍦板浘
- showBaseMapType: 1, // 1鏄剧ず澶╁湴鍥撅紝2鏄剧ずarcgis鍦板浘
- TDTBaseMaps: [
- {
- layerName: '澶╁湴鍥惧奖鍍忓湴鍥�',
- type: 'wmts',
- visible: false,
- layerType: 'img_c',
- isLoadMapByToken: true,
- url: 'http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-image-globe/WMTS'
- },
- {
- layerName: '澶╁湴鍥惧奖鍍忔爣娉�',
- type: 'wmts',
- visible: false,
- layerType: 'cia_c',
- isLoadMapByToken: true,
- url: 'http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-label-image/WMTS'
- },
- {
- layerName: '澶╁湴鍥剧煝閲忓湴鍥�',
- type: 'wmts',
- visible: false,
- layerType: 'vec_c',
- isLoadMapByToken: true,
- url: 'http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-vector-globe/WMTS'
- },
- {
- layerName: '澶╁湴鍥剧煝閲忔爣娉�',
- type: 'wmts',
- visible: false,
- layerType: 'cva_c',
- isLoadMapByToken: true,
- url: 'http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-label-vector/WMTS'
- }
- ],
- ArcBaseMaps: [
- {
- layerName: 'arcgis褰卞儚搴曞浘',
- type: 'tile',
- visible: true,
- layerType: 'cia_c',
- 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',
+ IsLoadMapByToken: true, // 鏄惁閫氳繃token鍔犺浇鍦板浘
+ showBaseMapType: 1, // 1鏄剧ず澶╁湴鍥撅紝2鏄剧ずarcgis鍦板浘
+ IntranetBaseMaps: TDT.intranet,
+ InternetBaseMaps: TDT.internet,
+ Layers: { LayerSewersLine: [LayerSewersLine], layerSewersPoint: LayerSewersPoint } // 姹￠洦姘村浘灞傞厤缃�
}
+/**
+ * 鍐呯綉GIS锛岃幏鍙杢oken鍙傛暟
+ */
const TokenConfig = {
- url: 'http://10.246.132.249:8080/RemoteTokenServer', // 鑾峰彇token鐨勬湇鍔℃帴鍙�
- option: {
- request: 'getToken',
- username: 'sipms', // 鑾峰彇token鐨勭敤鎴峰悕
- password: 'sinopecipms', // 鑾峰彇token鐨勫瘑鐮�
- expiration: 1440,
- clientid: 'ref.' + HOST_URL// 鑾峰彇token鐨勫簲鐢ㄦ湇鍔″櫒鍦板潃
- }
+ url: TDT.SINOPEC_GIS_HOST + '/RemoteTokenServer', // 鑾峰彇token鐨勬湇鍔℃帴鍙�
+ option: {
+ request: 'getToken',
+ username: 'sipms', // 鑾峰彇token鐨勭敤鎴峰悕
+ password: 'sinopecipms', // 鑾峰彇token鐨勫瘑鐮�
+ expiration: 1440,
+ clientid: 'ref.' + HOST_URL// 鑾峰彇token鐨勫簲鐢ㄦ湇鍔″櫒鍦板潃
+ }
}
export default {
- mapOptions,
- mapConfig,
- TokenConfig,
-
- BLUEMAP_HOST
+ mapOptions,
+ mapConfig,
+ TokenConfig,
+ BLUEMAP_HOST
}
--
Gitblit v1.8.0