wenhongquan 3 年之前
父節點
當前提交
5b7409cefb
共有 11 個文件被更改,包括 35 次插入15 次删除
  1. 4 1
      .env.dev
  2. 4 1
      .env.prod
  3. 4 1
      .env.test
  4. 4 1
      .env.zwy
  5. 5 2
      index.html
  6. 5 5
      public/js/common.js
  7. 1 1
      public/main.js
  8. 2 1
      src/components/MapView/index.tsx
  9. 2 1
      src/components/MarkerMap/index.tsx
  10. 1 1
      src/constants/constants.ts
  11. 3 0
      vite.config.ts

+ 4 - 1
.env.dev

@@ -5,4 +5,7 @@ NODE_ENV = development
 VITE_API_SERVER = 'http://61.147.254.211:30876'
 VITE_MAP_SERVER = 'http://61.147.254.211:21009'
 VITE_LOGIN_SERVER = 'http://10.11.208.32:9999'
-VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_SP_USER = 'huashe1'
+VITE_MAP_KEY = '38025fbc9e3f4e1fb64b34b2b55080ab'
+VITE_MAP_SOLUTION = '12887'

+ 4 - 1
.env.prod

@@ -5,4 +5,7 @@ NODE_ENV = prod
 VITE_API_SERVER = 'http://10.11.208.17:30876'
 VITE_MAP_SERVER = 'http://10.11.208.19:21009'
 VITE_LOGIN_SERVER = 'http://10.11.208.32:9999'
-VITE_DH_SERVER = 'http://10.11.208.12:31000/sqdh'
+VITE_DH_SERVER = 'http://10.11.208.12:31000/sqdh'
+VITE_SP_USER = 'huashe1'
+VITE_MAP_KEY = '38025fbc9e3f4e1fb64b34b2b55080ab'
+VITE_MAP_SOLUTION = '12887'

+ 4 - 1
.env.test

@@ -5,4 +5,7 @@ NODE_ENV = test
 VITE_API_SERVER = 'http://61.147.254.211:30876'
 VITE_MAP_SERVER = 'http://61.147.254.211:21009'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999'
-VITE_DH_SERVER = 'http://sqtestdh.xt.wenhq.top:8083'
+VITE_DH_SERVER = 'http://sqtestdh.xt.wenhq.top:8083'
+VITE_SP_USER = 'huashe1'
+VITE_MAP_KEY = '38025fbc9e3f4e1fb64b34b2b55080ab'
+VITE_MAP_SOLUTION = '12887'

+ 4 - 1
.env.zwy

@@ -5,4 +5,7 @@ NODE_ENV = zwy
 VITE_API_SERVER = 'http://10.11.230.150:30009'
 VITE_MAP_SERVER = 'http://10.11.230.152:21009'
 VITE_LOGIN_SERVER = 'http://10.11.230.150:30010'
-VITE_DH_SERVER = 'http://sqtestdh.xt.wenhq.top:8083'
+VITE_DH_SERVER = 'http://sqtestdh.xt.wenhq.top:8083'
+VITE_SP_USER = 'huashe2'
+VITE_MAP_KEY = '63b68d77877a4ed686e8bc30894975e5'
+VITE_MAP_SOLUTION = '222525'

+ 5 - 2
index.html

@@ -6,6 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>交通运输应急指挥系统</title>
+    <script>
+        window.spuser = '<%- spuser %>'
+    </script>
     <!-- <script src="./flexible.js"></script> -->
     <script src="./webClient/defaultConfig.js?time=111"></script>
     <script src="./webClient/initWebSocket.js?time=111"></script>
@@ -37,8 +40,8 @@
          * key、solution设置
          */
 
-        minemap.key = "38025fbc9e3f4e1fb64b34b2b55080ab";
-        minemap.solution = 12887;
+        minemap.key = '<%- mapkey %>';
+        minemap.solution = '<%- mapsolution %>';
     </script>
 
 

+ 5 - 5
public/js/common.js

@@ -1,9 +1,9 @@
 var setting = {
-    username: "huashe1",
-    password: "huashe123",
-    ip: "10.55.134.3",
-    host: "http",
-    port: "6699",
+    username: window.spuser,
+    password: 'huashe123',
+    ip: '10.55.134.3',
+    host: 'http',
+    port: '6699',
 };
 setting.URL = setting.host + "://" + setting.ip + ":" + setting.port;
 localStorage.setItem("url", setting.URL);

+ 1 - 1
public/main.js

@@ -1,7 +1,7 @@
 // login
 
 var setting = {
-    username: "huashe1",
+    username: window.spuser,
     password: "huashe123",
     ip: "10.55.134.3",
     host: "http",

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

@@ -88,7 +88,8 @@ export default defineComponent({
         container: 'map',
         style:
           (import.meta.env.VITE_MAP_SERVER as string) +
-          '/service/solu/style/id/12887' /*底图样式*/,
+          '/service/solu/style/id/' +
+          (import.meta.env.VITE_MAP_SOLUTION as string) /*底图样式*/,
         center: [118.29564, 33.97441] /*地图中心点*/,
         zoom: 12 /*地图默认缩放等级*/,
         pitch: 0 /*地图俯仰角度*/,

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

@@ -1058,7 +1058,8 @@ export default defineComponent({
     onMounted(async () => {
       window.minemap.util.getJSON(
         (import.meta.env.VITE_MAP_SERVER as string) +
-          '/service/solu/style/id/12878',
+          '/service/solu/style/id/' +
+          (import.meta.env.VITE_MAP_SOLUTION as string),
         function (error, data) {
           data.layers.forEach(function (layer: any) {
             //判断是否道路线图层

+ 1 - 1
src/constants/constants.ts

@@ -5,7 +5,7 @@ export const BaseLoginUrl = (import.meta.env.VITE_LOGIN_SERVER as string)+'/home
 export const BaseReg = /^\+\+\+\+[\.]+|[\d|\w|\s|\u4e00-\u9fa5]+\+\+\+\+$/;
 
 export const DA_HUA = {
-  username: 'huashe2',
+  username: 'huashe3',
   password: 'huashe123',
   ip: '10.55.134.3',
   host: 'http',

+ 3 - 0
vite.config.ts

@@ -78,6 +78,9 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
         inject: {
           data: {
             mapurl: getEnvFn(mode, 'VITE_MAP_SERVER'),
+            mapkey: getEnvFn(mode, 'VITE_MAP_KEY'),
+            mapsolution: getEnvFn(mode, 'VITE_MAP_SOLUTION'),
+            spuser: getEnvFn(mode, 'VITE_SP_USER'),
           },
         },
       }),