wenhongquan 2 年之前
父节点
当前提交
193df0270a

+ 1 - 1
.env.dev

@@ -3,6 +3,6 @@
 NODE_ENV = dev
 
 VITE_API_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/server'
-VITE_MAP_SERVER = 'http://61.147.254.211:21009'
+VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'

+ 1 - 1
.env.prod

@@ -3,6 +3,6 @@
 NODE_ENV = prod
 
 VITE_API_SERVER = 'http://10.11.208.17:30876'
-VITE_MAP_SERVER = 'http://10.11.208.19:21009'
+VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'http://10.11.208.32:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'

+ 1 - 1
.env.test

@@ -3,6 +3,6 @@
 NODE_ENV = test
 
 VITE_API_SERVER = 'http://61.147.254.211:30876'
-VITE_MAP_SERVER = 'http://61.147.254.211:21009'
+VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'

+ 1 - 1
.env.zwy

@@ -3,6 +3,6 @@
 NODE_ENV = zwy
 
 VITE_API_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/server'
-VITE_MAP_SERVER = 'http://61.147.254.211:21009'
+VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'

+ 1 - 1
.env.zwynw

@@ -3,6 +3,6 @@
 NODE_ENV = zwy
 
 VITE_API_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/server'
-VITE_MAP_SERVER = 'http://61.147.254.211:21009'
+VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'

+ 10 - 10
index.html

@@ -6,25 +6,25 @@
     <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>
+    <link rel="stylesheet" href="https://tocc.jtj.suqian.gov.cn:21100/minemapapi/v2.1.0/minemap.css" />
+    <script src="https://tocc.jtj.suqian.gov.cn:21100/minemapapi/v2.1.0/minemap.js"></script>
     <script src="./uni.webview.1.5.2.js"></script>
     <!-- <script src="./view.umd.min.js"></script> -->
     <!-- <script src="https://minedata.cn/minemapapi/minemap-plugins/lbs/v1/minemap-lbs.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 = 'https://tocc.jtj.suqian.gov.cn:21100';
+        minemap.dataDomainUrl = 'https://tocc.jtj.suqian.gov.cn:21100';
+        minemap.serverDomainUrl = 'https://tocc.jtj.suqian.gov.cn:21100';
+        minemap.spriteUrl = 'https://tocc.jtj.suqian.gov.cn:21100/minemapapi/v2.1.0/sprite/sprite';
+        minemap.serviceUrl = 'https://tocc.jtj.suqian.gov.cn:21100/service/';
 
         /**
          * key、solution设置
          */
-        minemap.key = '77ef70465c2d4888b3a5132523494b94';
+        minemap.key = '63b68d77877a4ed686e8bc30894975e5';
 
-        window.key = '77ef70465c2d4888b3a5132523494b94';
-        minemap.solution = 16857;
+        window.key = '63b68d77877a4ed686e8bc30894975e5';
+        minemap.solution = 12886;
     </script>
 </head>
 

+ 12 - 9
public/index.html

@@ -9,20 +9,23 @@
     <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>
+    <link rel="stylesheet" href="https://tocc.jtj.suqian.gov.cn:21100/minemapapi/v2.1.0/minemap.css" />
+    <script src="https://tocc.jtj.suqian.gov.cn:21100/minemapapi/v2.1.0/minemap.js"></script>
+    <script src="./uni.webview.1.5.2.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 = 'https://tocc.jtj.suqian.gov.cn:21100';
+        minemap.dataDomainUrl = 'https://tocc.jtj.suqian.gov.cn:21100';
+        minemap.serverDomainUrl = 'https://tocc.jtj.suqian.gov.cn:21100';
+        minemap.spriteUrl = 'https://tocc.jtj.suqian.gov.cn:21100/minemapapi/v2.1.0/sprite/sprite';
+        minemap.serviceUrl = 'https://tocc.jtj.suqian.gov.cn:21100/service/';
 
         /**
          * key、solution设置
          */
-        minemap.key = '77ef70465c2d4888b3a5132523494b94';
-        minemap.solution = 16857;
+        minemap.key = '63b68d77877a4ed686e8bc30894975e5';
+
+        window.key = '63b68d77877a4ed686e8bc30894975e5';
+        minemap.solution = 12886;
     </script>
 </head>
 

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

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

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

