From a4d81ec0f0219e381e1d985be93e0d594205d759 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期五, 11 八月 2023 17:42:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/MoonWeb

---
 src/assets/js/Map/server.js     |   12 ++++++++++--
 src/views/layer/layerManage.vue |    2 +-
 src/assets/js/Map/config.js     |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/assets/js/Map/config.js b/src/assets/js/Map/config.js
index ee23863..62018ba 100644
--- a/src/assets/js/Map/config.js
+++ b/src/assets/js/Map/config.js
@@ -19,7 +19,7 @@
 
   //鍦板舰
   moonTerrain: "http://172.16.2.10:50001/sj_raster/v6/terrain_mesh/10013901/45",
-
+  BASE_URL: "http://192.168.20.83:8088/MoonServer",
   conditions: [
     ["=", "<>", "like"],
     [">=", ">", " =", "<=", "<", "<>"],
diff --git a/src/assets/js/Map/server.js b/src/assets/js/Map/server.js
index 4efad79..5caaba3 100644
--- a/src/assets/js/Map/server.js
+++ b/src/assets/js/Map/server.js
@@ -1,6 +1,7 @@
 import { getToken } from "@/utils/auth";
 //閰嶇疆鏂囦欢鍦板潃
 import config from "./config";
+
 const server = {
   layerList: [],
   addTreeData(treeNode) {
@@ -91,13 +92,20 @@
       })
     }
     if (service.length > 0) return
+    var url = null;
 
+    if (treeNode.useUrl && treeNode.useUrl.indexOf('{token}') > -1) {
+      const token = getToken()
+      url = config.BASE_URL + treeNode.proxy.replaceAll("{token}", token)
+    } else {
+      url = treeNode.useUrl
+    }
     switch (treeNode.type) {
       case 1:
-        this.AddTmsLayer(treeNode.useUrl, treeNode.id);
+        this.AddTmsLayer(url, treeNode.id);
         break;
       case 2:
-        this.AddWmtesLayer(treeNode.useUrl, treeNode.id);
+        this.AddWmtesLayer(url, treeNode.id);
         break;
       case 3:
         break;
diff --git a/src/views/layer/layerManage.vue b/src/views/layer/layerManage.vue
index 2c603a8..ef7f47a 100644
--- a/src/views/layer/layerManage.vue
+++ b/src/views/layer/layerManage.vue
@@ -158,7 +158,7 @@
 const selectedNodeId = ref(null as any); //鍋氱被鍨嬫柇瑷�澶勭悊
 const emits = defineEmits(["setCloseLayer"]);
 //榛樿閫変腑id
-const DefaultId = ref([15]);
+const DefaultId = ref([29]);
 //鍥惧眰璁剧疆寮规
 const layerSetBox = () => {
   layerSetIsshow.value = !layerSetIsshow.value;

--
Gitblit v1.9.3