From 96898da23549d6267c7f39be165c7ffc456ca0b4 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Tue, 8 Apr 2025 14:19:13 +0800
Subject: [PATCH] 1

---
 admin-web-master/dist.zip                                | Bin 6421006 -> 0 bytes
 admin-web-master/public/index.html                       |   7 ++++---
 admin-web-master/src/components/add/addcd.vue            |   7 ++++---
 admin-web-master/src/components/newmap/index copy 2.vue  | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/components/newmap/index.vue         | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 admin-web-master/src/components/newmap/indexall copy.vue | 337 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/components/newmap/indexall.vue      | 103 +++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
 admin-web-master/src/components/newmap/map copy.vue      | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/components/newmap/map.vue           | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
 admin-web-master/src/utils/request.js                    |   8 ++++----
 admin-web-master/src/views/detect/admap.vue              |  16 ++++++++++++++--
 admin-web-master/src/views/liveMenu/liveRoom/index.vue   |   8 ++++----
 admin-web-master/vue.config.js                           |  18 +++++++++---------
 13 files changed, 982 insertions(+), 186 deletions(-)
 delete mode 100644 admin-web-master/dist.zip
 create mode 100644 admin-web-master/src/components/newmap/index copy 2.vue
 create mode 100644 admin-web-master/src/components/newmap/indexall copy.vue
 create mode 100644 admin-web-master/src/components/newmap/map copy.vue

diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
deleted file mode 100644
index 3bee74c..0000000
Binary files a/admin-web-master/dist.zip and /dev/null differ
diff --git a/admin-web-master/public/index.html b/admin-web-master/public/index.html
index 0e28f46..bc39137 100644
--- a/admin-web-master/public/index.html
+++ b/admin-web-master/public/index.html
@@ -7,11 +7,12 @@
     <link rel="icon" type="image/png" href="favicon.svg">
     <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
 	<title>招商服务系统</title>
-    <!-- 删除: <script src="https://map.qq.com/api/js?v=2.exp&key=YOUR_API_KEY&callback=initMap"></script> -->
-    <script src="https://map.qq.com/api/js?v=2.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
+    <!-- <script src="https://map.qq.com/api/js?v=2.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
     <script src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
     <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
-    <!-- <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=geometry"></script> -->
+     -->
+    <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=geometry"></script>
+    <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
   </head>
   <body>
     <noscript>
diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index ea2d378..63b966c 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -88,7 +88,8 @@
       </el-form-item> -->
       <el-form-item label="地图标点" prop="detailedLocation">
         <div style="width: 100%;height: 300px;">
-          <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
+          <!-- :message="ruleForm.detailedLocation" -->
+          <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng"  @updatecenter="updatecenter"></newmap>
         </div>
       </el-form-item>
       <el-form-item label="场地描述" prop="description">
