Browse Source

地图修改成宿迁外网

wenhongquan 3 years ago
parent
commit
9563044158
5 changed files with 177 additions and 172 deletions
  1. 149 147
      index.html
  2. 24 22
      public/index.html
  3. 1 1
      src/components/MapView/index.tsx
  4. 2 1
      src/components/MarkerMap/index.tsx
  5. 1 1
      vite.config.ts

+ 149 - 147
index.html

@@ -1,174 +1,176 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <head>
+
+<head>
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>交通运输应急指挥系统</title>
-    <link
-      rel="stylesheet"
-      href="https://minedata.cn/minemapapi/v2.1.0/minemap.css"
-    />
-    <script src="https://minedata.cn/minemapapi/v2.1.0/minemap.js"></script>
+
     <script src="../webClient/defaultConfig.js"></script>
     <script src="../webClient/initWebSocket.js"></script>
     <script src="../webClient/webClient_initWnd.js"></script>
+
+    <link rel="stylesheet" href="http://61.147.254.211:21009/minemapapi/v2.1.0/minemap.css">
+    <script src="http://61.147.254.211:21009/minemapapi/v2.1.0/minemap.js"></script>
     <script>
-      minemap.domainUrl = 'https://minedata.cn';
-      minemap.dataDomainUrl = 'https://minedata.cn';
-      minemap.serverDomainUrl = 'https://minedata.cn';
-      minemap.spriteUrl = 'https://minedata.cn/minemapapi/v2.1.0/sprite/sprite';
-      minemap.serviceUrl = 'https://minedata.cn/service/';
+        minemap.domainUrl = 'http://61.147.254.211:21009';
+        minemap.dataDomainUrl = 'http://61.147.254.211:21009';
+        minemap.serverDomainUrl = 'http://61.147.254.211:21009';
+        minemap.spriteUrl = 'http://61.147.254.211:21009/minemapapi/v2.1.0/sprite/sprite';
+        minemap.serviceUrl = 'http://61.147.254.211:21009/service/';
 
-      /**
-       * key、solution设置
-       */
-      minemap.key = '77ef70465c2d4888b3a5132523494b94';
-      minemap.solution = 16857;
+        /**
+         * key、solution设置
+         */
+        minemap.key = "d054b0f4433b42f1a28c1a97fbf8317d";
+        minemap.solution = 12886;
     </script>
     <script>
