From cf43859500e1e70949b9691125177281f6b1d8e9 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Thu, 27 Feb 2025 17:09:47 +0800
Subject: [PATCH] 1

---
 admin-web-master/dist.zip                                                        | Bin 5725663 -> 0 bytes
 admin-web-master/src/components/ImageUpload/index.vue                            |   6 +++---
 admin-web-master/src/components/add/addcd.vue                                    |   2 +-
 admin-web-master/src/components/add/addinformation.vue                           |   2 +-
 admin-web-master/src/components/newmap/index.vue                                 | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
 admin-web-master/src/components/newmap/indexall.vue                              |  63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue |   4 ++--
 admin-web-master/src/views/customer/rsaManagement/genjin.vue                     |  16 ++++++++++++++--
 admin-web-master/src/views/customer/rsaManagement/index.vue                      |  30 +++++++++++++++---------------
 admin-web-master/src/views/customer/rsaManagement/tanpan.vue                     |  27 +++++++++++++++++----------
 10 files changed, 240 insertions(+), 53 deletions(-)
 delete mode 100644 admin-web-master/dist.zip

diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
deleted file mode 100644
index d95db08..0000000
Binary files a/admin-web-master/dist.zip and /dev/null differ
diff --git a/admin-web-master/src/components/ImageUpload/index.vue b/admin-web-master/src/components/ImageUpload/index.vue
index de808c1..4ac213e 100644
--- a/admin-web-master/src/components/ImageUpload/index.vue
+++ b/admin-web-master/src/components/ImageUpload/index.vue
@@ -74,7 +74,7 @@
       },
       limit: {
         type: Number,
-        default: 10,
+        default: 9,
       },
     },
     data() {
@@ -83,10 +83,10 @@
         onforIndex:0,
         localValue: [],
         options: {
-          limitSize: 10,
+          limitSize: 9,
           accept: '.bmp,.jpg,.jpeg,.png',
           multiple: false,
-          limit: 10,
+          limit: 9,
           disabled: false,
           field: 'files',
           reqParams: {
diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index 49bb676..5b1ed3d 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -50,7 +50,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="联系人" prop="contact">
-            <el-input v-model="ruleForm.contact" placeholder="请输入"  maxlength="20">
+            <el-input v-model="ruleForm.contact" placeholder="请输入"  maxlength="50">
             </el-input>
           </el-form-item>
         </el-col>
diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue
index b276af1..8cc7d6a 100644
--- a/admin-web-master/src/components/add/addinformation.vue
+++ b/admin-web-master/src/components/add/addinformation.vue
@@ -86,7 +86,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="联系人" prop="contacts">
-            <el-input v-model="ruleForm.contacts" placeholder="请输入" maxlength="10">
+            <el-input v-model="ruleForm.contacts" placeholder="请输入" maxlength="50">
             </el-input>
           </el-form-item>
         </el-col>
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index 4df120a..d253887 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -1,15 +1,19 @@
 <template>
   <div style="position: relative;width: 100%;">
     <div id="mapContainer" class="map"></div>
-    <!-- <div id="addressInfo" class="address-info">
-      <p v-if="address">地址: {{ address }}</p>
-      <p v-if="center">地址: {{ lat }}</p>
-      <p v-if="center">地址: {{ lng }}</p>
-      <p v-else>加载中...</p>
-    </div> -->
+    <div class="search-box">
+      <input v-model="searchQuery" placeholder="输入地址进行搜索" />
+      <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',
@@ -22,15 +26,15 @@
         type: Number,
         default: 104.06
       },
-      isonloed:{
+      isonloed: {
         type: Boolean,
         default: false
       },
-      isx:{
+      isx: {
         type: Boolean,
         default: true
       },
-      message:{
+      message: {
         type: String,
         default: ''
       },
@@ -39,7 +43,10 @@
       return {
         map: null,
         marker: null,
-        address: ''
+        address: '',
+        searchQuery: '', // 搜索查询
+        searchResults: [], // 搜索结果列表
+
       };
     },
     mounted() {
@@ -47,6 +54,47 @@
       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() {
         // 将经纬度转换为腾讯地图的LatLng对象
         const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
@@ -58,7 +106,7 @@
         });
 
         // 创建标记
-        if(this.isonloed) {
+        if (this.isonloed) {
           this.marker = new qq.maps.Marker({
             position: centerLatLng,
             map: this.map
@@ -69,7 +117,7 @@
             map: this.map
           });
         }
-        if(this.isx) {
+        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]);
@@ -84,7 +132,7 @@
         // qq.maps.event.addListener(this.marker, 'click', this.onMarkerClick);
 
         // 添加地图点击事件监听器
-        
+
 
         // // 获取地址信息
         // this.getAreaCode(this.lat, this.lng);
@@ -106,6 +154,9 @@
 
       },
       getAreaCode(lat, lng) {
+        this.searchQuery = ''
+        // 清空搜索结果
+        this.searchResults = [];
         let that = this;
         //这里可以直接this.$jsonp地址传入你的经纬度;
         that.$jsonp("https://apis.map.qq.com/ws/geocoder/v1/?", {
@@ -140,11 +191,65 @@
     height: 300px;
   }
 
-  .address-info {
+  .search-box {
     position: absolute;
-    bottom: 0;
-    left: 0;
-    z-index: 999999;
+    top: 10px;
+    left: 10px;
+    z-index: 999;
     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>
+</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 762cacd..a08d5e1 100644
--- a/admin-web-master/src/components/newmap/indexall.vue
+++ b/admin-web-master/src/components/newmap/indexall.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
     <div id="container"></div>
+    <div class="search-box">
+      <input v-model="searchQuery" placeholder="输入地址进行搜索" />
+      <button @click="searchLocation">搜索</button>
+    </div>
     <!-- <div id="toolControl">
       <div
         class="toolItem"
@@ -69,6 +73,7 @@ export default {
       circle: null,
       rectangle: null,
       ellipse: null,
+      searchQuery: '', // 搜索查询
     };
   },
   props: {
@@ -90,6 +95,35 @@ export default {
     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);
@@ -271,4 +305,33 @@ body {
 #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: 999999;
+    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/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
index 93c7832..0f0c020 100644
--- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -8,8 +8,8 @@
       <!-- 线上 -->
       <div>
         <div style="display: flex;font-size: 14px;" >
-          <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia greens':''">线上({{xsNum}})</div>
-          <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)" :class="leixing?'':'chengeXia greens'">实体({{xxNum}})</div>
+          <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia greens':''">线上({{xsNum || 0}})</div>
+          <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)" :class="leixing?'':'chengeXia greens'">实体({{xxNum || 0}})</div>
         </div>
         <!-- 搜索 -->
         <div class="formSearch">
diff --git a/admin-web-master/src/views/customer/rsaManagement/genjin.vue b/admin-web-master/src/views/customer/rsaManagement/genjin.vue
index 1a876d3..dd8f738 100644
--- a/admin-web-master/src/views/customer/rsaManagement/genjin.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/genjin.vue
@@ -142,13 +142,25 @@
               align="right" @change="changeNext">
             </el-date-picker>
           </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item>
+                <div style="margin-top: 20px">
+                  <el-button @click="addCheck()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+                  <el-button @click="closeFn()" class="buttonHover"
+                    style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
-      <div style="display: flex;">
+
+      <!-- <div style="display: flex;">
         <el-button @click="closeFn" class="buttonHover"
           style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
         <el-button @click="addCheck" style="background-color: #3F9B6A;color: #fff">确定</el-button>
-      </div>
+      </div> -->
     </div>
     <div class="zhuti" v-if="ontype == '3'">
       <div style="height:58px;line-height:58px;">
diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue
index 1230e54..3ed8e11 100644
--- a/admin-web-master/src/views/customer/rsaManagement/index.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/index.vue
@@ -52,7 +52,7 @@
           <el-table-column label="意向租赁周期" prop="leaseCycle" min-width="120" />
           <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" />
           <el-table-column label="意向区域" prop="intentionRegion" min-width="120" />
-<el-table-column label="审核状态" min-width="120">
+          <el-table-column label="审核状态" min-width="120">
             <template slot-scope="scope">
               {{scope.row.auditStatus == 1?'已通过':scope.row.auditStatus == 2?'未通过':'待审核'}}
             </template>
@@ -94,8 +94,8 @@
         </div> -->
         <div style="display: flex;justify-content: space-between;" class="bom">
           <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 条</div>
-          <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 50, 100]"
-            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+          <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" background small
+            layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
             @current-change="handleCurrentChange">
           </el-pagination>
         </div>
@@ -395,14 +395,10 @@
               <el-col :span="12">
                 <el-form-item>
                   <div style="margin-top: 20px">
-					  <el-button class="buttonHover"
-					    style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeFn">取
-					    消</el-button>
-                    <el-button style="background-color: #3F9B6A;color: #fff" @click="addCheck">确 定</el-button>
-                    
-
+                    <el-button @click="addCheck()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+                    <el-button @click="closeFn()" class="buttonHover"
+                      style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
                   </div>
-
                 </el-form-item>
               </el-col>
             </el-row>
@@ -472,7 +468,7 @@
           leaseType: '',
           pageNumber: 0,
           pageSize: 10,
-		  auditStatus:'1'
+          auditStatus: '1'
         },
         ruleForm: {
           intentCustomerName: '', //意向客户名称
@@ -501,7 +497,7 @@
         pageindex: {
           pageNumber: 0,
           pageSize: 10,
-		  auditStatus:'1'
+          auditStatus: '1'
         },
         ziyuanData: [],
         multipleSelection: [],
@@ -803,7 +799,7 @@
           leaseType: '',
           pageNumber: 0,
           pageSize: 10,
-		  auditStatus:'1'
+          auditStatus: '1'
         }
         this.currentPage = 1
         this.getAll()
@@ -892,6 +888,7 @@
     background-color: #Fff;
 
   }
+
   .chengeXia {
     border-bottom: 6px solid #3F9B6A;
     padding-bottom: 4px;
@@ -905,9 +902,11 @@
     font-size: 14px;
     justify-content: space-between;
   }
+
   .greens {
     color: #3F9B6A;
   }
+
   .bg-purple-dark {
     background: #99a9bf;
   }
@@ -919,17 +918,18 @@
   .bg-purple-light {
     background: #e5e9f2;
   }
+
   .grid-content {
     border-radius: 4px;
     min-height: 36px;
   }
-
 </style>
 <style lang="scss" scoped>
   ::v-deep .el-dialog__body {
     padding: 0 0 !important;
   }
-  .el-dialog__header{
+
+  .el-dialog__header {
     padding: 0;
     display: none;
   }
diff --git a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
index 94f5bb6..f6338ab 100644
--- a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
@@ -98,13 +98,19 @@
               align="right" @change="changeNext">
             </el-date-picker>
           </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item>
+                <div style="margin-top: 20px">
+                  <el-button @click="addCheck()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+                  <el-button @click="closeFn()" class="buttonHover"
+                    style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
-      <div style="display: flex;">
-        <el-button @click="closeFn" class="buttonHover"
-          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-        <el-button @click="addCheck" style="background-color: #3F9B6A;color: #fff" >确定</el-button>
-      </div>
     </div>
     <div class="zhuti" v-if="ontype == '3'">
       <div style="height:58px;line-height:58px;">
@@ -152,12 +158,13 @@
             <div class="duiqi">{{formInline.plan_Time?formInline.plan_Time.length>0&&formInline.plan_Time[0]?formInline.plan_Time[0]+' 至 '+formInline.plan_Time[1]:'无':'无'}}</div>
           </el-form-item>
         </el-form>
+        <div>
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="closeFn">返回
+          </el-button>
+        </div>
       </div>
-      <div style="display: flex;">
-        <el-button @click="closeFn" class="buttonHover"
-          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-        <el-button @click="addCheck" style="background-color: #3F9B6A;color: #fff" >确定</el-button>
-      </div>
+
     </div>
   </div>
 </template>
--
libgit2 0.21.4