地图参数配置

768f81e6 · liuguorong93 · 5378d26b · 768f81e6 · 768f81e6 · 768f81e6
Commit 768f81e6 authored Jan 12, 2023 by liuguorong93
8 changed files
--- a/public/index.html
+++ b/public/index.html
@@ -30,7 +30,10 @@
  <script src="./js/zzjgModel/jquery.jscrollbar-1.0.2.min.js"></script>
  <script src="./js/zzjgModel/jquery.mCustomScrollbar.js"></script>
  <script src="./js/zzjgModel/jquery.mousewheel.min.js"></script>
-  <script src="./js/zzjgModel/zzjgModelV4.js"></script>
+  <!-- 公安部 -->
+  <!-- <script src="./js/zzjgModel/zzjgModelV4.js"></script> -->
+  <!-- 阿里云 -->
+  <script src="./js/zzjgModel/zzjgModelV4_2.js"></script>

  <!-- SuperSlide 大话主席 -->
  <script src="./js/jQuery/jquery.SuperSlide.2.1.3.js"></script>
@@ -39,8 +42,10 @@
  <script src="./js/configPage/config.js"></script>
  <script src="./js/configPage/enumeration.js"></script>
  <script src="./js/configPage/pointConfig.js"></script>
-  <!-- <script src="./js/configPage/configMapBox_neiwang.js"></script> -->
-  <script src="./js/configPage/configMapBox_gonganbu.js"></script>
+  <!-- 公安部 -->
+  <!-- <script src="./js/configPage/configMapBox_gonganbu.js"></script> -->
+  <!-- 阿里云 -->
+  <script src="./js/configPage/configMapBox_neiwang.js"></script>
 </head>

 <body style="height: 100vh;">

--- a/public/js/configPage/config.js
+++ b/public/js/configPage/config.js
 // 设置图层前缀
 let layerPrefix = 'fangzheng_jingquan_data_'

-// 辖区组件（内网）
-// let clientUrl = 'http://172.18.71.238:8082/zzjgModelV1'
-
-// 辖区组件（对外）
-// let clientUrl = 'http://59.109.37.252/zzjgModelV1'
-
-// 辖区组件（公安部）
-let clientUrl = 'http://11.33.0.113:8050/apiClient/zzjgModelV1'
-
 var config = {
-  clientUrl,
  mapboxInfo: {
    // 图层前缀（重要）
    layerPrefix,

--- a/public/js/configPage/configMapBox_gonganbu.js
+++ b/public/js/configPage/configMapBox_gonganbu.js
+let clientUrl = 'http://11.33.0.113:8050/apiClient/zzjgModelV1' // 辖区组件
+
 var configMapBox = {
+  clientUrl,
  // 天地图栅格地图
  tdtMapStyle: {
    "version": 8,

--- a/public/js/configPage/configMapBox_neiwang.js
+++ b/public/js/configPage/configMapBox_neiwang.js
@@ -5,6 +5,8 @@
 // let darkMapSource = 'https://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/WMTS/tile/1.0.0/ChinaOnlineCommunity/default/default028mm/{z}/{y}/{x}.png'
 // let spriteUrl = 'http://172.18.71.238:8088/MapRes_/sprites/sprite_baidu'
 // let glyphsUrl = 'http://172.18.71.238:8088/MapRes_/fonts/{fontstack}/{range}.pbf'
+
+// let clientUrl = 'http://172.18.71.238:8082/zzjgModelV1' // 辖区组件
 // 公司内网（end）

 // 公司对外（start）
@@ -14,9 +16,12 @@ let yxtdtMapSource = 'http://59.109.37.252/EzServer/Maps/yxtdt/EzMap?Service=get
 let darkMapSource = 'http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}'
 let spriteUrl = 'http://59.109.37.252/vtserver/sprites/sprite_baidu'
 let glyphsUrl = 'http://59.109.37.252/vtserver/fonts/{fontstack}/{range}.pbf'
+
+let clientUrl = 'http://59.109.37.252/zzjgModelV1' // 辖区组件
 // 公司对外（end）

 var configMapBox = {
+  clientUrl,
  // 天地图
  tdtMapStyle: {
    'version': 8,

--- a/public/js/zzjgModel/zzjgModelV4.js
+++ b/public/js/zzjgModel/zzjgModelV4.js
@@ -787,7 +787,6 @@ $(document).ready(function () {
      url: proxyUrl + "?time=" + new Date().valueOf(),
      data: {
        url: projectPath + "GetAllStructureMess?time=" + new Date().valueOf()
-        // url: "http://172.18.71.238:8082/zzjgModelV1/" + "GetAllStructureMess?time=" + new Date().valueOf()
      },
      dataType: "json",
      success: function (json) {
@@ -1247,7 +1246,6 @@ $(document).ready(function () {
      url: proxyUrl + "?time=" + new Date().valueOf(),
      data: {
        url: projectPath + "StructureQueryServlet?time=" + new Date().valueOf(),
-        // url: "http://172.18.71.238:8082/zzjgModelV1/" + "StructureQueryServlet?time=" + new Date().valueOf(),
        zzjglx: zzjglx,
        x: pointX,
        y: pointY

--- a/public/js/zzjgModel/zzjgModelV4_2.js
+++ b/public/js/zzjgModel/zzjgModelV4_2.js
--- a/src/api/menuDataApi/mapSearchApi.js
+++ b/src/api/menuDataApi/mapSearchApi.js
@@ -12,9 +12,9 @@ switch (env) {
 }

 // 全文检索服务接口（内网&对外）
-// export const geoSearch = _params =>
-//   get(`${baseUrl}/SpatiotemporalBigDataSearch/fullSearch`, _params)
+export const geoSearch = _params =>
+  get(`${baseUrl}/SpatiotemporalBigDataSearch/fullSearch`, _params)

 // 全文检索服务接口（公安部）
-export const geoSearch = _params =>
-  get(`${baseUrl}/PGIS_S_Address/fullSearch`, _params)
+// export const geoSearch = _params =>
+//   get(`${baseUrl}/PGIS_S_Address/fullSearch`, _params)
--- a/src/views/poDogElectron/components/xzqhSelect.vue
+++ b/src/views/poDogElectron/components/xzqhSelect.vue
@@ -28,7 +28,7 @@ export default {
          { id: "2", cname: "省", zoom: 7, zzjglx: 11 },
          { id: "3", cname: "市", zoom: 10, zzjglx: 12 },
        ];
-        var clientUrl = config.clientUrl;
+        var clientUrl = configMapBox.clientUrl;
        /*//初始化组织机构模块*/
        var zzjgParams = {
          map: window.map,