diff --git a/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js b/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
index 8fb63a9..9817b73 100644
--- a/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
+++ b/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
@@ -8,12 +8,12 @@
  */
 module.exports = {
     //测试环境接口配置 3333
-       APIURl: 'http://222.71.165.187:30000'
+      //  APIURl: 'http://222.71.165.187:30000'
     //生产环境接口配置 5555
     // APIURl: 'http://222.71.165.187:50000'
   
   // 开发环境接口配置
-  // APIURl: 'http://127.0.0.1:30000'
+  APIURl: 'http://127.0.0.1:30000'
   // 测试环境接口配置
   // APIURl: 'http://192.168.0.23:30000'
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue b/jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue
index a4108b1..bac714f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue
@@ -1,19 +1,19 @@
 <template>
-  <el-dialog :title="title"  style="z-index: 9999;" :append-to-body="true" :close-on-click-modal="false" :visible="true" top="10vh" width="90%" append-to-body
-    modal-append-to-body :before-close="handleClose" class="my-dialog">
+  <el-dialog :title="title" style="z-index: 9999;" :append-to-body="true" :close-on-click-modal="false" :visible="true"
+    top="10vh" width="90%" append-to-body modal-append-to-body :before-close="handleClose" class="my-dialog">
     <div class="cont">
       <div class="tips">
         <p>1、绘制：鼠标左键点击及移动即可绘制图形; &nbsp;&nbsp; 2、结束绘制：鼠标左键双击即可结束绘制折线、多边形会自动闭合；圆形、矩形、椭圆单击即可结束</p>
       </div>
       <div class="addpolygon">
         <div id="mapFencecontainer">
-            <div class="mapBtn">
-              <template v-if="mode == 'add'">
-                <el-button size="small" type="primary" @click="clearOverlays">清空</el-button>
-                <el-button size="small" type="primary" @click="combineOverlays">合并</el-button>
-              </template>
-              <el-button size="small" type="primary" @click="sendLngLat">确认</el-button>
-            </div>
+          <div class="mapBtn">
+            <template v-if="mode == 'add'">
+              <el-button size="small" type="primary" @click="clearOverlays">清空</el-button>
+              <el-button size="small" type="primary" @click="combineOverlays">确认</el-button>
+            </template>
+            <el-button v-else size="small" type="primary" @click="editCombineOverlays">确认</el-button>
+          </div>
         </div>
         <div class="loadMap" v-if="loadMapFlag">稍等，拼命加载地图中...</div>
       </div>
@@ -31,61 +31,23 @@ import axios from 'axios'
 let overlaysArray = []; // 标注点集合,绘制多边形时的集合
 // 默认展示假数据回显参数
 export default {
-  props: ['position', 'areaMapInfo', 'mode'],
+  props: ['position', 'dataForm', 'mode'],
   data() {
     return {
       longitude: '',
       latitude: '',
       lngLatData: [], // 绘制多边形坐标点
        polygonPath: [
-          {
-            provider: 'provider1',
-            editable: false,
-            polygonsVOS: [
-                {
-                    lat: '31.035352998532925',
-                    lng: '121.22047942131758',
-                },
-                {
-                    lat: '31.034433694479787',
-                    lng: '121.22200291603804',
-                },
-                {
-                    lat: '31.035408156493887',
-                    lng: '121.22356932610273',
-                },
-                {
-                    lat: '31.03625390789439',
-                    lng: '121.22146647423506',
-                }
-            ]
-          },
-          {
-            provider: 'provider2',
-            editable: true,
-            polygonsVOS: [
-                {
-                    "lat": 31.036180364592568,
-                    "lng": 121.22818272560835
-                },
-                {
-                    "lat": 31.033992425381925,
-                    "lng": 121.22753899544477
-                },
-                {
-                    "lat": 31.03472787274239,
-                    "lng": 121.22535031288862
-                },
-                {
-                    "lat": 31.03625390789439,
-                    "lng": 121.22625153511763
-                },
-                {
-                    "lat": 31.036879023666664,
-                    "lng": 121.2274531647563
-                }
-          ]
-        }
+          // {
+          //   provider: 'provider1',
+          //   editable: false,
+          //  areaMapInfo: '[{"lat":31.125083855992244,"lng":121.18080418556929},{"lat":31.123026545535918,"lng":121.18114750832319},{"lat":31.123816411075495,"lng":121.18724148720503},{"lat":31.126828861148027,"lng":121.18616860359907}]'
+          // },
+          // {
+          //   provider: 'provider2',
+          //   editable: false,
+          //   areaMapInfo: '[{"lat":31.12153691930525,"lng":121.18181705474854},{"lat":31.117881352066963,"lng":121.18325471878052},{"lat":31.119222355395767,"lng":121.19102239608765},{"lat":31.12271254919646,"lng":121.18784666061401}]'
+          // }
       ],
       editor: null,
       loadMapFlag: true,
@@ -108,6 +70,9 @@ export default {
     handleClose() {
       this.$emit('areaVisibleChange', false)
     },
+    editCombineOverlays() {
+      this.$emit('areaVisibleChange', false, this.targetAreaPath)
+    },
     combineOverlays() {
       const lngLat = [];
       for (var i = 0;i < overlaysArray.length;i++) {
@@ -121,13 +86,7 @@ export default {
         }
       }
       this.targetAreaPath = lngLat
-      const obj = {
-        provider: '新增商户',
-        editable: true,
-        polygonsVOS: lngLat,
-      }
-      this.polygonPath.push(obj)
-      this.setMapData(true)
+      this.$emit('areaVisibleChange', false, this.targetAreaPath)
     },
     // 删除绘制的多边形
     clearOverlays() {
@@ -139,18 +98,29 @@ export default {
         }
         overlaysArray = []; // 需要重置为空，否则之前的数据还在这个数组里面
     },
-    // clearOverlays() {
-    //   polygon.setMap(null);
-    // },
-    sendLngLat() {
-      this.$emit('areaVisibleChange', false, this.targetAreaPath)
-    },
     /**
      * //定位获得当前位置信息
      */
     getMyLocation() {
-        const geolocation = new qq.maps.Geolocation('U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6', '易回收后台');
-        geolocation.getLocation(this.showPosition, this.showErr);
+      // const url = `https://apis.map.qq.com/ws/location/v1/ip?key=U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6`
+      // axios.get(url).then(function (response) {
+      //   console.log('ip', response)
+      // })
+      // .catch(function (error) {
+      //     console.error(error);
+      // });
+      // const ip =
+      // const url = `https://apis.map.qq.com/ws/location/v1/ip=${ip}&key=${key}`
+      // axios.get("").then(function (response) {
+      //     _this.polygonPath = response.data
+      //     _this.showArrayPolygon()
+      // })
+      // .catch(function (error) {
+      //     console.error(error);
+      // });
+      const geolocation = new qq.maps.Geolocation('U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6', '易回收后台');
+      console.log('geolocation', geolocation)
+      geolocation.getLocation(this.showPosition, this.showErr);
     },
     showPosition(position) {
         this.loadMapFlag = false
@@ -169,12 +139,13 @@ export default {
      * 位置信息在地图上展示
      */
     setMapData(flag) {
+      // const myLatlng = new qq.maps.LatLng(31.122163, 121.190419);
       const myLatlng = new qq.maps.LatLng(this.position.latitude, this.position.longitude);
       console.log("当前位置："+this.position.latitude, this.position.longitude, myLatlng)
       const myOptions = {
-          zoom: 16, 
-          center: myLatlng, 
-          mapTypeId: qq.maps.MapTypeId.ROADMAP  
+          zoom: 16,
+          center: myLatlng,
+          mapTypeId: qq.maps.MapTypeId.ROADMAP
       }
       //获取dom元素添加地图信息
       map = new qq.maps.Map(document.getElementById('mapFencecontainer'), myOptions)
@@ -187,6 +158,8 @@ export default {
       if (!flag) {
         //查询所有后台围栏
         this.getAllPolygons()
+
+
       } else {
          this.showArrayPolygon()
         /**绘制围栏 */
@@ -248,47 +221,41 @@ export default {
               lng: lng
             });
         }
-        this.targetAreaPath = lngLat
+        _this.targetAreaPath = lngLat
         console.log("adjustNode后获得的："+JSON.stringify(lngLat,null,4)); // 获得相应的经纬度值
       })
     },
-    /** 
+    /**
      * 获取所有围栏
     */
     getAllPolygons(){
-      debugger
-        const _this = this;
         request({
-          url: '/api/scm/StationArea/getOthersArea/',
-          method: 'post'
+          url: '/api/scm/StationArea/get/others',
+          method: 'get',
         }).then(res => {
           console.log('getOthersArea',res)
-            // this.dataInfo(res.data)
+          this.polygonPath = res.data
+          this.polygonPath.forEach(e => {
+            e.editable = false
+            if (this.mode == 'edit' && this.dataForm.id == e.id) {
+              e.editable = true
+            }
+          })
+          this.showArrayPolygon()
+          /**绘制围栏 */
+          this.addpolygon();
+        }).catch(function (error) {
+            console.error(error);
         });
-
-        // axios.get(url.url + "/v1/polygons/findAll").then(function (response) {
-        //     _this.polygonPath = response.data
-        //     _this.showArrayPolygon()
-        // })
-        // .catch(function (error) {
-        //     console.error(error);
-        // });
-       
-        if (this.mode == 'add') {
-           _this.polygonPath = _this.polygonPath.filter(e => !e.editable)
-        }
-        _this.showArrayPolygon()
-        
-        /**绘制围栏 */
-        this.addpolygon();
     },
     /**循环调用显示围栏方法 */
     showArrayPolygon(){
         const _this = this
         for (const polygonpath of _this.polygonPath) {
-            path = []
-            for (const polygonsvos of polygonpath.polygonsVOS) {
-                path.push(new qq.maps.LatLng(polygonsvos.lat, polygonsvos.lng))
+          const path = []
+          const areaMapInfo = polygonpath.areaMapInfo && JSON.parse(polygonpath.areaMapInfo)
+          for (const areaMapInfo of areaMapInfo) {
+                path.push(new qq.maps.LatLng(areaMapInfo.lat, areaMapInfo.lng))
             }
             _this.showpolygons(path, polygonpath.editable)
         }
@@ -310,13 +277,13 @@ export default {
         const _this = this
         polygon = new qq.maps.Polygon({
             map: map,
-            editable,
+            editable: editable,
             strokeColor: new qq.maps.Color(202, 67, 58, 0.8),
             fillColor: new qq.maps.Color(202, 67, 58, 0.1)
         });
         polygon.setPath(path);
     }
-  }   
+  }
 };
 </script>
 <style scoped lang="scss">
@@ -353,7 +320,7 @@ export default {
 .mapBtn {
   position: absolute;
   bottom: 20px;
-  right: 20px; 
+  right: 20px;
   z-index: 999;
 }
 .loadMap {
diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue b/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue
index 838a3d1..1a63b47 100644
--- a/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue
@@ -2,111 +2,110 @@
 
 
     <template>
-            <transition name="el-zoom-in-center">
-            <div class="JNPF-preview-main">
-                <div class="JNPF-common-page-header">
-                    <el-page-header @back="goBack"
-                                    :content="!dataForm.id ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
-                        <el-button @click="goBack"> 取 消</el-button>
-                    </div>
-                </div>
-            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="区域名称"  tipLabel="围栏区域名称"   prop="areaName" >
-        <JnpfInput   v-model="dataForm.areaName" @change="changeData('areaName',-1)"
- placeholder="电子围栏名称"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="区域类型"  tipLabel="请选择围栏类型"   prop="areaType" >
-        <JnpfSelect   v-model="dataForm.areaType" @change="changeData('areaType',-1)"
- placeholder="请选择围栏类型"  clearable  :style='{"width":"100%"}' :options="areaTypeOptions" :props="areaTypeProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="绑定商户"   prop="companyId" >
-        <JnpfPopupSelect   v-model="dataForm.companyId" @change="changeData('companyId',-1)"
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.companyId"  placeholder="请选择"  hasPage  propsValue="f_id"  popupWidth="600px"  popupTitle="选择商户"  popupType="dialog"  relationField='f_full_name'  field='companyId'  interfaceId="563326097714841605"  :pageSize="20"  :columnOptions="companyIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="是否启用"   prop="status" >
-        <JnpfRadio   v-model="dataForm.status" @change="changeData('status',-1)"
- optionType="default"  direction="horizontal"  size="small"  :options="statusOptions" :props="statusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="地图信息"  tipLabel="在地图上绘制电子围栏"   prop="areaMapInfo" >
-        <JnpfInput   v-model="dataForm.areaMapInfo" @change="changeData('areaMapInfo',-1)"
- placeholder="绘制电子围栏区域"  @focus="handLeArea" readonly  :maxlength="65539"  clearable  prefix-icon='el-icon-map-location'  :style='{"width":"100%"}' show-password >
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="区域描述"  tipLabel="请输入区域描述"   prop="areaDesc" >
-        <JnpfTextarea   v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)"
- placeholder="请输入不超过两百字的区域描述"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="修改用户"   prop="lastModifyUserId" >
-        <JnpfInput   v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)"
- placeholder="系统自动生成"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="修改时间"   prop="lastModifyTime" >
-        <JnpfInput   v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)"
- placeholder="系统自动生成"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <area-dialog :mode="mode" :position="position" :areaMapInfo="dataForm.areaMapInfo" v-if="areaVisible" @areaVisibleChange="handleAreaVisibleChange" />
-    <!-- <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+      <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+          <div class="JNPF-common-page-header">
+            <el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
+            <div class="options">
+              <el-dropdown class="dropdown" placement="bottom">
+                <el-button style="width:70px">
+                  更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <template v-if="dataForm.id">
+                    <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                      {{'上一条'}}
+                    </el-dropdown-item>
+                    <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                      {{'下一条'}}
+                    </el-dropdown-item>
+                  </template>
+                  <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
+                    :disabled='btnLoading'>
+                    {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'>
+                保 存</el-button>
+              <el-button @click="goBack"> 取 消</el-button>
+            </div>
+          </div>
+          <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+            <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+              label-position="right">
+              <template v-if="!loading">
+                <!-- 具体表单 -->
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="区域名称" tipLabel="围栏区域名称" prop="areaName">
+                    <JnpfInput v-model="dataForm.areaName" @change="changeData('areaName',-1)" placeholder="电子围栏名称"
+                      clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="区域类型" tipLabel="请选择围栏类型" prop="areaType">
+                    <JnpfSelect v-model="dataForm.areaType" @change="changeData('areaType',-1)" placeholder="请选择围栏类型"
+                      clearable :style='{"width":"100%"}' :options="areaTypeOptions" :props="areaTypeProps">
+                    </JnpfSelect>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="绑定商户" prop="companyId">
+                    <JnpfPopupSelect v-model="dataForm.companyId" @change="changeData('companyId',-1)" :rowIndex="null"
+                      :formData="dataForm" :templateJson="interfaceRes.companyId" placeholder="请选择" hasPage
+                      propsValue="f_id" popupWidth="600px" popupTitle="选择商户" popupType="dialog"
+                      relationField='f_full_name' field='companyId' interfaceId="563326097714841605" :pageSize="20"
+                      :columnOptions="companyIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                    </JnpfPopupSelect>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="是否启用" prop="status">
+                    <JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)" optionType="default"
+                      direction="horizontal" size="small" :options="statusOptions" :props="statusProps">
+                    </JnpfRadio>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="地图信息" tipLabel="在地图上绘制电子围栏" prop="areaMapInfo">
+                    <JnpfInput v-model="dataForm.areaMapInfo" placeholder="绘制电子围栏区域" @focus="handLeArea" readonly
+                      :maxlength="65539" clearable prefix-icon='el-icon-map-location' :style='{"width":"100%"}'
+                      show-password>
+                    </JnpfInput>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="区域描述" tipLabel="请输入区域描述" prop="areaDesc">
+                    <JnpfTextarea v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)"
+                      placeholder="请输入不超过两百字的区域描述" :style='{"width":"100%"}' true type="textarea"
+                      :autosize='{"minRows":4,"maxRows":4}'>
+                    </JnpfTextarea>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
+                    <JnpfInput v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)"
+                      placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
+                    </JnpfInput>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="24">
+                  <jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
+                    <JnpfInput v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)"
+                      placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
+                    </JnpfInput>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <!-- 表单结束 -->
+              </template>
+            </el-form>
+            <area-dialog :mode="mode" :position="position" :dataForm="dataForm" v-if="areaVisible"
+              @areaVisibleChange="handleAreaVisibleChange" />
+            <!-- <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
                   ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> -->
