From 96bca5626eebaa68462c7b1df6d023a95c92ae4d Mon Sep 17 00:00:00 2001 From: Surpriseplus <845948745@qq.com> Date: 星期二, 05 九月 2023 15:48:20 +0800 Subject: [PATCH] 修改配置文件 --- src/utils/request.js | 2 +- /dev/null | 5 ----- public/config/config.js | 6 ++---- public/WebSDK/Workers/field/rendermapWorker.js | 2 +- src/assets/js/Map/menuTool.js | 2 +- src/assets/js/Map/olMap.js | 2 +- src/utils/auth.js | 2 +- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/public/WebSDK/Workers/field/rendermapWorker.js b/public/WebSDK/Workers/field/rendermapWorker.js index bd7ffcc..11ef49c 100644 --- a/public/WebSDK/Workers/field/rendermapWorker.js +++ b/public/WebSDK/Workers/field/rendermapWorker.js @@ -53,7 +53,7 @@ var colorBar = colorInfo; var valMax = byteArray[byteArray.length - 1]; var valMin = byteArray[byteArray.length - 2]; - debugger + if (colorEqually) { var delta = valMax - valMin; delta = delta / (colorBar.length - 1); diff --git a/public/config/config.js b/public/config/config.js index b4f5ec7..13ed5d2 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -7,16 +7,14 @@ //閰嶇疆鏂囦欢鍦板潃 const config = { mapMoon: webUrl + "/mapscreen/index.html", - //妞悆浣撳垵濮嬪寲鍔犺浇鍥剧墖 - imgUrl: "Workers/image/earth.jpg", - //license璁稿彲 - licenseServer: "http://183.162.245.49:18080", + //SDK璁稿彲 StaticFileBaseUrl: webUrl + "/CIMSDK/", proxy: "http://" + webHost + "/MoonServer", BASE_URL: "http://" + webHost + "/MoonServer", + conditions: [ ["=", "<>", "like"], [">=", ">", " =", "<=", "<", "<>"], diff --git a/public/config/config1.js b/public/config/config1.js deleted file mode 100644 index f6a3fee..0000000 --- a/public/config/config1.js +++ /dev/null @@ -1,5 +0,0 @@ -const BASE_URL = "http://192.168.20.83:8088/MoonServer/"; //鍚庣鎺ュ彛鍦板潃 -// const BASE_URL = "http://192.168.20.106:9000/MoonServer/"; //鍚庣鎺ュ彛鍦板潃 - - -var isWeb = location.hostname.indexOf("103.85.165.") > -1; \ No newline at end of file diff --git a/src/assets/js/Map/menuTool.js b/src/assets/js/Map/menuTool.js index 7524871..58758c8 100644 --- a/src/assets/js/Map/menuTool.js +++ b/src/assets/js/Map/menuTool.js @@ -557,7 +557,7 @@ //绌洪棿鏌ヨ灞炴�у畾浣� spaceLocation(res) { var name = '绌洪棿鏌ヨ'; - debugger + this.setClearLocation(name); switch (res.type) { case 'MultiPolygon': diff --git a/src/assets/js/Map/olMap.js b/src/assets/js/Map/olMap.js index 1c0fdbb..a1f7ab7 100644 --- a/src/assets/js/Map/olMap.js +++ b/src/assets/js/Map/olMap.js @@ -1,6 +1,6 @@ import { getToken } from "@/utils/auth"; //閰嶇疆鏂囦欢鍦板潃 -import config from "../../../../public/config/config"; +import config from "../../../../public/config/config.js"; import { Map, View } from "ol"; //鍦板浘,瑙嗗浘 import OSM from "ol/source/OSM"; //鍙互鐞嗚В涓烘暟鎹簮,灏辨槸涓�寮犲浘鐗� import TileLayer from "ol/layer/Tile"; //鍙互鐞嗚В涓哄浘灞� diff --git a/src/utils/auth.js b/src/utils/auth.js index ea1ceff..e8e6e65 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -10,7 +10,7 @@ } export function setToken(token) { - debugger + return window.sessionStorage.setItem(TokenKey, token); } diff --git a/src/utils/request.js b/src/utils/request.js index af30145..ee1a18d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,7 +10,7 @@ import router from "@/router/index"; import { getToken } from "@/utils/auth"; -import config from "../../public/config/config"; +import config from "../../public/config/config.js"; // create an axios instance const service = axios.create({ baseURL: config.BASE_URL, // api鐨刡ase_url -- Gitblit v1.9.3