-      (function (win, lib) {
-        var doc = win.document;
-        var docEl = doc.documentElement;
-        var metaEl = doc.querySelector('meta[name="viewport"]');
-        var flexibleEl = doc.querySelector('meta[name="flexible"]');
-        var dpr = 0;
-        var scale = 0;
-        var tid;
-        var flexible = lib.flexible || (lib.flexible = {});
+        (function(win, lib) {
+            var doc = win.document;
+            var docEl = doc.documentElement;
+            var metaEl = doc.querySelector('meta[name="viewport"]');
+            var flexibleEl = doc.querySelector('meta[name="flexible"]');
+            var dpr = 0;
+            var scale = 0;
+            var tid;
+            var flexible = lib.flexible || (lib.flexible = {});
 
-        if (metaEl) {
-          console.warn('将根据已有的meta标签来设置缩放比例');
-          var match = metaEl
-            .getAttribute('content')
-            .match(/initial\-scale=([\d\.]+)/);
-          if (match) {
-            scale = parseFloat(match[1]);
-            dpr = parseInt(1 / scale);
-          }
-        } else if (flexibleEl) {
-          var content = flexibleEl.getAttribute('content');
-          if (content) {
-            var initialDpr = content.match(/initial\-dpr=([\d\.]+)/);
-            var maximumDpr = content.match(/maximum\-dpr=([\d\.]+)/);
-            if (initialDpr) {
-              dpr = parseFloat(initialDpr[1]);
-              scale = parseFloat((1 / dpr).toFixed(2));
+            if (metaEl) {
+                console.warn('将根据已有的meta标签来设置缩放比例');
+                var match = metaEl
+                    .getAttribute('content')
+                    .match(/initial\-scale=([\d\.]+)/);
+                if (match) {
+                    scale = parseFloat(match[1]);
+                    dpr = parseInt(1 / scale);
+                }
+            } else if (flexibleEl) {
+                var content = flexibleEl.getAttribute('content');
+                if (content) {
+                    var initialDpr = content.match(/initial\-dpr=([\d\.]+)/);
+                    var maximumDpr = content.match(/maximum\-dpr=([\d\.]+)/);
+                    if (initialDpr) {
+                        dpr = parseFloat(initialDpr[1]);
+                        scale = parseFloat((1 / dpr).toFixed(2));
+                    }
+                    if (maximumDpr) {
+                        dpr = parseFloat(maximumDpr[1]);
+                        scale = parseFloat((1 / dpr).toFixed(2));
+                    }
+                }
             }
-            if (maximumDpr) {
-              dpr = parseFloat(maximumDpr[1]);
-              scale = parseFloat((1 / dpr).toFixed(2));
+
+            if (!dpr && !scale) {
+                var isAndroid = win.navigator.appVersion.match(/android/gi);
+                var isIPhone = win.navigator.appVersion.match(/iphone/gi);
+                var devicePixelRatio = win.devicePixelRatio;
+                if (isIPhone) {
+                    // iOS下,对于2和3的屏,用2倍的方案,其余的用1倍方案
+                    if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
+                        dpr = 3;
+                    } else if (devicePixelRatio >= 2 && (!dpr || dpr >= 2)) {
+                        dpr = 2;
+                    } else {
+                        dpr = 1;
+                    }
+                } else {
+                    // 其他设备下,仍旧使用1倍的方案
+                    dpr = 1;
+                }
+                scale = 1 / dpr;
             }
-          }
-        }
 
-        if (!dpr && !scale) {
-          var isAndroid = win.navigator.appVersion.match(/android/gi);
-          var isIPhone = win.navigator.appVersion.match(/iphone/gi);
-          var devicePixelRatio = win.devicePixelRatio;
-          if (isIPhone) {
-            // iOS下,对于2和3的屏,用2倍的方案,其余的用1倍方案
-            if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
-              dpr = 3;
-            } else if (devicePixelRatio >= 2 && (!dpr || dpr >= 2)) {
-              dpr = 2;
-            } else {
-              dpr = 1;
+            docEl.setAttribute('data-dpr', dpr);
+            if (!metaEl) {
+                metaEl = doc.createElement('meta');
+                metaEl.setAttribute('name', 'viewport');
+                metaEl.setAttribute(
+                    'content',
+                    'initial-scale=' +
+                    scale +
+                    ', maximum-scale=' +
+                    scale +
+                    ', minimum-scale=' +
+                    scale +
+                    ', user-scalable=no',
+                );
+                if (docEl.firstElementChild) {
+                    docEl.firstElementChild.appendChild(metaEl);
+                } else {
+                    var wrap = doc.createElement('div');
+                    wrap.appendChild(metaEl);
+                    doc.write(wrap.innerHTML);
+                }
             }
-          } else {
-            // 其他设备下,仍旧使用1倍的方案
-            dpr = 1;
-          }
-          scale = 1 / dpr;
-        }
 
-        docEl.setAttribute('data-dpr', dpr);
-        if (!metaEl) {
-          metaEl = doc.createElement('meta');
-          metaEl.setAttribute('name', 'viewport');
-          metaEl.setAttribute(
-            'content',
-            'initial-scale=' +
-              scale +
-              ', maximum-scale=' +
-              scale +
-              ', minimum-scale=' +
-              scale +
-              ', user-scalable=no',
-          );
-          if (docEl.firstElementChild) {
-            docEl.firstElementChild.appendChild(metaEl);
-          } else {
-            var wrap = doc.createElement('div');
-            wrap.appendChild(metaEl);
-            doc.write(wrap.innerHTML);
-          }
-        }
+            function refreshRem() {
+                var width = docEl.getBoundingClientRect().width;
+                if (width / dpr > 5760) {
+                    width = 5760 * dpr;
+                }
+                var rem = width / 10;
+                docEl.style.fontSize = rem + 'px';
+                flexible.rem = win.rem = rem;
+            }
 
-        function refreshRem() {
-          var width = docEl.getBoundingClientRect().width;
-          if (width / dpr > 5760) {
-            width = 5760 * dpr;
-          }
-          var rem = width / 10;
-          docEl.style.fontSize = rem + 'px';
-          flexible.rem = win.rem = rem;
-        }
+            win.addEventListener(
+                'resize',
+                function() {
+                    clearTimeout(tid);
+                    tid = setTimeout(refreshRem, 300);
+                },
+                false,
+            );
+            win.addEventListener(
+                'pageshow',
+                function(e) {
+                    if (e.persisted) {
+                        clearTimeout(tid);
+                        tid = setTimeout(refreshRem, 300);
+                    }
+                },
+                false,
+            );
 
-        win.addEventListener(
-          'resize',
-          function () {
-            clearTimeout(tid);
-            tid = setTimeout(refreshRem, 300);
-          },
-          false,
-        );
-        win.addEventListener(
-          'pageshow',
-          function (e) {
-            if (e.persisted) {
-              clearTimeout(tid);
-              tid = setTimeout(refreshRem, 300);
+            if (doc.readyState === 'complete') {
+                doc.body.style.fontSize = 12 * dpr + 'px';
+            } else {
+                doc.addEventListener(
+                    'DOMContentLoaded',
+                    function(e) {
+                        doc.body.style.fontSize = 12 * dpr + 'px';
+                    },
+                    false,
+                );
             }
-          },
-          false,
-        );
-
-        if (doc.readyState === 'complete') {
-          doc.body.style.fontSize = 12 * dpr + 'px';
-        } else {
-          doc.addEventListener(
-            'DOMContentLoaded',
-            function (e) {
-              doc.body.style.fontSize = 12 * dpr + 'px';
-            },
-            false,
-          );
-        }
 
-        refreshRem();
+            refreshRem();
 
-        flexible.dpr = win.dpr = dpr;
-        flexible.refreshRem = refreshRem;
-        flexible.rem2px = function (d) {
-          var val = parseFloat(d) * this.rem;
-          if (typeof d === 'string' && d.match(/rem$/)) {
-            val += 'px';
-          }
-          return val;
-        };
-        flexible.px2rem = function (d) {
-          var val = parseFloat(d) / this.rem;
-          if (typeof d === 'string' && d.match(/px$/)) {
-            val += 'rem';
-          }
-          return val;
-        };
-      })(window, window['lib'] || (window['lib'] = {}));
+            flexible.dpr = win.dpr = dpr;
+            flexible.refreshRem = refreshRem;
+            flexible.rem2px = function(d) {
+                var val = parseFloat(d) * this.rem;
+                if (typeof d === 'string' && d.match(/rem$/)) {
+                    val += 'px';
+                }
+                return val;
+            };
+            flexible.px2rem = function(d) {
+                var val = parseFloat(d) / this.rem;
+                if (typeof d === 'string' && d.match(/px$/)) {
+                    val += 'rem';
+                }
+                return val;
+            };
+        })(window, window['lib'] || (window['lib'] = {}));
     </script>
-  </head>
-  <body>
+</head>
+
+<body>
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>
+</body>
+
+</html>

+ 24 - 22
public/index.html

@@ -1,32 +1,33 @@
 <!DOCTYPE html>
 <html lang="">
-  <head>
+
+<head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
-    <link
-      rel="stylesheet"
-      href="https://minedata.cn/minemapapi/v2.1.0/minemap.css"
-    />
-    <script src="https://minedata.cn/minemapapi/v2.1.0/minemap.js"></script>
+    <title>
+        <%= htmlWebpackPlugin.options.title %>
+    </title>
+    <!-- <link rel="stylesheet" href="http://61.147.254.211:21009/minemapapi/v2.1.0/minemap.css" />
+    <script src="http://61.147.254.211:21009/minemapapi/v2.1.0/minemap.js"></script>
     <script>
-      minemap.domainUrl = "https://minedata.cn";
-      minemap.dataDomainUrl = "https://minedata.cn";
-      minemap.serverDomainUrl = "https://minedata.cn";
-      minemap.spriteUrl = "https://minedata.cn/minemapapi/v2.1.0/sprite/sprite";
-      minemap.serviceUrl = "https://minedata.cn/service/";
+        minemap.domainUrl = "http://61.147.254.211:21009";
+        minemap.dataDomainUrl = "http://61.147.254.211:30876";
+        minemap.serverDomainUrl = "http://61.147.254.211:21009";
+        minemap.spriteUrl = "http://61.147.254.211:21009/minemapapi/v2.1.0/sprite/sprite";
+        minemap.serviceUrl = "http://61.147.254.211:30876/service/";
+
 
-      /**
-       * key、solution设置
-       */
-      minemap.key = "77ef70465c2d4888b3a5132523494b94";
-      minemap.solution = 16857;
-    </script>
-  </head>
+        /**
+         * key、solution设置
+         */
+        minemap.key = "d054b0f4433b42f1a28c1a97fbf8317d";
+        minemap.solution = 12886;
+    </script> -->
+</head>
 
-  <body>
+<body>
     <noscript>
       <strong
         >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
@@ -36,5 +37,6 @@
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
-  </body>
-</html>
+</body>
+
+</html>

+ 1 - 1
src/components/MapView/index.tsx

@@ -14,7 +14,7 @@ export default defineComponent({
     onMounted(() => {
       const map = new window.minemap.Map({
         container: 'map',
-        style: 'https://minedata.cn/service/solu/style/id/12878' /*底图样式*/,
+        style: 'http://61.147.254.211:21009/service/solu/style/id/12878' /*底图样式*/,
         center: [118.29564, 33.97441] /*地图中心点*/,
         zoom: 14 /*地图默认缩放等级*/,
         pitch: 0 /*地图俯仰角度*/,

+ 2 - 1
src/components/MarkerMap/index.tsx

@@ -454,6 +454,7 @@ export default defineComponent({
     };
 
     const updateTrafficSource = () => {
+      debugger
       if (state.map.getSource('Traffic')) {
         state.map.removeSource('Traffic');
       }
@@ -649,7 +650,7 @@ export default defineComponent({
 
     onMounted(async () => {
       window.minemap.util.getJSON(
-        'https://minedata.cn/service/solu/style/id/12878',
+        'http://61.147.254.211:21009/service/solu/style/id/12878',
         function (error, data) {
           data.layers.forEach(function (layer: any) {
             //判断是否道路线图层

+ 1 - 1
vite.config.ts

@@ -20,7 +20,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
     server: {
       host: '0.0.0.0',
       open: true,
-      port: 8000,
+      port: 8001,
       // strictPort: true,
       https: false,
       force: true,