@@ -262,8 +263,8 @@
       if (this.info && this.info.id) {
         this.ruleForm = this.info
         if (this.ruleForm.mapMarker) {
-          this.lat = this.ruleForm.mapMarker.split(',')[0]
-          this.lng = this.ruleForm.mapMarker.split(',')[1]
+          this.lat = Number(this.ruleForm.mapMarker.split(',')[0])
+          this.lng = Number(this.ruleForm.mapMarker.split(',')[1])
         }
       } else {
 
diff --git a/admin-web-master/src/components/newmap/index copy 2.vue b/admin-web-master/src/components/newmap/index copy 2.vue
new file mode 100644
index 0000000..6026f5a
--- /dev/null
+++ b/admin-web-master/src/components/newmap/index copy 2.vue
@@ -0,0 +1,262 @@
+<template>
+  <div style="position: relative;width: 100%;">
+    <div id="mapContainer" class="map"></div>
+    <div class="search-box">
+      <input v-model="searchQuery" placeholder="输入地址进行搜索" />
+      <button type="button" @click="searchLocation">搜索</button>
+    </div>
+    <div v-if="searchResults.length > 0" class="search-results">
+      <ul>
+        <li v-for="(result, index) in searchResults" :key="index" @click="selectResult(result)">
+          {{ result.title }}
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'TencentMap',
+    props: {
+      lat: {
+        type: Number,
+        default: 30.67
+      },
+      lng: {
+        type: Number,
+        default: 104.06
+      },
+      isonloed: {
+        type: Boolean,
+        default: false
+      },
+      isx: {
+        type: Boolean,
+        default: true
+      },
+      message: {
+        type: String,
+        default: ''
+      },
+    },
+    data() {
+      return {
+        map: null,
+        marker: null,
+        address: '',
+        searchQuery: '', // 搜索查询
+        searchResults: [], // 搜索结果列表
+
+      };
+    },
+    mounted() {
+      // 初始化地图
+      this.initMap();
+    },
+    methods: {
+      // 选择某一条搜索结果
+      selectResult(result) {
+        const latLng = new qq.maps.LatLng(result.location.lat, result.location.lng);
+
+        // 移动地图中心到选择的位置
+        this.map.setCenter(latLng);
+
+        // 更新标记位置
+        this.marker.setPosition(latLng);
+
+        // 获取地址信息
+        this.getAreaCode(result.location.lat, result.location.lng);
+
+        
+      },
+      searchLocation() {
+        let that = this
+        if (!this.searchQuery) {
+          this.$message.error('请输入搜索地址');
+          return;
+        }
+
+        // 使用腾讯地图的搜索服务
+        this.$jsonp("https://apis.map.qq.com/ws/place/v1/search", {
+          keyword: this.searchQuery,
+          key: 'PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU', // 使用你的腾讯地图API key
+          output: "jsonp",
+          boundary: 'nearby(' + that.lat + ',' + that.lng + ',1000,1)'
+        }).then((res) => {
+          console.error(res)
+          if (res.status === 0 && res.data.length > 0) {
+            this.searchResults = res.data; // 存储搜索结果
+          } else {
+            this.$message.error('未找到相关地址');
+            this.searchResults = []; // 清空搜索结果
+          }
+        }).catch(err => {
+          this.$message.error("搜索失败");
+          console.error(err);
+        });
+      },
+      initMap() {
+        if (this.isx) {
+        
+        } else {
+          this.lat = this.message.split(',')[0]
+          this.lng = this.message.split(',')[1]
+        }
+        // 将经纬度转换为腾讯地图的LatLng对象
+        const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
+
+        // 创建地图实例
+        this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
+          center: centerLatLng,
+          zoom: 13,
+          // mapStyleId: 'style1'
+        });
+
+        // 创建标记
+        if (this.isonloed) {
+          this.marker = new qq.maps.Marker({
+            position: centerLatLng,
+            map: this.map
+          });
+        } else {
+          this.marker = new qq.maps.Marker({
+            // position: centerLatLng,
+            map: this.map
+          });
+        }
+        if (this.isx) {
+          qq.maps.event.addListener(this.map, 'click', this.onMapClick);
+        } else {
+          const centerLatLng1 = new qq.maps.LatLng(this.message.split(',')[0], this.message.split(',')[1]);
+          console.error(this.message)
+          this.marker = new qq.maps.Marker({
+            position: centerLatLng1,
+            map: this.map
+          });
+        }
+
+        // 添加点击事件监听器
+        // qq.maps.event.addListener(this.marker, 'click', this.onMarkerClick);
+
+        // 添加地图点击事件监听器
+
+
+        // // 获取地址信息
+        // this.getAreaCode(this.lat, this.lng);
+      },
+      onMarkerClick() {
+        alert('您点击了标记点');
+      },
+      onMapClick(event) {
+        // 获取点击位置的经纬度
+        const newLatLng = event.latLng;
+
+        // 更新标记位置
+        this.marker.setPosition(newLatLng);
+        this.getAreaCode(newLatLng.getLat(), newLatLng.getLng());
+        // 更新父组件中的经纬度
+
+
+        // 获取新的地址信息
+
+      },
+      getAreaCode(lat, lng) {
+        this.searchQuery = ''
+        // 清空搜索结果
+        this.searchResults = [];
+        let that = this;
+        //这里可以直接this.$jsonp地址传入你的经纬度;
+        that.$jsonp("https://apis.map.qq.com/ws/geocoder/v1/?", {
+          location: `${lat},${lng}`, // 经纬度
+          key: 'PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU', //这里就是要开启那个service不然会报错让你开启
+          output: "jsonp", // output必须jsonp 不然会超时
+        }).then((res) => {
+          if (res.message == 'Success') {
+            console.log(res);
+            that.address = res.result.address
+            that.$emit('updatecenter', {
+              lat: lat,
+              lng: lng,
+              address: that.address
+            });
+          } else {
+            this.$message.error(res.message)
+
+          }
+        }).catch(err => {
+          this.$message.error("获取城市编码失败")
+          console.error(err)
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .map {
+    width: 100%;
+    height: 300px;
+  }
+
+  .search-box {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    z-index: 1000;
+    background: #fff;
+    padding: 10px;
+    border-radius: 5px;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+    width: 280px;
+  }
+
+  .search-box input {
+    padding: 5px;
+    margin-right: 5px;
+  }
+
+  .search-box button {
+    padding: 5px 10px;
+    background-color: #007bff;
+    color: #fff;
+    border: none;
+    border-radius: 3px;
+    cursor: pointer;
+  }
+
+  .search-box button:hover {
+    background-color: #0056b3;
+  }
+
+  .search-results {
+    position: absolute;
+    top: 60px;
+    left: 10px;
+    z-index: 999;
+    background: #fff;
+    padding: 10px;
+    border-radius: 5px;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+    max-height: 200px;
+    overflow-y: auto;
+    width: 280px;
+    
+  }
+  .search-results::-webkit-scrollbar {
+    display: none; /* 隐藏滚动条 */
+  }
+  .search-results ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+  }
+
+  .search-results li {
+    padding: 5px;
+    cursor: pointer;
+  }
+
+  .search-results li:hover {
+    background-color: #f0f0f0;
+  }
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index 6026f5a..e8c185a 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -1,9 +1,12 @@
 <template>
-  <div style="position: relative;width: 100%;">
+  <div style="width: 100%;">
     <div id="mapContainer" class="map"></div>
-    <div class="search-box">
+    <div class="search-box" v-if="isx">
       <input v-model="searchQuery" placeholder="输入地址进行搜索" />
-      <button type="button" @click="searchLocation">搜索</button>
+      <div style="box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);display: flex;align-items: center;background: #fff;padding: 0 20px;border-radius: 5px;overflow: hidden;margin-left: 10px;">
+        <i class="el-icon-search" style="margin-right: 10px;color: #3F9B6A;"></i>
+        <button type="button" @click="searchLocation">搜索</button>
+      </div>
     </div>
     <div v-if="searchResults.length > 0" class="search-results">
       <ul>
@@ -56,13 +59,27 @@
     methods: {
       // 选择某一条搜索结果
       selectResult(result) {
-        const latLng = new qq.maps.LatLng(result.location.lat, result.location.lng);
 
-        // 移动地图中心到选择的位置
-        this.map.setCenter(latLng);
+        console.error('====')
+        let lat = result.location.lat;
+        let lng = result.location.lng;
+        
+        //修改点标记的位置
+        this.marker.updateGeometries([
+          {
+            "styleId":"myStyle",
+            "id": "1",
+            "position": new TMap.LatLng(lat, lng),
+          }
+        ])
+
+        // const latLng = new TMap.maps.LatLng(result.location.lat, result.location.lng);
 
-        // 更新标记位置
-        this.marker.setPosition(latLng);
+        // // 移动地图中心到选择的位置
+        // this.map.setCenter(latLng);
+
+        // // 更新标记位置
+        // this.marker.setPosition(latLng);
 
         // 获取地址信息
         this.getAreaCode(result.location.lat, result.location.lng);
@@ -99,39 +116,57 @@
         if (this.isx) {
         
         } else {
-          this.lat = this.message.split(',')[0]
-          this.lng = this.message.split(',')[1]
+          this.lat = Number(this.message.split(',')[0])
+          this.lng = Number(this.message.split(',')[1])
         }
         // 将经纬度转换为腾讯地图的LatLng对象
-        const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
+        const centerLatLng = new TMap.LatLng(this.lat, this.lng);
 
-        // 创建地图实例
-        this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
+        this.map = new TMap.Map(document.getElementById("mapContainer"), {
           center: centerLatLng,
           zoom: 13,
-          // mapStyleId: 'style1'
+          mapStyleId: 'style1'
         });
 
         // 创建标记
         if (this.isonloed) {
-          this.marker = new qq.maps.Marker({
-            position: centerLatLng,
-            map: this.map
+          this.marker = new TMap.MultiMarker({
+            map: this.map,  //指定地图容器
+            //点标记数据数组
+            geometries: [
+              {
+                "styleId":"myStyle",
+                "id": "1",
+                "position": new TMap.LatLng(this.lat,this.lng),
+              }
+            ]
           });
         } else {
-          this.marker = new qq.maps.Marker({
-            // position: centerLatLng,
+          this.marker = new TMap.MultiMarker({
             map: this.map
           });
         }
         if (this.isx) {
-          qq.maps.event.addListener(this.map, 'click', this.onMapClick);
+          // TMap.maps.event.addListener(this.map, 'click', this.onMapClick);
+
+          this.map.on("click",this.onMapClick)
         } else {
-          const centerLatLng1 = new qq.maps.LatLng(this.message.split(',')[0], this.message.split(',')[1]);
-          console.error(this.message)
-          this.marker = new qq.maps.Marker({
-            position: centerLatLng1,
-            map: this.map
+          // const centerLatLng1 = new TMap.maps.LatLng(this.message.split(',')[0], this.message.split(',')[1]);
+          // console.error(this.message)
+          // this.marker = new TMap.maps.Marker({
+          //   position: centerLatLng1,
+          //   map: this.map
+          // });
+          this.marker = new TMap.MultiMarker({
+            map: this.map,  //指定地图容器
+            //点标记数据数组
+            geometries: [
+              {
+                "styleId":"myStyle",
+                "id": "1",
+                "position": new TMap.LatLng(Number(this.message.split(',')[0]), Number(this.message.split(',')[1])),
+              }
+            ]
           });
         }
 
@@ -147,17 +182,32 @@
       onMarkerClick() {
         alert('您点击了标记点');
       },
-      onMapClick(event) {
-        // 获取点击位置的经纬度
-        const newLatLng = event.latLng;
+      onMapClick(evt) {
+        console.error('====')
+        let lat = evt.latLng.getLat().toFixed(6);
+        let lng = evt.latLng.getLng().toFixed(6);
+        
+        //修改点标记的位置
+        this.marker.updateGeometries([
+          {
+            "styleId":"myStyle",
+            "id": "1",
+            "position": new TMap.LatLng(lat, lng),
+          }
+        ])
+        
+        // // 回显经纬度
+        // _this.$emit('PositionDegrees', {lng, lat})
+        // // 获取点击位置的经纬度
+        // const newLatLng = event.latLng;
 
-        // 更新标记位置
-        this.marker.setPosition(newLatLng);
-        this.getAreaCode(newLatLng.getLat(), newLatLng.getLng());
-        // 更新父组件中的经纬度
+        // // 更新标记位置
+        // this.marker.setPosition(newLatLng);
+        this.getAreaCode(lat,lng);
+        // // 更新父组件中的经纬度
 
 
-        // 获取新的地址信息
+        // // 获取新的地址信息
 
       },
       getAreaCode(lat, lng) {
@@ -175,8 +225,8 @@
             console.log(res);
             that.address = res.result.address
             that.$emit('updatecenter', {
-              lat: lat,
-              lng: lng,
+              lat: Number(lat),
+              lng: Number(lng),
               address: that.address
             });
           } else {
@@ -203,36 +253,49 @@
     top: 10px;
     left: 10px;
     z-index: 1000;
-    background: #fff;
-    padding: 10px;
-    border-radius: 5px;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-    width: 280px;
+    /* background: #fff; */
+    /* padding: 10px; */
+    /* border-radius: 5px; */
+    /* box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); */
+    /* width: 280px; */
+    display: flex;
+    justify-content: space-between;
   }
 
   .search-box input {
-    padding: 5px;
+    /* padding: 5px; */
+    padding: 15px 8px;
     margin-right: 5px;
+    font-size: 10px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #eee;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+    width: 200px;
   }
 
   .search-box button {
-    padding: 5px 10px;
-    background-color: #007bff;
-    color: #fff;
+    padding: 15px 0;
+    background-color: #fff;
+    /* color: #fff; */
     border: none;
     border-radius: 3px;
     cursor: pointer;
+    height: 100%;
+    box-sizing: border-box;
+    font-size: 10px;
+    color: -internal-light-dark(black, white);
   }
 
   .search-box button:hover {
-    background-color: #0056b3;
+    background-color: #fff;
   }
 
   .search-results {
     position: absolute;
     top: 60px;
     left: 10px;
-    z-index: 999;
+    z-index: 1000;
     background: #fff;
     padding: 10px;
     border-radius: 5px;
diff --git a/admin-web-master/src/components/newmap/indexall copy.vue b/admin-web-master/src/components/newmap/indexall copy.vue
new file mode 100644
index 0000000..e4a86d6
--- /dev/null
+++ b/admin-web-master/src/components/newmap/indexall copy.vue
@@ -0,0 +1,337 @@
+<template>
+  <div>
+    <div id="container"></div>
+    <div class="search-box">
+      <input v-model="searchQuery" placeholder="输入地址进行搜索" />
+      <button type="button" @click="searchLocation">搜索</button>
+    </div>
+    <!-- <div id="toolControl">
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'marker' }"
+        id="marker"
+        title="点标记"
+        @click="setActiveType('marker')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'polyline' }"
+        id="polyline"
+        title="折线"
+        @click="setActiveType('polyline')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'polygon' }"
+        id="polygon"
+        title="多边形"
+        @click="setActiveType('polygon')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'circle' }"
+        id="circle"
+        title="圆形"
+        @click="setActiveType('circle')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'rectangle' }"
+        id="rectangle"
+        title="矩形"
+        @click="setActiveType('rectangle')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'ellipse' }"
+        id="ellipse"
+        title="椭圆"
+        @click="setActiveType('ellipse')"
+      ></div>
+    </div> -->
+    <!-- <div style="height: 100px;">
+      绘制：鼠标左键点击及移动即可绘制图形
+      <br />
+      结束绘制：鼠标左键双击即可结束绘制折线、多边形会自动闭合；圆形、矩形、椭圆单击即可结束
+      <br />
+      中断：绘制过程中按下esc键可中断该过程
+    </div> -->
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'IndexAll',
+  data() {
+    return {
+      map: null, // 地图
+      editor: null, // 编辑器
+      activeType: 'marker', // 激活的图形编辑类型
+      marker: null,
+      polyline: null,
+      polygon: null,
+      circle: null,
+      rectangle: null,
+      ellipse: null,
+      searchQuery: '', // 搜索查询
+    };
+  },
+  props: {
+    lat: {
+      type: Number,
+      default: 30.67
+    },
+    lng: {
+      type: Number,
+      default: 104.06
+    },
+    message:{
+      type: String,
+      default: ''
+    },
+  },
+  mounted() {
+    this.initMap();
+    this.setActiveType('polygon')
+  },
+  methods: {
+    searchLocation() {
+        let that = this
+        if (!this.searchQuery) {
+          this.$message.error('请输入搜索地址');
+          return;
+        }
+
+        // 使用腾讯地图的搜索服务
+        this.$jsonp("https://apis.map.qq.com/ws/place/v1/search", {
+          keyword: this.searchQuery,
+          key: 'PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU', // 使用你的腾讯地图API key
+          output: "jsonp",
+          boundary: 'nearby(' + that.lat + ',' + that.lng + ',1000,1)'
+        }).then((res) => {
+          console.error(res)
+          if (res.status === 0 && res.data.length > 0) {
+            const location = res.data[0].location;
+            const latLng = new qq.maps.LatLng(location.lat, location.lng);
+
+            // 移动地图中心到搜索到的位置
+            this.map.setCenter(latLng);
+          } else {
+            this.$message.error('未找到相关地址');
+          }
+        }).catch(err => {
+          this.$message.error("搜索失败");
+          console.error(err);
+        });
+      },
+    setActiveType(type) {
+      this.activeType = type;
+      this.editor.setActiveOverlay(type);
+    },
+    initMap() {
+      // 初始化地图
+      this.map = new TMap.Map('container', {
+        zoom: 12, // 设置地图缩放级别
+        center: new TMap.LatLng(this.lat, this.lng), // 设置地图中心点坐标
+      });
+      var path = [];
+      if(this.message != '') {
+        let listall  = JSON.parse(this.message)
+        for (let index = 0; index < listall.length; index++) {
+          const element = listall[index];
+          const c1 = new TMap.LatLng(element.lat,element.lng)
+          path.push(c1)
+        }
+      }
+      
+      // 初始化几何图形及编辑器
+      this.marker = new TMap.MultiMarker({
+        map: this.map,
+      });
+      this.polyline = new TMap.MultiPolyline({
+        map: this.map,
+      });
+      this.polygon = new TMap.MultiPolygon({
+        map: this.map,
+        geometries: [
+            {
+                'id': 'p1', //该多边形在图层中的唯一标识（删除、更新数据时需要）
+                'styleId': 'polygon', //绑定样式名
+                'paths': path, //多边形轮廓
+            }
+        ]
+      });
+      this.circle = new TMap.MultiCircle({
+        map: this.map,
+      });
+      this.rectangle = new TMap.MultiRectangle({
+        map: this.map,
+      });
+      this.ellipse = new TMap.MultiEllipse({
+        map: this.map,
+      });
+
+      this.editor = new TMap.tools.GeometryEditor({
+        map: this.map, // 编辑器绑定的地图对象
+        overlayList: [
+          {
+            overlay: this.marker,
+            id: 'marker',
+          },
+          {
+            overlay: this.polyline,
+            id: 'polyline',
+          },
+          {
+            overlay: this.polygon,
+            id: 'polygon',
+          },
+          {
+            overlay: this.circle,
+            id: 'circle',
+          },
+          {
+            overlay: this.rectangle,
+            id: 'rectangle',
+          },
+          {
+            overlay: this.ellipse,
+            id: 'ellipse',
+          },
+        ],
+        actionMode: TMap.tools.constants.EDITOR_ACTION.DRAW, // 编辑器的工作模式
+        activeOverlayId: 'marker', // 激活图层
+        snappable: true, // 开启吸附
+      });
+
+      // 监听绘制结束事件，获取绘制几何图形
+      this.editor.on('draw_complete', (geometry) => {
+        const id = geometry.id;
+        if (this.editor.getActiveOverlay().id === 'rectangle') {
+          const geo = this.rectangle.geometries.filter((item) => item.id === id);
+          console.log('绘制的矩形定位的坐标：', geo[0].paths);
+        }
+
+        if (this.editor.getActiveOverlay().id === 'polygon') {
+          // console.error(this.polygon.geometries)
+          const geo = this.polygon.geometries.filter((item) => item.id === id);
+          console.log('绘制的多边形坐标：', geo[0].paths);
+          // var path = [
+          // ];
+          // for (let index = 0; index < geo[0].paths.length; index++) {
+          //   const element = geo[0].paths[index];
+          //   const c1 = new TMap.LatLng(element.lat,element.lng)
+          //   path.push(c1)
+          // }
+          // // 计算多边形形心
+          // var position = TMap.geometry.computeCentroid(path);
+          // console.log('绘制的多边形坐标：',position);
+          this.$emit('updatecenter', geo[0].paths);
+        }
+      });
+    },
+    
+  },
+};
+</script>
+
+<style scoped>
+html,
+body {
+  height: 100%;
+  margin: 0px;
+  padding: 0px;
+}
+
+#container {
+  width: 100%;
+  height: 300px;
+}
+
+#toolControl {
+  position: absolute;
+  top: 10px;
+  left: 0px;
+  right: 0px;
+  margin: auto;
+  width: 252px;
+  z-index: 1001;
+}
+
+.toolItem {
+  width: 30px;
+  height: 30px;
+  float: left;
+  margin: 1px;
+  padding: 4px;
+  border-radius: 3px;
+  background-size: 30px 30px;
+  background-position: 4px 4px;
+  background-repeat: no-repeat;
+  box-shadow: 0 1px 2px 0 #e4e7ef;
+  background-color: #ffffff;
+  border: 1px solid #ffffff;
+}
+
+.toolItem:hover {
+  border-color: #789cff;
+}
+
+.active {
+  border-color: #d5dff2;
+  background-color: #d5dff2;
+}
+
+#marker {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker_editor.png');
+}
+
+#polyline {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/polyline.png');
+}
+
+#polygon {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/polygon.png');
+}
+
+#circle {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/circle.png');
+}
+
+#rectangle {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/rectangle.png');
+}
+
+#ellipse {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/ellipse.png');
+}
+.search-box {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    z-index: 1000;
+    background: #fff;
+    padding: 10px;
+    border-radius: 5px;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+    width: 280px;
+  }
+
+  .search-box input {
+    padding: 5px;
+    margin-right: 5px;
+  }
+
+  .search-box button {
+    padding: 5px 10px;
+    background-color: #007bff;
+    color: #fff;
+    border: none;
+    border-radius: 3px;
+    cursor: pointer;
+  }
+
+  .search-box button:hover {
+    background-color: #0056b3;
+  }
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue
index e4a86d6..c0773a4 100644
--- a/admin-web-master/src/components/newmap/indexall.vue
+++ b/admin-web-master/src/components/newmap/indexall.vue
@@ -1,61 +1,13 @@
 <template>
   <div>
     <div id="container"></div>
-    <div class="search-box">
+    <div class="search-box" v-if="isx">
       <input v-model="searchQuery" placeholder="输入地址进行搜索" />
-      <button type="button" @click="searchLocation">搜索</button>
+      <div style="box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);display: flex;align-items: center;background: #fff;padding: 0 20px;border-radius: 5px;overflow: hidden;margin-left: 10px;">
+        <i class="el-icon-search" style="margin-right: 10px;color: #3F9B6A;"></i>
+        <button type="button" @click="searchLocation">搜索</button>
+      </div>
     </div>
-    <!-- <div id="toolControl">
-      <div
-        class="toolItem"
-        :class="{ active: activeType === 'marker' }"
-        id="marker"
-        title="点标记"
-        @click="setActiveType('marker')"
-      ></div>
-      <div
-        class="toolItem"
-        :class="{ active: activeType === 'polyline' }"
-        id="polyline"
-        title="折线"
-        @click="setActiveType('polyline')"
-      ></div>
-      <div
-        class="toolItem"
-        :class="{ active: activeType === 'polygon' }"
-        id="polygon"
-        title="多边形"
-        @click="setActiveType('polygon')"
-      ></div>
-      <div
-        class="toolItem"
-        :class="{ active: activeType === 'circle' }"
-        id="circle"
-        title="圆形"
-        @click="setActiveType('circle')"
-      ></div>
-      <div
-        class="toolItem"
-        :class="{ active: activeType === 'rectangle' }"
-        id="rectangle"
-        title="矩形"
-        @click="setActiveType('rectangle')"
-      ></div>
-      <div
-        class="toolItem"
-        :class="{ active: activeType === 'ellipse' }"
-        id="ellipse"
-        title="椭圆"
-        @click="setActiveType('ellipse')"
-      ></div>
-    </div> -->
-    <!-- <div style="height: 100px;">
-      绘制：鼠标左键点击及移动即可绘制图形
-      <br />
-      结束绘制：鼠标左键双击即可结束绘制折线、多边形会自动闭合；圆形、矩形、椭圆单击即可结束
-      <br />
-      中断：绘制过程中按下esc键可中断该过程
-    </div> -->
   </div>
 </template>
 
@@ -77,6 +29,10 @@ export default {
     };
   },
   props: {
+    isx: {
+      type: Boolean,
+      default: true
+    },
     lat: {
       type: Number,
       default: 30.67
@@ -112,7 +68,7 @@ export default {
           console.error(res)
           if (res.status === 0 && res.data.length > 0) {
             const location = res.data[0].location;
-            const latLng = new qq.maps.LatLng(location.lat, location.lng);
+            const latLng = new TMap.LatLng(location.lat, location.lng);
 
             // 移动地图中心到搜索到的位置
             this.map.setCenter(latLng);
@@ -133,17 +89,19 @@ export default {
       this.map = new TMap.Map('container', {
         zoom: 12, // 设置地图缩放级别
         center: new TMap.LatLng(this.lat, this.lng), // 设置地图中心点坐标
+         mapStyleId: 'style1'
       });
       var path = [];
       if(this.message != '') {
         let listall  = JSON.parse(this.message)
         for (let index = 0; index < listall.length; index++) {
           const element = listall[index];
-          const c1 = new TMap.LatLng(element.lat,element.lng)
+          const c1 = new TMap.LatLng(Number(element.lat),Number(element.lng))
           path.push(c1)
         }
       }
-      
+      console.error(path )
+      console.error(this.message )
       // 初始化几何图形及编辑器
       this.marker = new TMap.MultiMarker({
         map: this.map,
@@ -310,28 +268,41 @@ body {
     top: 10px;
     left: 10px;
     z-index: 1000;
-    background: #fff;
-    padding: 10px;
-    border-radius: 5px;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-    width: 280px;
+    /* background: #fff; */
+    /* padding: 10px; */
+    /* border-radius: 5px; */
+    /* box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); */
+    /* width: 280px; */
+    display: flex;
+    justify-content: space-between;
   }
 
   .search-box input {
-    padding: 5px;
+    /* padding: 5px; */
+    padding: 15px 8px;
     margin-right: 5px;
+    font-size: 10px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #eee;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+    width: 200px;
   }
 
   .search-box button {
-    padding: 5px 10px;
-    background-color: #007bff;
-    color: #fff;
+    padding: 15px 0;
+    background-color: #fff;
+    /* color: #fff; */
     border: none;
     border-radius: 3px;
     cursor: pointer;
+    height: 100%;
+    box-sizing: border-box;
+    font-size: 10px;
+    color: -internal-light-dark(black, white);
   }
 
   .search-box button:hover {
-    background-color: #0056b3;
+    background-color: #fff;
   }
 </style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/newmap/map copy.vue b/admin-web-master/src/components/newmap/map copy.vue
new file mode 100644
index 0000000..3514401
--- /dev/null
+++ b/admin-web-master/src/components/newmap/map copy.vue
@@ -0,0 +1,134 @@
+<template>
+  <div style="position: relative;width: 100%;">
+    <div id="mapContainer" class="map"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TencentMap',
+  props: {
+    lat: {
+      type: Number,
+      default: 30.67
+    },
+    lng: {
+      type: Number,
+      default: 104.06
+    },
+    isonloed: {
+      type: Boolean,
+      default: false
+    },
+    isx: {
+      type: Boolean,
+      default: true
+    },
+    ontype: {
+      type: String,
+      default: '1'
+    },
+    message: {
+      type: Array,
+      default: () => []
+    },
+  },
+  data() {
+    return {
+      map: null,
+      marker: null,
+      address: '',
+      markers: [],
+      infoWindow: null,
+    };
+  },
+  mounted() {
+    // 初始化地图
+    this.initMap(this.message);
+  },
+  methods: {
+    initMap(e) {
+      // 将经纬度转换为腾讯地图的LatLng对象
+      const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
+
+      // 创建地图实例
+      this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
+        center: centerLatLng,
+        zoom: 13
+      });
+
+      // 创建信息窗口实例
+      this.infoWindow = new qq.maps.InfoWindow({
+        map: this.map
+      });
+
+      // 遍历 message 数组，为每个位置创建一个标记
+      if (e.length > 0) {
+        e.forEach(item => {
+          // console.error( item)
+          let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : [];
+          item.lat = parseFloat(list[0]);
+          item.lng = parseFloat(list[1]);
+          item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无';
+          const markerLatLng = new qq.maps.LatLng(item.lat, item.lng);
+          const customIconUrl1 = require(item.publishStatus=='0'?'@/assets/images/iconsp1.png':item.publishStatus=='1'?'@/assets/images/iconsp2.png':item.publishStatus=='2'?'@/assets/images/iconsp3.png':item.publishStatus=='3'?'@/assets/images/iconsp4.png':item.publishStatus=='4'?'@/assets/images/iconsp5.png':'@/assets/images/iconsp1.png'); // 确保返回的是 URL 字符串
+          const customIconUrl2 = require(item.publishStatus=='0'?'@/assets/images/icongg1.png':item.publishStatus=='1'?'@/assets/images/icongg2.png':item.publishStatus=='2'?'@/assets/images/icongg3.png':item.publishStatus=='3'?'@/assets/images/icongg4.png':item.publishStatus=='4'?'@/assets/images/icongg5.png':'@/assets/images/icongg1.png'); // 确保返回的是 URL 字符串
+          const customIconUrl3 = require(item.publishStatus=='0'?'@/assets/images/iconcd1.png':item.publishStatus=='1'?'@/assets/images/iconcd2.png':item.publishStatus=='2'?'@/assets/images/iconcd3.png':item.publishStatus=='3'?'@/assets/images/iconcd4.png':item.publishStatus=='4'?'@/assets/images/iconcd5.png':'@/assets/images/iconcd1.png'); // 确保返回的是 URL 字符串
+          const icon =  this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:''
+          const marker = new qq.maps.Marker({
+            position: markerLatLng,
+            map: this.map,
+            icon:icon
+          });
+
+          // 为标记添加点击事件监听器
+          qq.maps.event.addListener(marker, 'click', () => {
+            this.showInfoWindow(marker, item);
+          });
+
+          this.markers.push(marker);
+        });
+      }
+    },
+    showInfoWindow(marker, item) {
+      // 设置信息窗口的内容
+      const content = `
+        <div style="padding:10px 0;border-radius: 18px;">
+          <p style="padding-top:10px;">资源名称:${item.name}</p>
+          <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
+          <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='0'?'color: #707B86;':item.publishStatus=='1'?'color: #ECAF5C;':item.publishStatus=='2'?'color: #4A77C9;':item.publishStatus=='3'?'color: #E75A46;':item.publishStatus=='4'?'color: #2AB867;':'color: #707B86;'}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
+          </div>
+      `;
+      // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
+      //     <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm">
+      //       <el-form-item label="资源名称" prop="entityName">
+      //         <div class="duiqi">${item.name}</div>
+      //       </el-form-item>
+      //       <el-form-item label="位置" prop="entityName">
+      //         <div class="duiqi">${item.detailedLocation}</div>
+      //       </el-form-item>
+      //     </el-form>
+      //   </div>
+      // 设置信息窗口的位置和内容
+      this.infoWindow.setPosition(marker.getPosition());
+      this.infoWindow.setContent(content);
+      this.infoWindow.open();
+    }
+  }
+}
+</script>
+
+<style scoped>
+.map {
+  width: 100%;
+  height: 400px;
+}
+
+.address-info {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 999999;
+  background: #fff;
+}
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue
index 3514401..c293e97 100644
--- a/admin-web-master/src/components/newmap/map.vue
+++ b/admin-web-master/src/components/newmap/map.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="position: relative;width: 100%;">
+  <div style="width: 100%;">
     <div id="mapContainer" class="map"></div>
   </div>
 </template>
@@ -44,75 +44,95 @@ export default {
   },
   mounted() {
     // 初始化地图
-    this.initMap(this.message);
+    // this.initMap(this.message);
   },
   methods: {
     initMap(e) {
       // 将经纬度转换为腾讯地图的LatLng对象
-      const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
+      const centerLatLng = new TMap.LatLng(this.lat, this.lng);
 
       // 创建地图实例
-      this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
+      this.map = new TMap.Map(document.getElementById("mapContainer"), {
         center: centerLatLng,
-        zoom: 13
+        zoom: 13,
+        mapStyleId: 'style1'
       });
-
+      // return
       // 创建信息窗口实例
-      this.infoWindow = new qq.maps.InfoWindow({
-        map: this.map
+      this.infowindow = new TMap.InfoWindow({
+          map: this.map,
+          position: centerLatLng,
+          offset: { x: 0, y: -20 } //设置信息窗相对position偏移像素，为了使其显示在Marker的上方
       });
-
+      this.infowindow.close();//初始关闭信息窗关闭
+      const listall = []
+      const listallstyles = {}
       // 遍历 message 数组，为每个位置创建一个标记
       if (e.length > 0) {
         e.forEach(item => {
           // console.error( item)
+          let idstyles ='Style'+item.id
           let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : [];
           item.lat = parseFloat(list[0]);
           item.lng = parseFloat(list[1]);
           item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无';
-          const markerLatLng = new qq.maps.LatLng(item.lat, item.lng);
-          const customIconUrl1 = require(item.publishStatus=='0'?'@/assets/images/iconsp1.png':item.publishStatus=='1'?'@/assets/images/iconsp2.png':item.publishStatus=='2'?'@/assets/images/iconsp3.png':item.publishStatus=='3'?'@/assets/images/iconsp4.png':item.publishStatus=='4'?'@/assets/images/iconsp5.png':'@/assets/images/iconsp1.png'); // 确保返回的是 URL 字符串
-          const customIconUrl2 = require(item.publishStatus=='0'?'@/assets/images/icongg1.png':item.publishStatus=='1'?'@/assets/images/icongg2.png':item.publishStatus=='2'?'@/assets/images/icongg3.png':item.publishStatus=='3'?'@/assets/images/icongg4.png':item.publishStatus=='4'?'@/assets/images/icongg5.png':'@/assets/images/icongg1.png'); // 确保返回的是 URL 字符串
-          const customIconUrl3 = require(item.publishStatus=='0'?'@/assets/images/iconcd1.png':item.publishStatus=='1'?'@/assets/images/iconcd2.png':item.publishStatus=='2'?'@/assets/images/iconcd3.png':item.publishStatus=='3'?'@/assets/images/iconcd4.png':item.publishStatus=='4'?'@/assets/images/iconcd5.png':'@/assets/images/iconcd1.png'); // 确保返回的是 URL 字符串
+          const markerLatLng = new TMap.LatLng(item.lat, item.lng);
+          const customIconUrl1 = require(item.publishStatus=='0'?'@/assets/images/iconsp1.png':item.publishStatus=='1'?'@/assets/images/iconsp2.png':item.publishStatus=='2'?'@/assets/images/iconsp3.png':item.publishStatus=='3'?'@/assets/images/iconsp4.png':item.publishStatus=='4'?'@/assets/images/iconsp5.png':'@/assets/images/iconsp1.png'); 
+          const customIconUrl2 = require(item.publishStatus=='0'?'@/assets/images/icongg1.png':item.publishStatus=='1'?'@/assets/images/icongg2.png':item.publishStatus=='2'?'@/assets/images/icongg3.png':item.publishStatus=='3'?'@/assets/images/icongg4.png':item.publishStatus=='4'?'@/assets/images/icongg5.png':'@/assets/images/icongg1.png');
+          const customIconUrl3 = require(item.publishStatus=='0'?'@/assets/images/iconcd1.png':item.publishStatus=='1'?'@/assets/images/iconcd2.png':item.publishStatus=='2'?'@/assets/images/iconcd3.png':item.publishStatus=='3'?'@/assets/images/iconcd4.png':item.publishStatus=='4'?'@/assets/images/iconcd5.png':'@/assets/images/iconcd1.png'); 
+          // const customIconUrl1 = item.publishStatus=='0'?'@/assets/images/iconsp1.png':item.publishStatus=='1'?'@/assets/images/iconsp2.png':item.publishStatus=='2'?'@/assets/images/iconsp3.png':item.publishStatus=='3'?'@/assets/images/iconsp4.png':item.publishStatus=='4'?'@/assets/images/iconsp5.png':'@/assets/images/iconsp1.png'; 
+          // const customIconUrl2 = item.publishStatus=='0'?'@/assets/images/icongg1.png':item.publishStatus=='1'?'@/assets/images/icongg2.png':item.publishStatus=='2'?'@/assets/images/icongg3.png':item.publishStatus=='3'?'@/assets/images/icongg4.png':item.publishStatus=='4'?'@/assets/images/icongg5.png':'@/assets/images/icongg1.png';
+          // const customIconUrl3 = item.publishStatus=='0'?'@/assets/images/iconcd1.png':item.publishStatus=='1'?'@/assets/images/iconcd2.png':item.publishStatus=='2'?'@/assets/images/iconcd3.png':item.publishStatus=='3'?'@/assets/images/iconcd4.png':item.publishStatus=='4'?'@/assets/images/iconcd5.png':'@/assets/images/iconcd1.png';
           const icon =  this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:''
-          const marker = new qq.maps.Marker({
-            position: markerLatLng,
-            map: this.map,
-            icon:icon
-          });
-
-          // 为标记添加点击事件监听器
-          qq.maps.event.addListener(marker, 'click', () => {
-            this.showInfoWindow(marker, item);
-          });
-
-          this.markers.push(marker);
+          // const icon = 'https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/test/file/static/zjjf.png'
+          let infoitem = {
+            "styleId":idstyles,
+            "id": item.id,
+            "position": markerLatLng,
+            "icon":icon,
+            "properties":item
+          }
+          
+          listallstyles[idstyles] = new TMap.MarkerStyle({ 
+            "width": 51,  // 点标记样式宽度（像素）
+            "height": 52, // 点标记样式高度（像素）
+            "src": icon,  //图片路径
+            //焦点在图片中的像素位置，一般大头针类似形式的图片以针尖位置做为焦点，圆形点以圆心位置为焦点
+            // "anchor": { x: 16, y: 32 }  
+          }) 
+          listall.push(infoitem)
+        });
+        console.error(listallstyles )
+        this.marker = new TMap.MultiMarker({
+          styles:listallstyles,
+          map: this.map,  //指定地图容器
+          geometries:listall
         });
+        this.marker.on("click", this.showInfoWindow)
       }
     },
-    showInfoWindow(marker, item) {
+    showInfoWindow(event) {
+      console.error(event)
+      let lat = event.latLng.getLat().toFixed(6);
+      let lng = event.latLng.getLng().toFixed(6);
+      let item = event.geometry.properties
       // 设置信息窗口的内容
       const content = `
-        <div style="padding:10px 0;border-radius: 18px;">
-          <p style="padding-top:10px;">资源名称:${item.name}</p>
+        <div style="padding:10px 0;border-radius: 18px;text-align: left;">
+          <p style="">资源名称:${item.name}</p>
           <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
           <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='0'?'color: #707B86;':item.publishStatus=='1'?'color: #ECAF5C;':item.publishStatus=='2'?'color: #4A77C9;':item.publishStatus=='3'?'color: #E75A46;':item.publishStatus=='4'?'color: #2AB867;':'color: #707B86;'}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
           </div>
       `;
-      // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
-      //     <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm">
-      //       <el-form-item label="资源名称" prop="entityName">
-      //         <div class="duiqi">${item.name}</div>
-      //       </el-form-item>
-      //       <el-form-item label="位置" prop="entityName">
-      //         <div class="duiqi">${item.detailedLocation}</div>
-      //       </el-form-item>
-      //     </el-form>
-      //   </div>
-      // 设置信息窗口的位置和内容
-      this.infoWindow.setPosition(marker.getPosition());
-      this.infoWindow.setContent(content);
-      this.infoWindow.open();
+      this.infowindow.open(); //打开信息窗
+      this.infowindow.setPosition(new TMap.LatLng(lat,lng));//设置信息窗位置
+      this.infowindow.setContent(content);//设置信息窗内容
+      
+      // this.infowindow = new TMap.InfoWindow({
+      //   content:content, //信息窗口内容
+      //   position:new TMap.LatLng(lat,lng),//显示信息窗口的坐标
+      //   map:this.map  
+      // });
     }
   }
 }
@@ -122,13 +142,8 @@ export default {
 .map {
   width: 100%;
   height: 400px;
+  
+  /* overflow: hidden; */
 }
 
-.address-info {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  z-index: 999999;
-  background: #fff;
-}
 </style>
\ No newline at end of file
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 6e760a6..96e5d6d 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-  baseURL = 'http://128.10.249.32:9003';
+  // baseURL = 'http://128.10.249.32:9003';
 
 
 } else {
@@ -57,11 +57,11 @@ service.interceptors.request.use(
       // config.headers['Content-Type'] = 'application/json; charset=UTF-8'
       // config.headers['type'] = ' admin'
     }
-	console.log(config)
+	// console.log(config)
     return config
   },
   error => {
-    console.log(error) // for debug
+    // console.log(error) // for debug
     return Promise.reject(error)
   }
 )
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 4e28856..23a1d42 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -155,7 +155,7 @@
         <!-- 地图 -->
         <div style="display: flex;justify-content: space-between;margin-bottom: 20px;">
           <div style="width: 100%;height: 400px; border: 1px solid #3F9B6A;position: relative;">
-            <mapchakannew :ontype="ontype" ref="mapchakannewrefs"></mapchakannew>
+            <mapchakannew v-if="isshowmap" :ontype="ontype" ref="mapchakannewrefs"></mapchakannew>
           </div>
         </div>
         <div style="display: flex;margin-bottom: 20px;width: 100%;flex-direction: row-reverse;font-size: 12px;">
@@ -460,6 +460,7 @@
   export default {
     data() {
       return {
+        isshowmap:true,
         alllistnum: 0,
         typelist: [{
             name: '已租赁',
@@ -856,6 +857,7 @@
         this.onaction = '4'
       },
       async getAll() {
+        let that = this
         if (this.ontype == '1') {
           const res = await getAlls({
             ...this.pagequery,
@@ -885,7 +887,17 @@
         }
         // console.error(']]]]]]]]]')
         // console.error(this.tableData)
-        this.$refs.mapchakannewrefs.initMap(this.tableData)
+        this.isshowmap = false
+        
+        // 刷新渲染层
+        this.$nextTick(() => {
+          this.isshowmap = true
+          // 延迟渲染
+          setTimeout(() => {
+            that.$refs.mapchakannewrefs.initMap(that.tableData)
+          }, 100)
+         
+        })
 
       },
       removeonaction(e) {
diff --git a/admin-web-master/src/views/liveMenu/liveRoom/index.vue b/admin-web-master/src/views/liveMenu/liveRoom/index.vue
index 895c07c..8c1a276 100644
--- a/admin-web-master/src/views/liveMenu/liveRoom/index.vue
+++ b/admin-web-master/src/views/liveMenu/liveRoom/index.vue
@@ -363,10 +363,10 @@ export default {
 </script>
 
 <style lang="scss" scpoed>
-img {
-  width: 100px;
-  height: 100px;
-}
+// img {
+//   width: 100px;
+//   height: 100px;
+// }
 .liveRoomPage {
   padding: 32px 20px;
   nav {
diff --git a/admin-web-master/vue.config.js b/admin-web-master/vue.config.js
index 81a8c00..bb00791 100644
--- a/admin-web-master/vue.config.js
+++ b/admin-web-master/vue.config.js
@@ -25,14 +25,14 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   runtimeCompiler: true,
-  publicPath:  process.env.NODE_ENV === 'production' ? '/cdwlMall/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/cdwlMall/' : '/',
   // publicPath: '/admin-web',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,
   devServer: {
-    disableHostCheck:true,
+    disableHostCheck: true,
     port: port,
     open: false,
     overlay: {
@@ -42,16 +42,16 @@ module.exports = {
     // before: require('./mock/mock-server.js'),
     proxy: {
       '/cdwlMall/meserver/api': {
-        target:process.env.VUE_APP_DOMAIN_PREFIX_2,
+        target: process.env.VUE_APP_DOMAIN_PREFIX_2,
         changeOrigin: true,
       },
-      '/cdwlMall/meserver/admin-server':{
-        target:process.env.VUE_APP_DOMAIN_PREFIX_1,
+      '/cdwlMall/meserver/admin-server': {
+        target: process.env.VUE_APP_DOMAIN_PREFIX_1,
         changeOrigin: true,
         pathRewrite: {
-        					// pathRewrite 方法重写 url
-        					'^/meserver': '/',
-        				},
+          // pathRewrite 方法重写 url
+          '^/meserver': '/',
+        },
       },
     }
   },
@@ -128,7 +128,7 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()
--
libgit2 0.21.4