Merge branch 'master' of http://222.71.165.188:3000/yunxi/ningxiaWeb

jnpf-java-boot/jnpf-web/src/utils/apiUrl.js

@@ -2,13 +2,13 @@
  * @Author: 王文杰
  * @Date: 2024-02-02 14:19:40
  * @LastEditors: jevononlie 728254585@qq.com
- * @LastEditTime: 2024-05-21 09:35:25
+ * @LastEditTime: 2024-05-21 16:23:01
  * @FilePath: /jnpf-web/src/utils/apiUrl.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 module.exports = {
   // 开发环境接口配置
-  // APIURl: 'http://127.0.0.1:30000'
+  APIURl: 'http://127.0.0.1:30000'
   // 测试环境接口配置
-  APIURl: 'http://192.168.0.23:30000'
+  // APIURl: 'http://192.168.0.23:30000'
 }

jnpf-java-boot/jnpf-web/src/views/stationarea/Detail.vue

@@ -31,9 +31,9 @@
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="站点编号"  
- prop="stationCode"   tip-label="绑定站点编码" >
-                        <p>{{dataForm.stationCode}}</p>
+                <jnpf-form-tip-item  label="绑定商户"  
+ prop="companyId"   tip-label="绑定商户" >
+                        <p>{{dataForm.companyId}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
@@ -87,7 +87,7 @@
                             areaName : '',
                             areaType : "",
                             status : "1",
-                            stationCode : "",
+                            companyId : [],
                             areaMapInfo : '',
                             areaDesc : '',
                             creatorUserId : "",

jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue

@@ -8,7 +8,7 @@
       </div>
       <div id="mapFencecontainer" class="mapBox">
         <div class="mapBtn">
-          <!-- <el-button size="small" type="danger" @click="delpolygon()">删除多边形</el-button> -->
+          <el-button size="small" type="danger" @click="delpolygon()">删除多边形</el-button>
           <el-button size="small" type="danger" @click="clearOverlays()">清除</el-button>
           <el-button size="small" type="primary" @click="sendLngLat">确认</el-button>
           <!-- <el-button size="small" type="primary" @click="sendMsg">返回</el-button> -->
@@ -77,12 +77,15 @@ export default {
     },
     // 地图初始化
     init() {
-      const lat = this.position.lat
-      const lng = this.position.lng
+      const lat = '34.81098454894641' || this.position.lat
+      const lng = '113.64789962768555' || this.position.lng
       map = new qq.maps.Map(document.getElementById('mapFencecontainer'), {
         center: new qq.maps.LatLng(lat, lng), // 暂时默认郑州
         zoom: 22
       });
+      qq.maps.event.addListener(map, "click", function (event) {
+        console.log('您点击的位置为: [' + event.latLng.getLat() + ', ' + event.latLng.getLng() + ']');
+      });
       // 多边形绘制及回显
       // 设置多边形路径以便回显
       // path4 = [];
@@ -93,7 +96,7 @@ export default {
 
       console.log(path4);
       this.showpolygon(path4);
-      // 绘制
+      // 绘制,操作
       this.addpolygon();
     },
     /**
@@ -136,6 +139,7 @@ export default {
       drawingManager.setMap(map);
       qq.maps.event.addListener(drawingManager, 'overlaycomplete', function (event) {
         // clearOverlays(overlaysArray)
+        console.log('event',event); // 获得相应的经纬度值
         lngLat = [];
         overlaysArray.push(event.overlay);
         for (const item of event.overlay.getPath().elems) {
@@ -147,9 +151,14 @@ export default {
             lng: lng
           });
         }
+        console.log('overlaycomplete',lngLat, overlaysArray); // 获得相应的经纬度值
+      });
 
-        console.log('overlaycomplete',lngLat); // 获得相应的经纬度值
+      qq.maps.event.addListener(drawingManager, 'markercomplete', function (event) {
+        console.log('markercomplete', event); // 获得相应的经纬度值
       });
+
+
     },
     // 初始化回显
     showpolygon(path3) {