From 3d07a7ceb5f7c3bd8db79de99ffa666f4220ad85 Mon Sep 17 00:00:00 2001 From: liaoboping <344114999@qq.com> Date: Fri, 19 Sep 2025 21:57:56 +0800 Subject: [PATCH] 8082 --- .env.development | 2 +- .env.production | 2 +- .env.two | 7 +++++++ package.json | 1 + public/config.two.js | 11 +++++++++++ public/index.html | 2 ++ src/components/Common/Directives/Loading.js | 1 + vue.config.js | 1 + 8 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .env.two create mode 100644 public/config.two.js diff --git a/.env.development b/.env.development index 8af7470..60617e5 100644 --- a/.env.development +++ b/.env.development @@ -3,4 +3,4 @@ VUE_APP_PREVIEW=true VUE_APP_API_BASE_URL=/api VUE_APP_API_URL=http://192.168.0.53:8099 VUE_APP_MAP_BASE_URL=/map -VUE_APP_MAP_URL=http://127.0.0.1:8090 +VUE_APP_MAP_URL=http://192.168.0.53:8090 diff --git a/.env.production b/.env.production index faa5370..7d88973 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production VUE_APP_PREVIEW=true VUE_APP_API_BASE_URL=/api -VUE_APP_API_URL=http://192.168.0.189:8099 +VUE_APP_API_URL=http://192.168.0.53:8099 diff --git a/.env.two b/.env.two new file mode 100644 index 0000000..04cef6d --- /dev/null +++ b/.env.two @@ -0,0 +1,7 @@ +NODE_ENV=two +VUE_APP_PREVIEW=true +VUE_APP_PORT=8002 +VUE_APP_API_BASE_URL=/api +VUE_APP_API_URL=http://192.168.0.80:8099 +VUE_APP_MAP_BASE_URL=/map +VUE_APP_MAP_URL=http://127.0.0.1:8090 diff --git a/package.json b/package.json index f6f956c..1929fa6 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "scripts": { "serve": "vue-cli-service serve", "serve:8001": "vue-cli-service serve --mode=one", + "serve:8002": "vue-cli-service serve --mode=two", "build": "vue-cli-service build", "test:unit": "vue-cli-service test:unit", "lint": "vue-cli-service lint", diff --git a/public/config.two.js b/public/config.two.js new file mode 100644 index 0000000..00a334a --- /dev/null +++ b/public/config.two.js @@ -0,0 +1,11 @@ +// @ts-ignore +window._CONFIG = { + ImageryProviderUrl: '/map/mapWX/{z}/{x}/{y}.jpg', + RoadProviderUrl: '', + TerrainProviderUrl: '/map/mapTerrain/', + thirdLoginUrl: 'http://127.0.0.1:8080/thirdLogin', + clientId: '0123456789', + evaluationSrc: 'http://192.168.0.80:8088/thirdLogin/thirdLoginPage?username=admin', + VUE_APP_API_URL: 'http://192.168.0.80:8099', + VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.80:8099', +} diff --git a/public/index.html b/public/index.html index 4bdc69a..0343eaf 100644 --- a/public/index.html +++ b/public/index.html @@ -21,6 +21,8 @@ <% if (process.env.NODE_ENV === 'one') { %> + <% } else if (process.env.NODE_ENV === 'two') { %> + <% } %> <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> diff --git a/src/components/Common/Directives/Loading.js b/src/components/Common/Directives/Loading.js index 89a5989..41e6d00 100644 --- a/src/components/Common/Directives/Loading.js +++ b/src/components/Common/Directives/Loading.js @@ -1,6 +1,7 @@ function initLoadingDom(el, mode = 'light') { el.loadingDom = document.createElement('div') el.loadingDom.style.position = 'absolute' + el.loadingDom.style.zIndex = 1000 el.loadingDom.style.backgroundColor = { light: 'rgba(255,255,255,0.3)', dark: 'rgba(0,0,0,0.3)', diff --git a/vue.config.js b/vue.config.js index 8b23bf5..0baecba 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,3 +1,4 @@ +// @ts-nocheck const os = require('os') const path = require('path') const webpack = require('webpack')