Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

添加西海岸地图
2022-07-26 15:16:53 +08:00 · 2022-07-26 15:16:28 +08:00
7 changed files with 262 additions and 134 deletions
--- a/front/public/index.html
+++ b/front/public/index.html
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-22 18:42:44
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-25 17:15:08
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -48,16 +48,16 @@
    // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
    // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 西海岸版本
-    // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
+    window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
    // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
-    window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
    window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
@ -107,7 +107,8 @@
  <script type="text/javascript" src="./leaflet/MarkerClusterer_min.js"></script>
  <!-- 热力图 -->
  <script type="text/javascript" src="./leaflet/leaflet-heat.js"></script>
-
+  <!-- 加载WMTS服务 -->
+  <script type="text/javascript" src="./leaflet/leaflet-tilelayer-wmts.js"></script>
  <!-- 大华平台相关包 -->
  <script type="text/javascript" src="./static/js/encrypt.js"></script>
  <script type="text/javascript" src="./static/js/DHWs.js"></script>
--- a/front/public/leaflet/leaflet-tilelayer-wmts.js
+++ b/front/public/leaflet/leaflet-tilelayer-wmts.js
@ -0,0 +1,80 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-07-25 17:13:49
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-26 10:23:40
+ * @Description: 告诉大家这是什么
+ */
+;(L.TileLayer.WMTS = L.TileLayer.extend({
+  defaultWmtsParams: {
+    service: 'WMTS',
+    request: 'GetTile',
+    version: '1.0.0',
+    layer: '',
+    style: '',
+    tilematrixset: '',
+    format: 'image/jpeg',
+  },
+  initialize: function (a, b) {
+    this._url = a
+    var c = {},
+      d = Object.keys(b)
+    d.forEach((a) => {
+      c[a.toLowerCase()] = b[a]
+    })
+    var e = L.extend({}, this.defaultWmtsParams),
+      f = c.tileSize || this.options.tileSize
+    for (var g in ((e.width =
+      c.detectRetina && L.Browser.retina ? (e.height = 2 * f) : (e.height = f)),
+    c))
+      e.hasOwnProperty(g) && 'matrixIds' != g && (e[g] = c[g])
+    ;(this.wmtsParams = e),
+      (this.matrixIds = b.matrixIds || this.getDefaultMatrix()),
+      L.setOptions(this, b)
+  },
+  onAdd: function (a) {
+    ;(this._crs = this.options.crs || a.options.crs),
+      L.TileLayer.prototype.onAdd.call(this, a)
+  },
+  getTileUrl: function (a) {
+    var b = this.options.tileSize,
+      c = a.multiplyBy(b)
+    ;(c.x += 1), (c.y -= 1)
+    var d = c.add(new L.Point(b, b)),
+      e = this._tileZoom,
+      f = this._crs.project(this._map.unproject(c, e)),
+      g = this._crs.project(this._map.unproject(d, e))
+    tilewidth = g.x - f.x
+    var h = this.matrixIds[e].identifier,
+      i = h,
+      j = this.matrixIds[e].topLeftCorner.lng,
+      k = this.matrixIds[e].topLeftCorner.lat,
+      l = Math.floor((f.x - j) / tilewidth),
+      m = -Math.floor((f.y - k) / tilewidth),
+      n = L.Util.template(this._url, { s: this._getSubdomain(a) })
+    return (
+      n +
+      L.Util.getParamString(this.wmtsParams, n) +
+      '&tilematrix=' +
+      i +
+      '&tilerow=' +
+      m +
+      '&tilecol=' +
+      l
+    )
+  },
+  setParams: function (a, b) {
+    return L.extend(this.wmtsParams, a), b || this.redraw(), this
+  },
+  getDefaultMatrix: function () {
+    for (var a = Array(22), b = 0; 22 > b; b++)
+      a[b] = {
+        identifier: '' + b,
+        topLeftCorner: new L.LatLng(20037508.3428, -20037508.3428),
+      }
+    return a
+  },
+})),
+  (L.tileLayer.wmts = function (a, b) {
+    return new L.TileLayer.WMTS(a, b)
+  })
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -1,13 +1,13 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-26 14:46:43
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-26 15:16:46
 * @Description: 数据资源参数配置
 */
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+const newLocation = 'xihaian'

 // 数据资源数据
 const whoShow = {}
--- a/front/public/static/config/mapConfig.js
+++ b/front/public/static/config/mapConfig.js
@ -2,78 +2,31 @@
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2021-12-07 13:33:55
+ * @LastEditTime: 2022-07-26 14:34:24
 * @Description: 地图静态参数配置
 */
