From 7123f37c05179936a2f23eb56e0544fc624bc47e Mon Sep 17 00:00:00 2001
From: liqi <1174845810@qq.com>
Date: Sat, 5 Apr 2025 18:58:49 +0800
Subject: [PATCH] 1

---
 public/configJson/mapArea.json            | 19 +++++++++++++++---
 src/components/myMarsmap.vue              | 11 +++++------
 src/views/contentData/headerTop/index.vue | 24 ++++++++++++++++++-----
 src/views/contentData/index.js            | 11 ++++++++++-
 src/views/menuData/PermissionDialog.vue   |  2 +-
 5 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/public/configJson/mapArea.json b/public/configJson/mapArea.json
index f9ca4f8..32c0a4c 100644
--- a/public/configJson/mapArea.json
+++ b/public/configJson/mapArea.json
@@ -62,10 +62,23 @@
     },
     "basemaps": [
       {
-        "id": "",
+        "id": 2021,
+        "pid": 10,
         "name": "天地图影像",
-        "type": "xyz",
-        "url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+        "icon": "https://data.mars3d.cn/img/thumbnail/basemap/tdt_img.png",
+        "type": "group",
+        "layers": [
+          {
+            "name": "底图",
+            "type": "tdt",
+            "layer": "img_d"
+          },
+          {
+            "name": "注记",
+            "type": "tdt",
+            "layer": "img_z"
+          }
+        ],
         "show": true
       }
     ],
diff --git a/src/components/myMarsmap.vue b/src/components/myMarsmap.vue
index bcbea5a..68f78c0 100644
--- a/src/components/myMarsmap.vue
+++ b/src/components/myMarsmap.vue
@@ -9,9 +9,9 @@
         >
           <div class="drawPolygonIcon"></div>
         </div>
-        <!-- <div class="drawPolygon" @click="lineClick('circle')">
+        <div class="drawPolygon" @click="lineClick('circle')">
           <div class="drawCircularIcon"></div>
-        </div> -->
+        </div>
         <!-- <div class="drawPolygon">
           <el-upload
             action=""
@@ -211,9 +211,8 @@ export default {
       }
     },
     lineClick(val) {
-      console.log(val, this.graphicLayer._graphicList._hash[val], "val");
-      // if()
-      if (this.graphicLayer._graphicList._hash[val] === undefined) {
+      console.log(val, this.graphicLayer, "val");
+      if (this.graphicLayer._graphicList._array.length < 1) {
         this.attrType = val;
         let style = {};
         if (val === "polygon") {
@@ -244,7 +243,7 @@ export default {
             // eslint-disable-next-line no-undef
             materialType: mars3d.MaterialType.PolyGradient,
             materialOptions: {
-              color: "#ffff00",
+              color: "#3388cc",
               opacity: 0.7,
               alphaPower: 1.3
             }
diff --git a/src/views/contentData/headerTop/index.vue b/src/views/contentData/headerTop/index.vue
index 692f8f8..ee55f59 100644
--- a/src/views/contentData/headerTop/index.vue
+++ b/src/views/contentData/headerTop/index.vue
@@ -17,10 +17,17 @@
           @click="handleMenuClick(item)"
         >
           <div class="itemIcon">
-            <img
-              :src="activeId === item.id ? item.iconActive : item.icon"
-              :alt="item.name"
-            />
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="item.name"
+              placement="bottom"
+            >
+              <img
+                :src="activeId === item.id ? item.iconActive : item.icon"
+                :alt="item.name"
+              />
+            </el-tooltip>
           </div>
         </div>
       </div>
@@ -32,7 +39,14 @@
           @click="handlefdClick(item)"
         >
           <div class="itemIcon">
-            <img :src="item.icon" :alt="item.name" />
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="item.name"
+              placement="bottom"
+            >
+              <img :src="item.icon" :alt="item.name" />
+            </el-tooltip>
           </div>
         </div>
       </div>
diff --git a/src/views/contentData/index.js b/src/views/contentData/index.js
index 6ccc929..a434d7d 100644
--- a/src/views/contentData/index.js
+++ b/src/views/contentData/index.js
@@ -1,3 +1,4 @@
+import route from "@/router/index";
 export function allPositions(options, show) {
   options.forEach((item, index) => {
     let graphic = window.marsMap.getLayerById(
@@ -220,12 +221,20 @@ function bindLayerPopup(graphicLayer, graphic) {
     });
   } else if (graphic.name === "飞手") {
   } else {
+    let wPath = window.document.location.href;
+    let pathName = route.path;
+    let pos = wPath.indexOf(pathName);
+    let localhostPath = wPath.substring(0, pos);
+    let uploadUrl =
+      process.env.VUE_APP_API_URL === "/"
+        ? localhostPath
+        : process.env.VUE_APP_API_URL;
     graphic.bindPopup(
       ` <div class="mians">
           <div class="title">${attr.name}</div>
           <div class="imgs"><img src="${
             attr.img !== null
-              ? process.env.VUE_APP_API_URL + attr.img
+              ? uploadUrl + attr.img
               : require("@/assets/img/nopic.png")
           }" /></div>
           <div class="device-type">
diff --git a/src/views/menuData/PermissionDialog.vue b/src/views/menuData/PermissionDialog.vue
index 28442b6..cf2e43b 100644
--- a/src/views/menuData/PermissionDialog.vue
+++ b/src/views/menuData/PermissionDialog.vue
@@ -181,7 +181,7 @@ export default {
       let params = {};
       if (type === "add") {
         this.isType = "add";
-        this.title = "新增防区";
+        this.title = "新增人员";
         this.fromItem = {};
         this.formDrawerList[0].disabled = false;
         this.formDrawerList[1].disabled = false;