-    </el-row>
-    </div>
-    </transition>
+          </el-row>
+        </div>
+      </transition>
     </template>
 
 
@@ -122,9 +121,10 @@
     import { thousandsFormat } from "@/components/Generator/utils/index"
     export default {
         components: { areaDialog },
-        props: ['mode'],
+        props: [],
         data() {
         return {
+          mode: 'add',
           position: {},
           areaVisible: false,
             dataFormSubmitType: 0,
@@ -157,7 +157,7 @@
                                     areaType : undefined,
                                     companyId : "543049974737277765",
                                     status : "1",
-                                    areaMapInfo : "[{'lat':39.98423552382614,'lng':116.3059581286434},{'lat':39.986865947052266,'lng':116.3783954344508},{'lat':39.94897808062252,'lng':116.37942533460955},{'lat':39.94818852953558,'lng':116.3093911759388},{'lat':39.960820297511674,'lng':116.30801795711886}]",
+                                    areaMapInfo: '',
                                 areaDesc : undefined,
                                     creatorUserId : undefined,
                                     creatorTime : undefined,
@@ -216,7 +216,7 @@
                         areaType:[] ,
                         companyId:[] ,
                         status:[] ,
-                        areaMapInfo:[] ,
+                        areaMapInfo:'',
                         areaDesc:[] ,
                         creatorUserId:[] ,
                         creatorTime:[] ,
@@ -237,32 +237,13 @@
         },
         mounted() {},
         methods: {
-          // 定位成功的函数
-          showPosition(position){
-            console.log(position)
-            this.position = position
-            this.areaVisible = true
-          },
-          //定位失败的函数
-          errorPosition() {
-            console.log('定位失败');
-            //继续定位
-            this.getPosition();
-          },
-          //获取当前定位  Key和referer修改为自己项目的值
-          getPosition() {
-            const referer = '易回收后台';
-            const geolocation = new window.qq.maps.Geolocation('U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6', referer);
-            geolocation.getLocation(this.showPosition, this.errorPosition);
-          },
           handLeArea() {
             this.areaVisible = true
-            // this.getPosition()
           },
           handleAreaVisibleChange(areaVisible, targetAreaPath) {
             this.areaVisible = areaVisible
             if (targetAreaPath) {
-              this.dataForm.areaMapInfo = targetAreaPath
+              this.dataForm.areaMapInfo = JSON.stringify(targetAreaPath)
             }
           },
             prev() {
@@ -381,6 +362,7 @@
                 this.visible = true;
                 this.$nextTick(() => {
                     if(this.dataForm.id){
+                      this.mode = 'edit'
                         this.loading = true
                         request({
                             url: '/api/scm/StationArea/'+this.dataForm.id,
@@ -389,6 +371,7 @@
                             this.dataInfo(res.data)
                             this.loading = false
                         });
+
                     }else{
                         this.clearData()
                         this.initDefaultData()
diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue b/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue
index c03e539..e220200 100644
--- a/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue
@@ -6,154 +6,117 @@
 
 
 <template>
-    <div class="JNPF-common-layout">
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                            <el-col :span="6">
-                                <el-form-item label="区域名称">
-                                        <el-input v-model="query.areaName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="区域类型">
-                                        <JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable
-                                                    :options="areaTypeOptions"
-                                                    :props="areaTypeProps"  multiple >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="是否启用">
-                                        <JnpfSelect v-model="query.status" placeholder="请选择" clearable
-                                                    :options="statusOptions"
-                                                    :props="statusProps" >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="绑定商户">
-                                                <JnpfOrganizeSelect
- selectType="custom"  :ableIds = '[["@currentOrgAndSubOrg"]]'                                                 v-model="query.companyId" placeholder="请选择商户"  clearable
- multiple />
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
-                                    展开
-                                </el-button>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  v-has="'btn_add'"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @click="openSuperQuery()" />
-                            </el-tooltip>
-                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                         @click="initData()" />
-                            </el-tooltip>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
- :span-method="arraySpanMethod"
-
->
-                                                <el-table-column
-                                                            prop="areaName"
- label="区域名称"  align="center"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="areaType"
- label="区域类型"  align="center"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="companyId"
- label="绑定商户"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="status"
- label="是否启用"  align="center"
- >
-                                                </el-table-column>
-                                                <el-table-column
+  <div class="JNPF-common-layout">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="区域名称">
+              <el-input v-model="query.areaName" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="区域类型">
+              <JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable :options="areaTypeOptions"
+                :props="areaTypeProps" multiple>
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否启用">
+              <JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
+                :props="statusProps">
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="绑定商户">
+                <JnpfOrganizeSelect selectType="custom" :ableIds='[["@currentOrgAndSubOrg"]]' v-model="query.companyId"
+                  placeholder="请选择商户" clearable multiple />
+              </el-form-item>
+            </el-col>
+          </template>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+                展开
+              </el-button>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                收起
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            </el-button>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip content="高级查询" placement="top" v-if="true">
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @click="openSuperQuery()" />
+            </el-tooltip>
+            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+            </el-tooltip>
+          </div>
+        </div>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
+          <el-table-column prop="areaName" label="区域名称" align="center">
+          </el-table-column>
+          <el-table-column prop="areaType" label="区域类型" align="center">
+          </el-table-column>
+          <el-table-column prop="companyId" label="绑定商户" align="left">
+          </el-table-column>
+          <el-table-column prop="status" label="是否启用" align="center">
+          </el-table-column>
+          <!-- <el-table-column
                                                             prop="areaMapInfo"
  label="地图信息"  align="center"
  >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="areaDesc"
- label="区域描述"  align="center"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="creatorUserId"
- label="创建用户"  align="center"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="lastModifyUserId"
- label="修改用户"  align="center"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="lastModifyTime"
- label="修改时间"  align="center"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="creatorTime"
- label="创建时间"  align="left"
- >
-                                                </el-table-column>
-                        <el-table-column label="操作"
- fixed="right" width="150" >
-                            <template slot-scope="scope"  >
-                                            <el-button type="text"
-                                                       @click="addOrUpdateHandle(scope.row)"  v-has="'btn_edit'" >编辑
-                                            </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"   v-has="'btn_detail'"
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
-        </div>
-        <JNPF-Form :mode="mode" v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+                                                </el-table-column> -->
+          <el-table-column prop="areaDesc" label="区域描述" align="center">
+          </el-table-column>
+          <el-table-column prop="creatorUserId" label="创建用户" align="center">
+          </el-table-column>
+          <el-table-column prop="lastModifyUserId" label="修改用户" align="center">
+          </el-table-column>
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center">
+          </el-table-column>
+          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              </el-button>
+              <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
+      </div>
+    </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
 
 
 
-        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-                        @superQuery="superQuery" />
-    </div>
+    <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+  </div>
 </template>
 
 <script>
@@ -222,7 +185,6 @@
                         sidx: "",
             },
             formVisible: false,
-            mode: '',
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
@@ -487,8 +449,6 @@
                     this.initData()
                 },
             addOrUpdateHandle(row, isDetail) {
-                const mode = row ? 'edit' : 'add'
-                this.mode = mode
                 let id = row?row.id:""
                 this.formVisible = true
                 this.$nextTick(() => {