-var _mapConfig = {};
+var _mapConfig = {}

-(function () {
-  var L = window.L || {};
+;(function () {
+  var L = window.L || {}

  // // 定义底图初始化化参数
  //  请在此处更改你的配置**********************************************
-  var CONFIGKEY = 'qingdao_highgo';
+  var CONFIGKEY = 'qingdao'
  // var CONFIGKEY = 'dev';
  // 请在上面更改你的配置***********************************************
  var BASECONFIGITEM = {
-    'qingdao': {
-      DATABASE_TYPE: 'Highgo',
-      POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute'
-      ISERVER_URL: '15.2.21.238:8090',
-      WORKPLACE_NAME: 'weifang',
-      MAP_NAME: 'weifang',
-      DATASOURCE_NAME: 'himap_wf',
-      ATMOSPHERE_URL: 'http://15.2.21.151:9015/service-main',
-      BDMAP_CONFIG: {
-        location: 'qingdao',
-        _initpos: {
-          point: [120.392795, 36.072854],
-          zoom: 11
-        },
-        _keyframes: [
-          [119.165174, 36.718389],
-          [119.186697, 36.723567],
-          [119.16803, 36.713863]
-        ]
-      },
+    qingdao: {
+      base: 'xihaian',
      CURRENT_MAP_OPTIONS: {
-        center: [36.076209, 120.349632],
-        maxZoom: 17,
-        minZoom: 7,
-        zoom: 12,
+        // crs: CRS_4490,
+        center: [36.17, 120.13],
+        maxZoom: 18,
+        minZoom: 0,
+        zoom: 10,
      },
-      TILEDTYPE: 'H_zxy', // 底图服务类型  超图瓦片'Sci' 超图ZXY瓦片'S_zxy' 自有ZXY瓦片 'H_zxy'
-      TILEDCONFIG: {
-        digitalMap: {
-          tiledUrl: 'http://15.2.21.238:9889/{z}/{x}/{y}.png',
-          tiledName: '电子地图',
-          tiledIconURI: '',
-          options: {
-            center: [36.71, 119.16205],
-            zoom: 11,
-            minZoom:10,
-            maxZoom: 15
-          }
-        },
-        satelliteMap: {
-          tiledUrl: 'http://15.2.21.238:9888/{z}/{x}/{y}.png',
-          tiledName: '卫星地图',
-          tiledIconURI: '',
-          options: {
-            center: [36.71, 119.19],
-            zoom: 13,
-            minZoom: 5,
-            maxZoom: 15
-          }
-        }
-      },
-      MAPTYPE: 'digitalMap', // 默认地图类型 电子地图
-      TILEDMODE: 'bd', // 瓦片类型 百度
-      TITLE_LAYER: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
-      TITLE_LAYER_REMOTE: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'remote', name: '影像', icon: 'satellite_map.png' },
-      TITLE_LAYER_DARK: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' },
    },
-    'qingdao_highgo': {
+    qingdao_highgo: {
      DATABASE_TYPE: 'Highgo',
      POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute'
      ISERVER_URL: '15.2.21.238:8090',
@ -92,23 +45,41 @@ var _mapConfig = {};
        location: 'qingdao',
        _initpos: {
          point: [120.392795, 36.072854],
-          zoom: 2
+          zoom: 2,
        },
        _keyframes: [
          [121.6011191295479, 36.73422934263509],
          [119.83371870221472, 36.082854],
-          [120.25937000453506, 36.34563716789656]
-        ]
+          [120.25937000453506, 36.34563716789656],
+        ],
      },
      MAP_VENDOR: 'Supermap', // 地图厂商 Supermap bdmap 3dbdmap
-      TITLE_LAYER: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
-      TITLE_LAYER_REMOTE: { mapUrl: 'http://q3d.qd.gov.cn:8195/portalproxy/vw6bffpy/TileServer/arcgis/rest/services/normal_2021_4490Arcgis/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
+      TITLE_LAYER: {
+        mapUrl:
+          'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
+      TITLE_LAYER_REMOTE: {
+        mapUrl:
+          'http://q3d.qd.gov.cn:8195/portalproxy/vw6bffpy/TileServer/arcgis/rest/services/normal_2021_4490Arcgis/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
      // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
      // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-QingdaoRemoteImageMap/rest/maps/QingdaoRemoteImageMap', type: 'remote', name: '影像', icon: 'satellite_map.png' },
-      TITLE_LAYER_DARK: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' },
+      TITLE_LAYER_DARK: {
+        mapUrl:
+          'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong',
+        type: 'dark',
+        name: '其他',
+        icon: 'other_map.png',
+      },
    },
    //测试环境地图
-    'dev': {
+    dev: {
      DATABASE_TYPE: 'Highgo',
      POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute'
      ISERVER_URL: '15.2.21.238:8090',
@ -127,38 +98,94 @@ var _mapConfig = {};
        location: 'qingdao',
        _initpos: {
          point: [120.392795, 36.072854],
-          zoom: 2
+          zoom: 2,
        },
        _keyframes: [
          [121.6011191295479, 36.73422934263509],
          [119.83371870221472, 36.082854],
-          [120.25937000453506, 36.34563716789656]
-        ]
+          [120.25937000453506, 36.34563716789656],
+        ],
      },
      MAP_VENDOR: 'Supermap', // 地图厂商 Supermap bdmap 3dbdmap
-      TITLE_LAYER: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
-      TITLE_LAYER_REMOTE: { mapUrl: 'http://q3d.qd.gov.cn:8195/portalproxy/s9arfiqe/TileServer/arcgis/rest/services/normal2021_test/MapServer?key=p9PW1ipy9P3QHILzmsNOk8Gc', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
+      TITLE_LAYER: {
+        mapUrl:
+          'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
+      TITLE_LAYER_REMOTE: {
+        mapUrl:
+          'http://q3d.qd.gov.cn:8195/portalproxy/s9arfiqe/TileServer/arcgis/rest/services/normal2021_test/MapServer?key=p9PW1ipy9P3QHILzmsNOk8Gc',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
      // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
      // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-QingdaoRemoteImageMap/rest/maps/QingdaoRemoteImageMap', type: 'remote', name: '影像', icon: 'satellite_map.png' },
-      TITLE_LAYER_DARK: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' },
+      TITLE_LAYER_DARK: {
+        mapUrl:
+          'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong',
+        type: 'dark',
+        name: '其他',
+        icon: 'other_map.png',
+      },
    },
-  };
+  }
  var MAPCONFIGMIXTRE = {
    CURRENT_SERVER_NAME: CONFIGKEY,
-    BUFFER_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/spatialAnalysis-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/restjsr/spatialanalyst',
-    QUERY_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-HIMAP_HIGHGO/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME,
+    BUFFER_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/spatialAnalysis-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/restjsr/spatialanalyst',
+    QUERY_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/map-HIMAP_HIGHGO/rest/maps/' +
+      BASECONFIGITEM[CONFIGKEY].MAP_NAME,
    // QUERY_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/data-HIMAP_HIGHGO/rest/data/datasources/HISENSE_himap',
-    DYNAMIC_ROAD_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/spatialAnalysis-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/restjsr/spatialanalyst',
-    DYNMIC_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME,
+    DYNAMIC_ROAD_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/spatialAnalysis-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/restjsr/spatialanalyst',
+    DYNMIC_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/map-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/rest/maps/' +
+      BASECONFIGITEM[CONFIGKEY].MAP_NAME,
    // 数据库型
    // NETWORK_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/transportationAnalyst-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/networkanalyst/BuildNetwork_2@' + BASECONFIGITEM[CONFIGKEY].DATASOURCE_NAME,
    // 程工系统测试环境，因为是文件型，和数据库性有区别，发布时请注意
-    NETWORK_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/transportationAnalyst-road/rest/networkanalyst/BuildNetwork_2@road',
-    PLOTTING_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/plot-JY/rest/plot/',
-    POI_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-    EDITORDATA_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/data-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/data',
+    NETWORK_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/transportationAnalyst-road/rest/networkanalyst/BuildNetwork_2@road',
+    PLOTTING_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/plot-JY/rest/plot/',
+    POI_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+    EDITORDATA_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/data-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/rest/data',
    ADDRESS_MATCH_URL: `http://${BASECONFIGITEM[CONFIGKEY].ISERVER_URL}/iserver/services/addressmatch-Address/restjsr/v1/address`,
-    TITLE_LAYER_ARRAY: BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_ARRAY || [BASECONFIGITEM[CONFIGKEY].TITLE_LAYER, BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_REMOTE, BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_DARK]
-  };
-  _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE);
-})();
+    TITLE_LAYER_ARRAY: BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_ARRAY || [
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER,
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_REMOTE,
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_DARK,
+    ],
+  }
+  _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE)
+})()
--- a/front/src/supermap/map-init.js
+++ b/front/src/supermap/map-init.js
@ -24,25 +24,12 @@ const CRS_4490 = new L.Proj.CRS(
    //   1.3411051811431041E-6
    // ],
    resolutions: [
-      0.703125,
-      0.3515625,
-      0.17578125,
-      0.087890625,
-      0.0439453125,
-      0.02197265625,
-      0.010986328125,
-      0.0054931640625,
-      0.00274658203125,
-      0.001373291015625,
-      0.0006866455078125,
-      0.00034332275390625,
-      0.000171661376953125,
-      0.0000858306884765625,
-      0.00004291534423828125,
-      0.000021457672119140625,
-      0.000010728836059570312,
-      0.0000053644180297851563,
-      0.0000026822090148925781
+      0.703125, 0.3515625, 0.17578125, 0.087890625, 0.0439453125, 0.02197265625,
+      0.010986328125, 0.0054931640625, 0.00274658203125, 0.001373291015625,
+      0.0006866455078125, 0.00034332275390625, 0.000171661376953125,
+      0.0000858306884765625, 0.00004291534423828125, 0.000021457672119140625,
+      0.000010728836059570312, 0.0000053644180297851563,
+      0.0000026822090148925781,
    ],
    // DEV
    // resolutions: [
@ -147,17 +134,6 @@ export function HieimpMap() {
    //   console.log('地市级行政区划', result);
    // });
    switch (_mapConfig.config.CURRENT_SERVER_NAME) {
-      case 'xinjiang':
-        tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl
-        tileMarkerUrl = _mapConfig.config.TITLE_MAKER.mapUrl
-        renderMapFun(mapId, tileMapUrl, centerPoint)
-        L.supermap
-          .tiledMapLayer(tileMarkerUrl, {
-            transparent: false,
-            opacity: 0.6,
-          })
-          .addTo(MapObj.map)
-        break
      case 'qingdao_highgo':
        if (type === 'tiled') {
          tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl
@ -168,6 +144,50 @@ export function HieimpMap() {
        }
        renderMapFun(mapId, tileMapUrl, centerPoint)
        break
+      case 'qingdao':
+        const tileMap = L.map(mapId, {
+          crs: L.CRS.EPSG4326,
+          // renderer: L.svg(),
+          center: centerPoint,
+          maxZoom: _mapConfig.config.CURRENT_MAP_OPTIONS.maxZoom,
+          minZoom: _mapConfig.config.CURRENT_MAP_OPTIONS.minZoom,
+          zoom: _mapConfig.config.CURRENT_MAP_OPTIONS.zoom,
+          zoomControl: false,
+          // preferCanvas: true,
+        })
+        MapObj.map = tileMap // 全局map对象赋值
+        var matrixIds = []
+        for (var i = 0; i < 19; ++i) {
+          matrixIds[i] = {
+            identifier: 1 + i,
+            topLeftCorner: new L.LatLng(90, -180),
+          }
+        }
+        var wmtsMap = new L.TileLayer.WMTS(
+          'http://10.134.135.3:21009/service/map/wmts-raster', //服务地址
+          {
+            style: 'standard',
+            layer: 'basemap', //图层名称
+            tilematrixSet: 'EPSG:4326', //GeoServer使用的网格名称
+            tileSize: 256, //切片大小
+            format: 'image/png',
+            matrixIds: matrixIds,
+          }
+        )
+        var labelMap = new L.TileLayer.WMTS(
+          'http://10.134.135.3:21009/service/map/wmts-raster', //服务地址
+          {
+            style: 'standard',
+            layer: 'label', //图层名称
+            tilematrixSet: 'EPSG:4326', //GeoServer使用的网格名称
+            tileSize: 256, //切片大小
+            format: 'image/png',
+            matrixIds: matrixIds,
+          }
+        )
+        MapObj.map.addLayer(wmtsMap)
+        MapObj.map.addLayer(labelMap)
+        break
      default:
        if (type === 'tiled') {
          tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -95,7 +95,7 @@
          <template v-if="column.dataIndex === 'operation'">
            <a
              @click="
-                openVideo(record.channelCode || record.channelCode.channelId)
+                openVideo(record.channelCode ||record.channelId || record.channelCode.channelId)
              "
            >
              预览
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@ -145,7 +145,7 @@
        this.hiMap.mapObj,
        this.hiMapFun
      )
-      this.hiMap.mapObj.map.flyTo({ lat: 36.06, lng: 120.3899 }, 16)
+      // this.hiMap.mapObj.map.flyTo({ lat: 36.06, lng: 120.3899 }, 16)
      this.addressMatchUrl = window.SITE_CONFIG.POI_URL
      // 初始化地址检索服务
      this.initAddressMatchService()
Author	SHA1	Message	Date
wuhongjian	09f65b44ed	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-26 15:16:53 +08:00
wuhongjian	b4e6f56c47	添加西海岸地图	2022-07-26 15:16:28 +08:00