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

jnpf-java-boot/jnpf-web/src/components/mapComponent/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: 王文杰
  * @Date: 2024-02-02 09:28:28
- * @LastEditors: 王文杰
+ * @LastEditors: 王文杰 
- * @LastEditTime: 2024-02-02 13:45:21
+ * @LastEditTime: 2024-02-02 14:47:31
  * @FilePath: /jnpf-web/src/components/mapComponents/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -69,7 +69,6 @@
     methods: {
       //地图选点确定
       handleSureMap() {
-        debugger
         this.$emit('sure', this.map_data)
       },
       // 取消

jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue

@@ -49,7 +49,7 @@
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item class="site-item" label="回收站位置" prop="stationName">
-              <JnpfInput class="input" disabled v-model="dataForm.stationLocation" @change="changeData('stationName',-1)" placeholder="请选择站点位置" clearable :style='{"width":"100%"}'>
+              <JnpfInput class="input" disabled v-model="dataForm.address" @change="changeData('stationName',-1)" placeholder="请选择站点位置" clearable :style='{"width":"100%"}'>
               </JnpfInput>
                <el-button @click="handleShowMap">选择站点</el-button>
             </jnpf-form-tip-item>
@@ -297,11 +297,12 @@ export default {
       },
       Vmodel: "",
       currVmodel: "",
-      stationLocationObj: {}, // 站点地图信息，经纬度地址
       dataForm: {
         stationCode: undefined,
         stationName: undefined,
-        stationLocation: undefined, // 站点位置
+        address: undefined, // 站点位置
+        longitude: undefined,
+        latitude: undefined,
         shortName: undefined,
         managementModel: undefined,
         city: [],
@@ -333,7 +334,7 @@ export default {
           message: '请输入',
           trigger: 'blur'
         }, ],
-        stationLocation: [{
+        address: [{
           required: true,
           message: '请输入',
           trigger: 'blur'
@@ -455,8 +456,9 @@ export default {
       this.visibleMap = false
     },
     sureMap(valObj){
-      this.stationLocationObj = valObj
+      this.dataForm.address = valObj.address
-      this.dataForm.stationLocation = valObj.address
+      this.dataForm.longitude = valObj.lng
+      this.dataForm.latitude = valObj.lat
       console.log('位置信息',valObj)
       this.visibleMap = false
     },
@@ -809,11 +811,6 @@ export default {
     },
     dataList() {
       var _data = this.dataForm;
-      // stationLocationObj 站点信息，经纬度
-      var _data_new = {
-        ..._data,
-        stationLocationObj: this.stationLocationObj
-      }
       return _data;
     },
     dataInfo(dataAll) {