@@ -51,7 +51,7 @@ export default {
     initmap: function () {
       this.map = new minemap.Map({
         container: 'map',
-        style: 'https://minedata.cn/service/solu/style/id/16857' /*底图样式*/,
+        style: 'https://tocc.jtj.suqian.gov.cn:21100/service/solu/style/id/12886' /*底图样式*/,
         center: [118.29564, 33.97441] /*地图中心点*/,
         zoom: 14 /*地图默认缩放等级*/,
         pitch: 0 /*地图俯仰角度*/,

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

@@ -389,7 +389,7 @@ export default defineComponent({
     };
     onMounted(() => {
       window.minemap.util.getJSON(
-        'https://minedata.cn/service/solu/style/id/16857',
+        'https://tocc.jtj.suqian.gov.cn:21100/service/solu/style/id/12886',
         function (error, data) {
           data.layers.forEach(function (layer: any) {
             //判断是否道路线图层

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

@@ -46,7 +46,7 @@ export default defineComponent({
         state.loading = true;
 
         fetch(
-          `https://minedata.cn/service/lbs/search/v1/keywords?keywords=${next}&city=宿迁&citylimit=true&page_idx=1&page_size=10&key=${window.key}`,
+          `https://tocc.jtj.suqian.gov.cn:21100/service/lbs/search/v1/keywords?keywords=${next}&city=宿迁&citylimit=true&page_idx=1&page_size=10&key=${window.key}`,
         )
           .then((res) => res.json())
           .then((data) => {

+ 8 - 4
src/views/IncidentManagementReport/index.tsx

@@ -256,7 +256,9 @@ export default defineComponent({
         getlocalname(center.lng.toFixed(6) + ',' + center.lat.toFixed(6));
       } else {
         isshowmove.value = true;
-        state._marker.remove();
+        if (state.map && state._marker) {
+          state._marker.remove();
+        }
       }
     };
     const setpoint = (longitude, latitude, name) => {
@@ -300,13 +302,15 @@ export default defineComponent({
     const searchaddr = () => {
       isshowmove.value = false;
       fetch(
-        `https://minedata.cn/service/lbs/search/v1/keywords?keywords=${form.value.addr}&city=宿迁&citylimit=true&page_idx=1&page_size=10&key=${window.key}`,
+        `https://tocc.jtj.suqian.gov.cn:21100/service/lbs/search/v1/keywords?keywords=${form.value.addr}&city=宿迁&citylimit=true&page_idx=1&page_size=10&key=${window.key}`,
       )
         .then((res) => res.json())
         .then((data) => {
           // console.log(data.pois)
           var clearallmark = () => {
-            state._marker.remove();
+            if (state.map && state._marker) {
+              state._marker.remove();
+            }
             if (allmark.length > 0) {
               allmark.map((item) => {
                 item.remove();
@@ -379,7 +383,7 @@ export default defineComponent({
     };
     const getlocalname = (location) => {
       fetch(
-        `https://minedata.cn/service/lbs/reverse/v1/regeo?location=${location}&key=${window.key}`,
+        `https://service.minedata.cn/service/lbs/reverse/v1/regeo?location=${location}&key=77ef70465c2d4888b3a5132523494b94`,
       )
         .then((res) => res.json())
         .then((data) => {

+ 8 - 4
src/views/WarehouseEdit/index.vue

@@ -194,7 +194,9 @@ const selectpoint = () => {
     getlocalname(center.lng.toFixed(6) + ',' + center.lat.toFixed(6));
   } else {
     isshowmove.value = true;
-    state._marker.remove();
+    if (state.map && state._marker) {
+      state._marker.remove();
+    }
   }
 };
 const setpoint = (longitude, latitude, name) => {
@@ -239,13 +241,15 @@ const setpoint = (longitude, latitude, name) => {
 const searchaddr = () => {
   isshowmove.value = false;
   fetch(
-    `https://minedata.cn/service/lbs/search/v1/keywords?keywords=${whdata.value.address}&city=宿迁&citylimit=true&page_idx=1&page_size=10&key=${window.key}`,
+    `https://tocc.jtj.suqian.gov.cn:21100/service/lbs/search/v1/keywords?keywords=${whdata.value.address}&city=宿迁&citylimit=true&page_idx=1&page_size=10&key=${window.key}`,
   )
     .then((res) => res.json())
     .then((data) => {
       // console.log(data.pois)
       var clearallmark = () => {
-        state._marker.remove();
+        if (state.map && state._marker) {
+          state._marker.remove();
+        }
         if (allmark.length > 0) {
           allmark.map((item) => {
             item.remove();
@@ -319,7 +323,7 @@ const searchaddr = () => {
 
 const getlocalname = (location) => {
   fetch(
-    `https://minedata.cn/service/lbs/reverse/v1/regeo?location=${location}&key=${window.key}`,
+    `https://service.minedata.cn/service/lbs/reverse/v1/regeo?location=${location}&key=77ef70465c2d4888b3a5132523494b94`,
   )
     .then((res) => res.json())
     .then((data) => {