处理场所新增所在地址gps坐标

gps数据，新增当前速度新增kafka生产者

处理场所新增所在地址gps坐标
gps数据，新增当前速度新增kafka生产者
2c
1 parent 5ec81c07
Showing 11 changed files with 1770 additions and 396 deletions
trash-quartz/src/main/java/com/trash/quartz/task/GpsTask.java
trash-ui/src/router/index.js
trash-ui/src/views/unit/disposalSite/info.vue
trash-ui/src/views/unit/disposalSite/infoEdit.vue
trash-ui/src/views/unit/enterprise/info.vue
trash-ui/src/views/unit/enterprise/infoEdit.vue
trash-unit/src/main/java/com/trash/disposalSite/domain/DisposalSite.java
trash-unit/src/main/java/com/trash/gps/domain/GpsOrientation.java
trash-unit/src/main/resources/mapper/unit/DisposalSiteMapper.xml
trash-unit/src/main/resources/mapper/unit/GpsOrientationMapper.xml
trash-workFlow/src/main/java/com/trash/casefile/kafka/Producer.java
@@ -39,7 +39,14 @@ public class GpsTask {
                 gps.setCreateTime(DateUtils.parseDate(jsonObject.getString("time").replaceAll("T"," ")));
                 gps.setYearMonth(jsonObject.getString("time").substring(0,7).replace("-",""));
                 gps.setCarCode(jsonObject.getString("carCode"));
+                gps.setSpeed(jsonObject.getString("speed"));
                 gpsOrientationMapper.insertGpsOrientation(gps);
+                float speed = Float.parseFloat(jsonObject.getString("speed"));
+                //判断车速是否大于100km/h
+                if(speed>100){
+                    //将超速的车辆推送到kafka超速预警
+
+                }
             }
         }
@@ -140,7 +140,7 @@ export const constantRoutes = [
       },
       {
         path: '/enterprise/infoEdit',
-        component: (resolve) => require(['@/views/unit/enterprise/info'], resolve),
+        component: (resolve) => require(['@/views/unit/enterprise/infoEdit'], resolve),
         name: '修改运输企业',
         hidden: true,
         meta: { title: '修改运输企业' }
@@ -18,8 +18,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="所在地址" prop="address">
-            <el-input v-model="form.address" placeholder="请输入所在地址" />
+          <el-form-item label="所在地址" prop="address" class="is-required">
+            <el-input v-model="form.address" placeholder="请输入所在地址"  @focus="openMapDialog"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -615,9 +615,6 @@ export default {
         name: [
           { required: true, message: "请输入处置场所名称", trigger: "blur" },
         ],
-        address: [
-          { required: true, message: "请输入处置场所地址", trigger: "blur" },
-        ],
         localArea: [
           { required: true, message: "请选择所属区域", trigger: "blur" },
         ],
@@ -719,6 +716,12 @@ export default {
     '$route.query.disposalSiteId': 'initData'
   },
   methods: {
+    openMapDialog(){
+      this.openMap = true;
+      this.initAMap("address");
+      this.keywords = this.form.address;
+
+    },
     reset(){
       this.form = {};
       this.approvalDocument = [];
@@ -811,8 +814,7 @@ export default {
       if (!val) {
         return ;
       }
-      // 自动适应显示想显示的范围区域
-      this.map.setFitView();
+
       //清除marker
       if (this.searchMarker){
         this.map.remove(this.searchMarker)
@@ -826,6 +828,10 @@ export default {
       this.keywords = val.name
       //定位
       this.map.setCenter([val.location.lng, val.location.lat])
+      // 自动适应显示想显示的范围区域
+      this.map.setFitView();
+      this.form.addressGps = val.location.lng+","+val.location.lat;
+      this.form.address = val.district + val.name;
     },
     // 搜索地址
     remoteMethod(query) {
@@ -841,7 +847,7 @@ export default {
         this.mapOptions = [];
       }
     },
-    initAMap() {
+    initAMap(type) {
       const _this = this
       // 加载高德地图
       AMapLoader.load({
@@ -864,7 +870,7 @@ export default {
           willreadoften: true
         });
-        _this.AutoComplete = await new AMap.AutoComplete({city:'全国'});
+        _this.AutoComplete = await new AMap.AutoComplete({city:'长沙'});
         // 图层样式切换控件(卫星图)
         AMapUI.loadUI(['control/BasicControl'], function(BasicControl) {
@@ -875,78 +881,97 @@ export default {
           }));
         });
-        _this.polyEditor = new AMap.PolygonEditor(_this.map);
-        if(_this.form.electronicFence!=null){
-          // 电子围栏经纬度
-          let path = _this.form.electronicFence.split(";");
-          path.map(item=>{
-            let arr = item.split(",");
-            //将电子围栏经纬度转换为double类型数组
-            _this.polygonArr.push([parseFloat(arr[0]),parseFloat(arr[1])]);
-          });
-          _this.nowPolygon = new AMap.Polygon({
-            path: _this.polygonArr
-          })
-          _this.map.add([_this.nowPolygon]);
-          _this.map.setFitView();
-          _this.polyEditor.addAdsorbPolygons([_this.nowPolygon]);
-          _this.nowPolygon.on('dblclick', () => {
-            _this.polyEditor.setTarget(_this.nowPolygon);
-            _this.polyEditor.open();
-          })
-        }
-        _this.polyEditor.on('add', function (data) {
-          _this.nowPolygon = data.target;
-          _this.polyEditor.addAdsorbPolygons(_this.nowPolygon);
-          _this.nowPolygon.on('dblclick', () => {
-            _this.polyEditor.setTarget(_this.nowPolygon);
-            _this.polyEditor.open();
-          })
+        if(type==="draw"){
+          _this.polyEditor = new AMap.PolygonEditor(_this.map);
+          if(_this.form.electronicFence!=null){
+            // 电子围栏经纬度
+            let path = _this.form.electronicFence.split(";");
+            path.map(item=>{
+              let arr = item.split(",");
+              //将电子围栏经纬度转换为double类型数组
+              _this.polygonArr.push([parseFloat(arr[0]),parseFloat(arr[1])]);
+            });
+            _this.nowPolygon = new AMap.Polygon({
+              path: _this.polygonArr
+            })
+            _this.map.add([_this.nowPolygon]);
+            _this.map.setFitView();
+            _this.polyEditor.addAdsorbPolygons([_this.nowPolygon]);
+            _this.nowPolygon.on('dblclick', () => {
+              _this.polyEditor.setTarget(_this.nowPolygon);
+              _this.polyEditor.open();
+            })
+          }
+          _this.polyEditor.on('add', function (data) {
+            _this.nowPolygon = data.target;
+            _this.polyEditor.addAdsorbPolygons(_this.nowPolygon);
+            _this.nowPolygon.on('dblclick', () => {
+              _this.polyEditor.setTarget(_this.nowPolygon);
+              _this.polyEditor.open();
+            })
-          // 加个右击监听 双击图层进行编辑
-          _this.map.on("rightclick",function (e){
-            if (_this.polyEditor) {
-              const arr = _this.nowPolygon.getPath()
-              let pathArr = []
-              // 将获取的停车场坐标点转换格式后存入数组
-              for (let item of arr) {
-                const list = [item.lng, item.lat]
-                pathArr.push(list)
-              }
+            // 加个右击监听 双击图层进行编辑
+            _this.map.on("rightclick",function (e){
+              if (_this.polyEditor) {
+                const arr = _this.nowPolygon.getPath()
+                let pathArr = []
+                // 将获取的停车场坐标点转换格式后存入数组
+                for (let item of arr) {
+                  const list = [item.lng, item.lat]
+                  pathArr.push(list)
+                }
-              var maxDistance = 0; // 最大距离
-              var maxPointIndex = []; // 记录最大距离对应的点索引
+                var maxDistance = 0; // 最大距离
+                var maxPointIndex = []; // 记录最大距离对应的点索引
-              // 计算所有点对之间的距离
-              for (var i = 0; i < pathArr.length; i++) {
-                for (var j = i + 1; j < pathArr.length; j++) {
-                  var distance = AMap.GeometryUtil.distance(pathArr[i], pathArr[j]);
-                  if (distance > maxDistance) {
-                    maxDistance = distance;
-                    maxPointIndex = [i, j];
+                // 计算所有点对之间的距离
+                for (var i = 0; i < pathArr.length; i++) {
+                  for (var j = i + 1; j < pathArr.length; j++) {
+                    var distance = AMap.GeometryUtil.distance(pathArr[i], pathArr[j]);
+                    if (distance > maxDistance) {
+                      maxDistance = distance;
+                      maxPointIndex = [i, j];
+                    }
                   }
                 }
-              }
-              if(_this.nowPolygon!=null){
-                // 通过最大距离的点索引获取对应的点坐标
-                let mybounds  = new AMap.Bounds(pathArr[maxPointIndex[0]],pathArr[maxPointIndex[1]]);
-                // 设置地图显示范围
-                _this.map.setBounds(mybounds);
+                if(_this.nowPolygon!=null){
+                  // 通过最大距离的点索引获取对应的点坐标
+                  let mybounds  = new AMap.Bounds(pathArr[maxPointIndex[0]],pathArr[maxPointIndex[1]]);
+                  // 设置地图显示范围
+                  _this.map.setBounds(mybounds);
+                }
+                //将经纬度存到form中
+                _this.form.electronicFence = pathArr.join(";");
+                _this.polyEditor.close();
               }
-              //将经纬度存到form中
-              _this.form.electronicFence = pathArr.join(";");
-              _this.polyEditor.close();
-            }
-          });
-        })
+            });
+          })
-        if(_this.nowPolygon===null){
-          _this.polyEditor.close();
-          _this.polyEditor.setTarget();
-          _this.polyEditor.open();
+          if(_this.nowPolygon===null){
+            _this.polyEditor.close();
+            _this.polyEditor.setTarget();
+            _this.polyEditor.open();
+          }
         }
+        if(type==="address" && _this.form.addressGps.indexOf(",")>=0){
+          let lng = _this.form.addressGps.split(",")[0];
+          let lat = _this.form.addressGps.split(",")[1];
+          //清除marker
+          if (_this.searchMarker){
+            _this.map.remove(_this.searchMarker)
+          }
+          //设置marker
+          _this.searchMarker = new AMap.Marker({
+            map: this.map,
+            position: [lng, lat],
+          });
+          //定位
+          _this.map.setCenter([lng, lat])
+          // 自动适应显示想显示的范围区域
+          _this.map.setFitView();
+        }
       }).catch(e => {
         console.log(e);
@@ -965,19 +990,20 @@ export default {
       this.polyEditor.open();
     },
     draw(){
-      if(this.polyEditor!=null){
-        if(this.form.electronicFence==null){
-          // 关闭一下编辑器，防止出bug
-          this.polyEditor.close();
-          // 置空编辑区即为新增
-          this.polyEditor.setTarget();
-          // 打开编辑器即可开始绘制
-          this.polyEditor.open();
-        }
-      }else{
-        this.initAMap();
-      }
+      // if(this.polyEditor!=null){
+      //   if(this.form.electronicFence==null){
+      //     // 关闭一下编辑器，防止出bug
+      //     this.polyEditor.close();
+      //     // 置空编辑区即为新增
+      //     this.polyEditor.setTarget();
+      //     // 打开编辑器即可开始绘制
+      //     this.polyEditor.open();
+      //   }
+      // }else{
+
+      // }
       this.openMap = true;
+      this.initAMap("draw");
       this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
         confirmButtonText: '确定',
         callback: action => {
@@ -5,21 +5,21 @@
     <h3>
       基础信息
     </h3>
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px"  label-position="top">
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top">
       <el-row :gutter="30">
         <el-col :span="6">
           <el-form-item label="建筑垃圾处理场所名称" prop="name">
-            <el-input v-model="form.name" placeholder="请输入建筑垃圾处理场所名称" />
+            <el-input v-model="form.name" placeholder="请输入建筑垃圾处理场所名称"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="证书编号" prop="certificateNumber">
-            <el-input v-model="form.certificateNumber" placeholder="请输入证书编号" />
+            <el-input v-model="form.certificateNumber" placeholder="请输入证书编号"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="所在地址" prop="address">
-            <el-input v-model="form.address" placeholder="请输入所在地址" />
+          <el-form-item label="所在地址" prop="address" class="is-required">
+            <el-input v-model="form.address" placeholder="请输入所在地址" @focus="openMapDialog"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -34,23 +34,24 @@
         <el-col :span="6">
           <el-form-item label="建筑垃圾处理场所类型" prop="siteType">
             <el-select v-model="form.siteType" placeholder="请选择建筑垃圾处理场所类型" style="width: 100%">
-              <el-option label="消纳（回填）场所" value="消纳（回填）场所" />
-              <el-option label="建筑垃圾资源化处置场" value="建筑垃圾资源化处置场" />
-              <el-option label="盾构土环保处置场" value="盾构土环保处置场" />
+              <el-option label="消纳（回填）场所" value="消纳（回填）场所"/>
+              <el-option label="建筑垃圾资源化处置场" value="建筑垃圾资源化处置场"/>
+              <el-option label="盾构土环保处置场" value="盾构土环保处置场"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="消纳（回填）场所工程性质" prop="engineeringProperty">
-            <el-select v-model="form.engineeringProperty" placeholder="请选择消纳（回填）场所工程性质" style="width: 100%">
-              <el-option label="消纳（回填）场" value="消纳（回填）场" />
-              <el-option label="房建市政工程" value="房建市政工程" />
-              <el-option label="交通工程" value="交通工程" />
-              <el-option label="水利工程" value="水利工程" />
-              <el-option label="国有土地整理" value="国有土地整理" />
-              <el-option label="平场工程" value="平场工程" />
-              <el-option label="生态修复" value="生态修复" />
-              <el-option label="覆绿造景工程" value="覆绿造景工程" />
+            <el-select v-model="form.engineeringProperty" placeholder="请选择消纳（回填）场所工程性质"
+                       style="width: 100%">
+              <el-option label="消纳（回填）场" value="消纳（回填）场"/>
+              <el-option label="房建市政工程" value="房建市政工程"/>
+              <el-option label="交通工程" value="交通工程"/>
+              <el-option label="水利工程" value="水利工程"/>
+              <el-option label="国有土地整理" value="国有土地整理"/>
+              <el-option label="平场工程" value="平场工程"/>
+              <el-option label="生态修复" value="生态修复"/>
+              <el-option label="覆绿造景工程" value="覆绿造景工程"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -59,9 +60,9 @@
         <el-col :span="6">
           <el-form-item label="作业区域" prop="operatingArea">
             <el-select v-model="form.operatingArea" placeholder="请选择作业区域" style="width: 100%">
-              <el-option label="核心区域" value="核心区域" />
-              <el-option label="中心区域" value="中心区域" />
-              <el-option label="外环区域" value="外环区域" />
+              <el-option label="核心区域" value="核心区域"/>
+              <el-option label="中心区域" value="中心区域"/>
+              <el-option label="外环区域" value="外环区域"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -72,19 +73,20 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="建设（施工）单位名称" prop="constructionUnit">
-            <el-input v-model="form.constructionUnit" placeholder="请输入建设（施工）单位名称" />
+            <el-input v-model="form.constructionUnit" placeholder="请输入建设（施工）单位名称"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="30">
         <el-col :span="6">
           <el-form-item label="建设（施工）单位责任人" prop="constructionUnitPerson">
-            <el-input v-model="form.constructionUnitPerson" placeholder="请输入建设（施工）单位责任人" />
+            <el-input v-model="form.constructionUnitPerson" placeholder="请输入建设（施工）单位责任人"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="责任人联系电话" prop="constructionUnitPersonPhone">
-            <el-input v-model="form.constructionUnitPersonPhone" placeholder="请输入责任人联系电话" :maxlength="11" show-word-limit/>
+            <el-input v-model="form.constructionUnitPersonPhone" placeholder="请输入责任人联系电话" :maxlength="11"
+                      show-word-limit/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -115,7 +117,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="审批方量(m³)" prop="squareMeasure">
-            <el-input v-model="form.squareMeasure" placeholder="请输入审批方量(m³)" />
+            <el-input v-model="form.squareMeasure" placeholder="请输入审批方量(m³)"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -126,18 +128,18 @@
         <el-col :span="6">
           <el-form-item label="洗车作业设施" prop="carWashingFacilities">
             <el-select v-model="form.carWashingFacilities" placeholder="请选择洗车作业设施" style="width: 100%">
-              <el-option label="钢架洗车平台" value="钢架洗车平台" />
-              <el-option label="钢架洗车平台、过水槽" value="钢架洗车平台、过水槽" />
-              <el-option label="全自动洗车平台、过水槽" value="全自动洗车平台、过水槽" />
-              <el-option label="特殊事项" value="特殊事项" />
+              <el-option label="钢架洗车平台" value="钢架洗车平台"/>
+              <el-option label="钢架洗车平台、过水槽" value="钢架洗车平台、过水槽"/>
+              <el-option label="全自动洗车平台、过水槽" value="全自动洗车平台、过水槽"/>
+              <el-option label="特殊事项" value="特殊事项"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="出口道路状况" prop="exitRoadCondition">
             <el-select v-model="form.exitRoadCondition" placeholder="请选择出口道路状况" style="width: 100%">
-              <el-option label="硬化" value="硬化" />
-              <el-option label="未硬化" value="未硬化" />
+              <el-option label="硬化" value="硬化"/>
+              <el-option label="未硬化" value="未硬化"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -146,18 +148,18 @@
         <el-col :span="6">
           <el-form-item label="照明设施" prop="lightingFacility">
             <el-select v-model="form.lightingFacility" placeholder="请选择照明设施" style="width: 100%">
-              <el-option label="有" value="有" />
-              <el-option label="无" value="无" />
-              <el-option label="不适用" value="不适用" />
+              <el-option label="有" value="有"/>
+              <el-option label="无" value="无"/>
+              <el-option label="不适用" value="不适用"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="视频监控设施" prop="videoSurveillanceFacility">
             <el-select v-model="form.videoSurveillanceFacility" placeholder="请选择视频监控设施" style="width: 100%">
-              <el-option label="有" value="有" />
-              <el-option label="无" value="无" />
-              <el-option label="不适用" value="不适用" />
+              <el-option label="有" value="有"/>
+              <el-option label="无" value="无"/>
+              <el-option label="不适用" value="不适用"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -165,19 +167,17 @@
       <el-row :gutter="30">
         <el-col :span="6">
           <el-form-item label="填表人" prop="preparer">
-            <el-input v-model="form.preparer" placeholder="请输入填表人" />
+            <el-input v-model="form.preparer" placeholder="请输入填表人"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="办理意见" prop="handlingAdvice">
-            <el-input v-model="form.handlingAdvice" placeholder="请输入内容" />
+            <el-input v-model="form.handlingAdvice" placeholder="请输入内容"/>
           </el-form-item>
         </el-col>
       </el-row>
-
-
       <!--        <el-form-item label="消纳来源" prop="absorbSource">-->
       <!--          <el-input v-model="form.absorbSource" placeholder="请输入消纳来源" />-->
       <!--        </el-form-item>-->
@@ -226,7 +226,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in approvalDocument">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="approvalDocument.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="approvalDocument.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -234,10 +236,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="approvalDocument.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="approvalDocument.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -264,7 +271,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in approvalData">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="approvalData.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="approvalData.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -272,10 +281,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="approvalData.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="approvalData.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -302,7 +316,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in scenePhoto">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="scenePhoto.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="scenePhoto.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -310,10 +326,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="scenePhoto.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="scenePhoto.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -340,7 +361,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in carWashingFacilitiesImage">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="carWashingFacilitiesImage.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="carWashingFacilitiesImage.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -348,10 +371,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="carWashingFacilitiesImage.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="carWashingFacilitiesImage.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -378,7 +406,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in safetyAssessmentReport">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="safetyAssessmentReport.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="safetyAssessmentReport.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -386,10 +416,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="safetyAssessmentReport.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="safetyAssessmentReport.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -416,7 +451,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in environmentalApproval">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="environmentalApproval.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="environmentalApproval.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -424,10 +461,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="environmentalApproval.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="environmentalApproval.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -454,7 +496,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in authorization">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="authorization.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="authorization.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -462,10 +506,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="authorization.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="authorization.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -492,7 +541,9 @@
           <div class="upload_btn">
             <div v-for="(item,index) in otherInformation">
               <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
-                <div class="upload_close" @click="otherInformation.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <div class="upload_close" @click="otherInformation.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
                 <el-image
                   style="width: 110px; height: 95px; margin: 5px;float:left;"
                   :src="createUrl(item)"
@@ -500,10 +551,15 @@
                   :z-index="999">
                 </el-image>
               </div>
-              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
-                <div class="upload_close_file" @click="otherInformation.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
-                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
-                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              <div v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="otherInformation.splice(index,1);">
+                  <el-icon class="el-icon-error"></el-icon>
+                </div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add"
+                                                           style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">
+                  {{ item.name }}
+                </div>
               </div>
             </div>
           </div>
@@ -575,7 +631,7 @@
 </template>
 <script>
-import { listDisposalSite, getDisposalSite, delDisposalSite, addDisposalSite, updateDisposalSite, exportDisposalSite } from "@/api/unit/disposalSite";
+import {addDisposalSite, getDisposalSite, updateDisposalSite} from "@/api/unit/disposalSite";
 import Treeselect from "@riophae/vue-treeselect";
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import {getAreaList} from "@/api/casefile/remoteServer";
@@ -587,7 +643,7 @@ window._AMapSecurityConfig = {
 }
 export default {
   name: "DisposalSite",
-  components: {Treeselect,AMapLoader},
+  components: {Treeselect, AMapLoader},
   data() {
     return {
       // 遮罩层
@@ -613,31 +669,28 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "请输入处置场所名称", trigger: "blur" },
-        ],
-        address: [
-          { required: true, message: "请输入处置场所地址", trigger: "blur" },
+          {required: true, message: "请输入处置场所名称", trigger: "blur"},
         ],
         localArea: [
-          { required: true, message: "请选择所属区域", trigger: "blur" },
+          {required: true, message: "请选择所属区域", trigger: "blur"},
         ],
         siteType: [
-          { required: true, message: "请选择处置场所类型", trigger: "blur" },
+          {required: true, message: "请选择处置场所类型", trigger: "blur"},
         ],
         operatingArea: [
-          { required: true, message: "请选择锁业区域", trigger: "blur" },
+          {required: true, message: "请选择锁业区域", trigger: "blur"},
         ],
         trashType: [
-          { required: true, message: "请选择可受纳建筑垃圾类型", trigger: "blur" },
+          {required: true, message: "请选择可受纳建筑垃圾类型", trigger: "blur"},
         ],
         constructionUnit: [
-          { required: true, message: "请输入建设（施工）单位", trigger: "blur" },
+          {required: true, message: "请输入建设（施工）单位", trigger: "blur"},
         ],
         constructionUnitPerson: [
-          { required: true, message: "请输入建设（施工）单位责任人", trigger: "blur" },
+          {required: true, message: "请输入建设（施工）单位责任人", trigger: "blur"},
         ],
         constructionUnitPersonPhone: [
-          { required: true, message: "请输入责任人联系电话", trigger: "blur" },
+          {required: true, message: "请输入责任人联系电话", trigger: "blur"},
           {
             pattern: /^1(3|4|5|7|8|9)\d{9}$/,
             message: '手机号格式错误',
@@ -645,56 +698,59 @@ export default {
           }
         ],
         validityBeginDate: [
-          { required: true, message: "请选择有限期开始时间", trigger: "blur" },
+          {required: true, message: "请选择有限期开始时间", trigger: "blur"},
         ],
         validityEndDate: [
-          { required: true, message: "请选择有限期结束时间", trigger: "blur" },
+          {required: true, message: "请选择有限期结束时间", trigger: "blur"},
         ],
         electronicFence: [
-          { required: true, message: "请输入电子围栏", trigger: "blur" },
+          {required: true, message: "请输入电子围栏", trigger: "blur"},
         ],
         squareMeasure: [
-          { required: true, message: "请输入审批方量", trigger: "blur" },
+          {required: true, message: "请输入审批方量", trigger: "blur"},
         ],
         carWashingFacilities: [
-          { required: true, message: "请选择洗车作业设施", trigger: "blur" },
+          {required: true, message: "请选择洗车作业设施", trigger: "blur"},
         ],
         exitRoadCondition: [
-          { required: true, message: "请选择出口道路状况", trigger: "blur" },
+          {required: true, message: "请选择出口道路状况", trigger: "blur"},
         ],
         lightingFacility: [
-          { required: true, message: "请选择照明设施", trigger: "blur" },
+          {required: true, message: "请选择照明设施", trigger: "blur"},
         ],
         videoSurveillanceFacility: [
-          { required: true, message: "请选择视频监控设施", trigger: "blur" },
+          {required: true, message: "请选择视频监控设施", trigger: "blur"},
         ],
         preparer: [
-          { required: true, message: "请输入填表人", trigger: "blur" },
+          {required: true, message: "请输入填表人", trigger: "blur"},
         ],
         handlingAdvice: [
-          { required: true, message: "请输入办理意见", trigger: "blur" },
+          {required: true, message: "请输入办理意见", trigger: "blur"},
         ],
       },
-      areas:[],
-      options:[{id:1,label:"工程渣土"},{id:2,label:"工程淤泥"},{id:3,label:"盾构渣土"},{id:4,label:"拆除垃圾"},{id:5,label:"其他建筑垃圾"}],
-      approvalDocument:[],
-      approvalDocumentSlide:[],
-      approvalData:[],
-      approvalDataSlide:[],
-      scenePhoto:[],
-      scenePhotoSlide:[],
-      carWashingFacilitiesImage:[],
-      carWashingFacilitiesImageSlide:[],
-      safetyAssessmentReport:[],
-      safetyAssessmentReportSlide:[],
-      environmentalApproval:[],
-      environmentalApprovalSlide:[],
-      authorization:[],
-      authorizationSlide:[],
-      otherInformation:[],
-      otherInformationSlide:[],
-      openMap:false,
+      areas: [],
+      options: [{id: 1, label: "工程渣土"}, {id: 2, label: "工程淤泥"}, {id: 3, label: "盾构渣土"}, {
+        id: 4,
+        label: "拆除垃圾"
+      }, {id: 5, label: "其他建筑垃圾"}],
+      approvalDocument: [],
+      approvalDocumentSlide: [],
+      approvalData: [],
+      approvalDataSlide: [],
+      scenePhoto: [],
+      scenePhotoSlide: [],
+      carWashingFacilitiesImage: [],
+      carWashingFacilitiesImageSlide: [],
+      safetyAssessmentReport: [],
+      safetyAssessmentReportSlide: [],
+      environmentalApproval: [],
+      environmentalApprovalSlide: [],
+      authorization: [],
+      authorizationSlide: [],
+      otherInformation: [],
+      otherInformationSlide: [],
+      openMap: false,
       // 地图
       map: null,
       // 编辑工具
@@ -719,7 +775,12 @@ export default {
     '$route.query.disposalSiteId': 'initData'
   },
   methods: {
-    reset(){
+    openMapDialog(){
+      this.openMap = true;
+      this.initAMap("address");
+      this.keywords = this.form.address;
+    },
+    reset() {
       this.form = {};
       this.approvalDocument = [];
       this.approvalData = [];
@@ -730,76 +791,76 @@ export default {
       this.authorization = [];
       this.otherInformation = [];
     },
-    initData(){
+    initData() {
       this.reset();
       let id = this.$route.query.disposalSiteId;
-      if(id!=null){
+      if (id != null) {
         getDisposalSite(id).then(response => {
           this.form = response.data;
           //将字符串转换为int数组
           let trashTypeArr = this.form.trashType.split(",").map(str => parseInt(str, 10));
           this.form.trashType = trashTypeArr;
           //将附件转换为前端可视化数组
-          if(this.form.approvalDocument!=null&&this.form.approvalDocument!==""){
+          if (this.form.approvalDocument != null && this.form.approvalDocument !== "") {
             let approvalDocument = this.form.approvalDocument.split(";");
-            approvalDocument.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.approvalDocument.push({name:name,url:item})
+            approvalDocument.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.approvalDocument.push({name: name, url: item})
             })
           }
-          if(this.form.approvalData!=null&&this.form.approvalData!==""){
+          if (this.form.approvalData != null && this.form.approvalData !== "") {
             let approvalData = this.form.approvalData.split(";");
-            approvalData.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.approvalData.push({name:name,url:item})
+            approvalData.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.approvalData.push({name: name, url: item})
             })
           }
-          if(this.form.scenePhoto!=null&&this.form.scenePhoto!==""){
+          if (this.form.scenePhoto != null && this.form.scenePhoto !== "") {
             let scenePhoto = this.form.scenePhoto.split(";");
-            scenePhoto.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.scenePhoto.push({name:name,url:item})
+            scenePhoto.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.scenePhoto.push({name: name, url: item})
             })
           }
-          if(this.form.carWashingFacilitiesImage!=null&&this.form.carWashingFacilitiesImage!==""){
+          if (this.form.carWashingFacilitiesImage != null && this.form.carWashingFacilitiesImage !== "") {
             let carWashingFacilitiesImage = this.form.carWashingFacilitiesImage.split(";");
-            carWashingFacilitiesImage.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.carWashingFacilitiesImage.push({name:name,url:item})
+            carWashingFacilitiesImage.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.carWashingFacilitiesImage.push({name: name, url: item})
             })
           }
-          if(this.form.safetyAssessmentReport!=null&&this.form.safetyAssessmentReport!==""){
+          if (this.form.safetyAssessmentReport != null && this.form.safetyAssessmentReport !== "") {
             let safetyAssessmentReport = this.form.safetyAssessmentReport.split(";");
-            safetyAssessmentReport.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.safetyAssessmentReport.push({name:name,url:item})
+            safetyAssessmentReport.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.safetyAssessmentReport.push({name: name, url: item})
             })
           }
-          if(this.form.environmentalApproval!=null&&this.form.environmentalApproval!==""){
+          if (this.form.environmentalApproval != null && this.form.environmentalApproval !== "") {
             let environmentalApproval = this.form.environmentalApproval.split(";");
-            environmentalApproval.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.environmentalApproval.push({name:name,url:item})
+            environmentalApproval.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.environmentalApproval.push({name: name, url: item})
             })
           }
-          if(this.form.authorization!=null&&this.form.authorization!==""){
+          if (this.form.authorization != null && this.form.authorization !== "") {
             let authorization = this.form.authorization.split(";");
-            authorization.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.authorization.push({name:name,url:item})
+            authorization.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.authorization.push({name: name, url: item})
             })
           }
-          if(this.form.otherInformation!=null&&this.form.otherInformation!==""){
+          if (this.form.otherInformation != null && this.form.otherInformation !== "") {
             let otherInformation = this.form.otherInformation.split(";");
-            otherInformation.map(item=>{
-              let name = item.substring(item.lastIndexOf("/")+1);
-              this.otherInformation.push({name:name,url:item})
+            otherInformation.map(item => {
+              let name = item.substring(item.lastIndexOf("/") + 1);
+              this.otherInformation.push({name: name, url: item})
             })
           }
         });
       }
     },
-    closeMap(){
+    closeMap() {
       this.openMap = false;
       this.form.electronicFence = null;
       //清空地图图层
@@ -809,12 +870,11 @@ export default {
     currentSelect(val) {
       // 清空时不执行后面代码
       if (!val) {
-        return ;
+        return;
       }
-      // 自动适应显示想显示的范围区域
-      this.map.setFitView();
+
       //清除marker
-      if (this.searchMarker){
+      if (this.searchMarker) {
         this.map.remove(this.searchMarker)
       }
       //设置marker
@@ -826,6 +886,11 @@ export default {
       this.keywords = val.name
       //定位
       this.map.setCenter([val.location.lng, val.location.lat])
+      // 自动适应显示想显示的范围区域
+      this.map.setFitView();
+      this.form.addressGps = val.location.lng+","+val.location.lat;
+      this.form.address = val.district + val.name;
+
     },
     // 搜索地址
     remoteMethod(query) {
@@ -841,13 +906,13 @@ export default {
         this.mapOptions = [];
       }
     },
-    initAMap() {
+    initAMap(type) {
       const _this = this
       // 加载高德地图
       AMapLoader.load({
         key: _this.$aMapKey,  //设置高德地图申请的key
         version: "2.0",  // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-        plugins: ['AMap.ToolBar', 'AMap.PolygonEditor','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Marker'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        plugins: ['AMap.ToolBar', 'AMap.PolygonEditor', 'AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Marker'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
         AMapUI: {
           version: "1.1",
           plugins: []
@@ -864,10 +929,10 @@ export default {
           willreadoften: true
         });
-        _this.AutoComplete = await new AMap.AutoComplete({city:'全国'});
+        _this.AutoComplete = await new AMap.AutoComplete({city: '全国'});
         // 图层样式切换控件(卫星图)
-        AMapUI.loadUI(['control/BasicControl'], function(BasicControl) {
+        AMapUI.loadUI(['control/BasicControl'], function (BasicControl) {
           //图层切换控件
           _this.map.addControl(new BasicControl.LayerSwitcher({
@@ -875,78 +940,97 @@ export default {
           }));
         });
-        _this.polyEditor = new AMap.PolygonEditor(_this.map);
-        if(_this.form.electronicFence!=null){
-          // 电子围栏经纬度
-          let path = _this.form.electronicFence.split(";");
-          path.map(item=>{
-            let arr = item.split(",");
-            //将电子围栏经纬度转换为double类型数组
-            _this.polygonArr.push([parseFloat(arr[0]),parseFloat(arr[1])]);
-          });
-          _this.nowPolygon = new AMap.Polygon({
-            path: _this.polygonArr
-          })
-          _this.map.add([_this.nowPolygon]);
-          _this.map.setFitView();
-          _this.polyEditor.addAdsorbPolygons([_this.nowPolygon]);
-          _this.nowPolygon.on('dblclick', () => {
-            _this.polyEditor.setTarget(_this.nowPolygon);
-            _this.polyEditor.open();
-          })
-        }
-        _this.polyEditor.on('add', function (data) {
-          _this.nowPolygon = data.target;
-          _this.polyEditor.addAdsorbPolygons(_this.nowPolygon);
-          _this.nowPolygon.on('dblclick', () => {
-            _this.polyEditor.setTarget(_this.nowPolygon);
-            _this.polyEditor.open();
-          })
+        if (type === "draw") {
+          _this.polyEditor = new AMap.PolygonEditor(_this.map);
+          if (_this.form.electronicFence != null) {
+            // 电子围栏经纬度
+            let path = _this.form.electronicFence.split(";");
+            path.map(item => {
+              let arr = item.split(",");
+              //将电子围栏经纬度转换为double类型数组
+              _this.polygonArr.push([parseFloat(arr[0]), parseFloat(arr[1])]);
+            });
+            _this.nowPolygon = new AMap.Polygon({
+              path: _this.polygonArr
+            })
+            _this.map.add([_this.nowPolygon]);
+            _this.map.setFitView();
+            _this.polyEditor.addAdsorbPolygons([_this.nowPolygon]);
+            _this.nowPolygon.on('dblclick', () => {
+              _this.polyEditor.setTarget(_this.nowPolygon);
+              _this.polyEditor.open();
+            })
+          }
+          _this.polyEditor.on('add', function (data) {
+            _this.nowPolygon = data.target;
+            _this.polyEditor.addAdsorbPolygons(_this.nowPolygon);
+            _this.nowPolygon.on('dblclick', () => {
+              _this.polyEditor.setTarget(_this.nowPolygon);
+              _this.polyEditor.open();
+            })
-          // 加个右击监听 双击图层进行编辑
-          _this.map.on("rightclick",function (e){
-            if (_this.polyEditor) {
-              const arr = _this.nowPolygon.getPath()
-              let pathArr = []
-              // 将获取的停车场坐标点转换格式后存入数组
-              for (let item of arr) {
-                const list = [item.lng, item.lat]
-                pathArr.push(list)
-              }
+            // 加个右击监听 双击图层进行编辑
+            _this.map.on("rightclick", function (e) {
+              if (_this.polyEditor) {
+                const arr = _this.nowPolygon.getPath()
+                let pathArr = []
+                // 将获取的停车场坐标点转换格式后存入数组
+                for (let item of arr) {
+                  const list = [item.lng, item.lat]
+                  pathArr.push(list)
+                }
-              var maxDistance = 0; // 最大距离
-              var maxPointIndex = []; // 记录最大距离对应的点索引
+                var maxDistance = 0; // 最大距离
+                var maxPointIndex = []; // 记录最大距离对应的点索引
-              // 计算所有点对之间的距离
-              for (var i = 0; i < pathArr.length; i++) {
-                for (var j = i + 1; j < pathArr.length; j++) {
-                  var distance = AMap.GeometryUtil.distance(pathArr[i], pathArr[j]);
-                  if (distance > maxDistance) {
-                    maxDistance = distance;
-                    maxPointIndex = [i, j];
+                // 计算所有点对之间的距离
+                for (var i = 0; i < pathArr.length; i++) {
+                  for (var j = i + 1; j < pathArr.length; j++) {
+                    var distance = AMap.GeometryUtil.distance(pathArr[i], pathArr[j]);
+                    if (distance > maxDistance) {
+                      maxDistance = distance;
+                      maxPointIndex = [i, j];
+                    }
                   }
                 }
-              }
-              if(_this.nowPolygon!=null){
-                // 通过最大距离的点索引获取对应的点坐标
-                let mybounds  = new AMap.Bounds(pathArr[maxPointIndex[0]],pathArr[maxPointIndex[1]]);
-                // 设置地图显示范围
-                _this.map.setBounds(mybounds);
+                if (_this.nowPolygon != null) {
+                  // 通过最大距离的点索引获取对应的点坐标
+                  let mybounds = new AMap.Bounds(pathArr[maxPointIndex[0]], pathArr[maxPointIndex[1]]);
+                  // 设置地图显示范围
+                  _this.map.setBounds(mybounds);
+                }
+                //将经纬度存到form中
+                _this.form.electronicFence = pathArr.join(";");
+                _this.polyEditor.close();
               }
-              //将经纬度存到form中
-              _this.form.electronicFence = pathArr.join(";");
-              _this.polyEditor.close();
-            }
-          });
-        })
+            });
+          })
-        if(_this.nowPolygon===null){
-          _this.polyEditor.close();
-          _this.polyEditor.setTarget();
-          _this.polyEditor.open();
+          if (_this.nowPolygon === null) {
+            _this.polyEditor.close();
+            _this.polyEditor.setTarget();
+            _this.polyEditor.open();
+          }
         }
+        if(type==="address" && _this.form.addressGps.indexOf(",")>=0){
+          let lng = _this.form.addressGps.split(",")[0];
+          let lat = _this.form.addressGps.split(",")[1];
+          //清除marker
+          if (_this.searchMarker){
+            _this.map.remove(_this.searchMarker)
+          }
+          //设置marker
+          _this.searchMarker = new AMap.Marker({
+            map: this.map,
+            position: [lng, lat],
+          });
+          //定位
+          _this.map.setCenter([lng, lat])
+          // 自动适应显示想显示的范围区域
+          _this.map.setFitView();
+        }
       }).catch(e => {
         console.log(e);
@@ -954,7 +1038,7 @@ export default {
       this.loading = false;
       // this.openMap = false;
     },
-    clearPolyEditor(){
+    clearPolyEditor() {
       this.form.electronicFence = null;
       this.map.remove(this.nowPolygon);
       // 关闭一下编辑器，防止出bug
@@ -964,47 +1048,48 @@ export default {
       // 打开编辑器即可开始绘制
       this.polyEditor.open();
     },
-    draw(){
-      if(this.polyEditor!=null){
-        if(this.form.electronicFence==null){
-          // 关闭一下编辑器，防止出bug
-          this.polyEditor.close();
-          // 置空编辑区即为新增
-          this.polyEditor.setTarget();
-          // 打开编辑器即可开始绘制
-          this.polyEditor.open();
-        }
-      }else{
-        this.initAMap();
-      }
+    draw() {
+      // if(this.polyEditor!=null){
+      //   if(this.form.electronicFence==null){
+      //     // 关闭一下编辑器，防止出bug
+      //     this.polyEditor.close();
+      //     // 置空编辑区即为新增
+      //     this.polyEditor.setTarget();
+      //     // 打开编辑器即可开始绘制
+      //     this.polyEditor.open();
+      //   }
+      // }else{
+      //
+      // }
       this.openMap = true;
+      this.initAMap("draw");
       this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
         confirmButtonText: '确定',
         callback: action => {
-          if(this.form.electronicFence!=null){
+          if (this.form.electronicFence != null) {
             let path = this.form.electronicFence.split(";");
-            path.map(item=>{
+            path.map(item => {
               let arr = item.split(",");
-              this.polygonArr.push([arr[0],arr[1]]);
+              this.polygonArr.push([arr[0], arr[1]]);
             });
           }
         }
       });
     },
-    createUrl(file){
-      if(file.raw!=null){
+    createUrl(file) {
+      if (file.raw != null) {
         return URL.createObjectURL(file.raw);
-      }else{
+      } else {
         return process.env.VUE_APP_BASE_API + file.url;
       }
     },
-    tempDownload(row){
+    tempDownload(row) {
       let name = row.name;
       let url = "";
-      if(row.raw!=null){
+      if (row.raw != null) {
         url = URL.createObjectURL(row.raw);
-      }else{
+      } else {
         url = process.env.VUE_APP_BASE_API + row.url;
       }
       console.log(url)
@@ -1016,14 +1101,14 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.$tab.closePage({path:"/disposalSite/info"}).then(() => {
-        this.$tab.openPage("处理场所管理", "/tool/disposalSite",{disposalSiteRefresh:1})
+      this.$tab.closePage({path: "/disposalSite/info"}).then(() => {
+        this.$tab.openPage("处理场所管理", "/tool/disposalSite", {disposalSiteRefresh: 1})
       })
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        if(this.form.validityBeginDate>this.form.validityEndDate){
+        if (this.form.validityBeginDate > this.form.validityEndDate) {
           this.$message({
             message: '有限期开始时间不能大于有限期结束时间！',
             type: 'warning'
@@ -1059,66 +1144,66 @@ export default {
           this.approvalDocument.forEach(item => {
             if (item.raw != null) {
               formData.append('approvalDocumentFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.approvalDocument = form.approvalDocument!==null?form.approvalDocument+";"+item.url:item.url;
+              form.approvalDocument = form.approvalDocument !== null ? form.approvalDocument + ";" + item.url : item.url;
             }
           })
           this.approvalData.forEach(item => {
             if (item.raw != null) {
               formData.append('approvalDataFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.approvalData = form.approvalData!==null?form.approvalData+";"+item.url:item.url;
+              form.approvalData = form.approvalData !== null ? form.approvalData + ";" + item.url : item.url;
             }
           })
           this.scenePhoto.forEach(item => {
             if (item.raw != null) {
               formData.append('scenePhotoFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.scenePhoto = form.scenePhoto!==null?form.scenePhoto+";"+item.url:item.url;
+              form.scenePhoto = form.scenePhoto !== null ? form.scenePhoto + ";" + item.url : item.url;
             }
           })
           this.carWashingFacilitiesImage.forEach(item => {
             if (item.raw != null) {
               formData.append('carWashingFacilitiesImageFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.carWashingFacilitiesImage = form.carWashingFacilitiesImage!==null?form.carWashingFacilitiesImage+";"+item.url:item.url;
+              form.carWashingFacilitiesImage = form.carWashingFacilitiesImage !== null ? form.carWashingFacilitiesImage + ";" + item.url : item.url;
             }
           })
           this.safetyAssessmentReport.forEach(item => {
             if (item.raw != null) {
               formData.append('safetyAssessmentReportFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.safetyAssessmentReport = form.safetyAssessmentReport!==null?form.safetyAssessmentReport+";"+item.url:item.url;
+              form.safetyAssessmentReport = form.safetyAssessmentReport !== null ? form.safetyAssessmentReport + ";" + item.url : item.url;
             }
           })
           this.environmentalApproval.forEach(item => {
             if (item.raw != null) {
               formData.append('environmentalApprovalFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.environmentalApproval = form.environmentalApproval!==null?form.environmentalApproval+";"+item.url:item.url;
+              form.environmentalApproval = form.environmentalApproval !== null ? form.environmentalApproval + ";" + item.url : item.url;
             }
           })
           this.authorization.forEach(item => {
             if (item.raw != null) {
               formData.append('authorizationFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.authorization = form.authorization!==null?form.authorization+";"+item.url:item.url;
+              form.authorization = form.authorization !== null ? form.authorization + ";" + item.url : item.url;
             }
           })
           this.otherInformation.forEach(item => {
             if (item.raw != null) {
               formData.append('otherInformationFiles', item.raw)
-            }else{
+            } else {
               //将原有的附件拼接到form中
-              form.otherInformation = form.otherInformation!==null?form.otherInformation+";"+item.url:item.url;
+              form.otherInformation = form.otherInformation !== null ? form.otherInformation + ";" + item.url : item.url;
             }
           })
           for (let key in form) {
@@ -1127,15 +1212,15 @@ export default {
           if (this.form.id != null) {
             updateDisposalSite(formData).then(response => {
               this.msgSuccess("修改成功");
-              this.$tab.closePage({path:"/disposalSite/infoEdit"}).then(() => {
-                this.$tab.openPage("处理场所管理", "/tool/disposalSite",{disposalSiteRefresh:1})
+              this.$tab.closePage({path: "/disposalSite/infoEdit"}).then(() => {
+                this.$tab.openPage("处理场所管理", "/tool/disposalSite", {disposalSiteRefresh: 1})
               })
             });
           } else {
             addDisposalSite(formData).then(response => {
               this.msgSuccess("新增成功");
-              this.$tab.closePage({path:"/disposalSite/info"}).then(() => {
-                this.$tab.openPage("处理场所管理", "/tool/disposalSite",{disposalSiteRefresh:1})
+              this.$tab.closePage({path: "/disposalSite/info"}).then(() => {
+                this.$tab.openPage("处理场所管理", "/tool/disposalSite", {disposalSiteRefresh: 1})
               })
             });
           }
@@ -1510,33 +1595,37 @@ export default {
   }
 };
 </script>
-<style  lang="scss"  scoped>
-.upload_lable{
+<style lang="scss" scoped>
+.upload_lable {
   border-right: 1px solid #dcdfe6;
   padding: 27px 30px;
   background: #fafafa;
   text-align: center;
 }
-.upload_btn{
+
+.upload_btn {
   max-height: 106px;
 }
-.upload_close{
+
+.upload_close {
   position: absolute;
   left: 105px;
-  z-index:99;
-  top:-1px;
-  font-size:18px;
-  color:red;
+  z-index: 99;
+  top: -1px;
+  font-size: 18px;
+  color: red;
 }
-.upload_close_file{
+
+.upload_close_file {
   position: absolute;
   left: 80px;
-  z-index:99;
-  top:-1px;
-  font-size:18px;
-  color:red;
+  z-index: 99;
+  top: -1px;
+  font-size: 18px;
+  color: red;
 }
-.upload_div_image{
+
+.upload_div_image {
   display: inline-block;
   width: 110px;
   height: 95px;
@@ -1544,16 +1633,18 @@ export default {
   float: left;
   margin-left: 5px;
 }
-.upload_div_file{
+
+.upload_div_file {
   display: inline-block;
   width: 110px;
   height: 95px;
   text-align: center;
-  float:left;
+  float: left;
   margin: 5px;
   position: relative;
 }
-.serach_map{
+
+.serach_map {
   position: absolute;
   top: 100px;
   left: 25px;
@@ -1561,6 +1652,6 @@ export default {
   background: #fff;
   padding: 10px;
   border-radius: 5px;
-  box-shadow: 0 0 10px rgba(0,0,0,.2);
+  box-shadow: 0 0 10px rgba(0, 0, 0, .2);
 }
 </style>
@@ -59,7 +59,7 @@
       </el-row>
       <el-row :gutter="30">
         <el-col :span="7">
-          <el-form-item label="办公地址" prop="officeAddress">
+          <el-form-item label="办公地址" prop="officeAddress" class="is-required">
             <el-input v-model="form.officeAddress" placeholder="请输入内容" @focus="openMapDialog"/>
           </el-form-item>
         </el-col>
@@ -452,7 +452,9 @@ export default {
       open: false,
       openMap: false,
       // 表单参数
-      form: {},
+      form: {
+        officeAddress: "",
+      },
       // 表单校验
       rules: {
         name: [
@@ -473,9 +475,6 @@ export default {
         businessLicenseDate: [
           {required: true, message: "请选择企业营业执照有效期", trigger: "blur"}
         ],
-        officeAddress: [
-          {required: true, message: "请输入办公地址", trigger: "blur"}
-        ],
         parkingLotLocation: [
           {required: true, message: "请输入停车场位置", trigger: "blur"}
         ],
@@ -553,9 +552,8 @@ export default {
   methods: {
     openMapDialog(){
       this.openMap = true;
-      if(this.map==null){
-        this.initAMap();
-      }
+      this.initAMap();
+      this.keywords = this.form.officeAddress;
     },
     // 选中提示
     currentSelect(val) {
@@ -564,8 +562,7 @@ export default {
       if (!val) {
         return ;
       }
-      // 自动适应显示想显示的范围区域
-      this.map.setFitView();
+
       //清除marker
       if (this.searchMarker){
         this.map.remove(this.searchMarker)
@@ -575,7 +572,8 @@ export default {
         map: this.map,
         position: [val.location.lng, val.location.lat],
       });
-
+      // 自动适应显示想显示的范围区域
+      this.map.setFitView();
       this.keywords = val.name
       //定位
       this.map.setCenter([val.location.lng, val.location.lat])
@@ -627,8 +625,26 @@ export default {
           _this.map.addControl(new BasicControl.LayerSwitcher({
             position: 'rb' // 右下角
           }));
-
         });
+
+        if(_this.form.officeAddressGps.indexOf(",")>=0){
+          let lng = _this.form.officeAddressGps.split(",")[0];
+          let lat = _this.form.officeAddressGps.split(",")[1];
+          //清除marker
+          if (_this.searchMarker){
+            _this.map.remove(_this.searchMarker)
+          }
+          //设置marker
+          _this.searchMarker = new AMap.Marker({
+            map: this.map,
+            position: [lng, lat],
+          });
+          //定位
+          _this.map.setCenter([lng, lat])
+          // 自动适应显示想显示的范围区域
+          _this.map.setFitView();
+        }
+
       }).catch(e => {
         console.log(e);
       });
+<template>
+  <div class="app-container">
+
+    <!-- 添加或修改处理场所管理对话框 -->
+    <h3>
+      基础信息
+    </h3>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px"  label-position="top">
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="企业名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入企业名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="简称" prop="abbreviation">
+            <el-input v-model="form.abbreviation" placeholder="请输入简称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="注册地所在区域" prop="registrationArea">
+            <el-select v-model="form.registrationArea" placeholder="请输入注册地所在区域" style="width: 100%">
+              <el-option v-for="(area,index) in areas" :label="area.name" :value="area.name" :key="index"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="企业道路运输经营许可证有效期" prop="transportPermissionDate">
+            <el-date-picker clearable size="small" style="width: 100%;"
+                            v-model="form.transportPermissionDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择企业道路运输经营许可证有效期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="企业入市时间" prop="enterDate">
+            <el-date-picker clearable size="small" style="width: 100%;"
+                            v-model="form.enterDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择企业入市时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="企业营业执照有效期" prop="businessLicenseDate">
+            <el-date-picker clearable size="small" style="width: 100%;"
+                            v-model="form.businessLicenseDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择企业营业执照有效期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="办公地址" prop="officeAddress" class="is-required">
+            <el-input v-model="form.officeAddress" placeholder="请输入内容" @focus="openMapDialog"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="停车场位置" prop="parkingLotLocation">
+            <el-input v-model="form.parkingLotLocation" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="停车场面积(m²)" prop="parkingArea">
+            <el-input v-model="form.parkingArea" placeholder="请输入停车场面积" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="企业安全负责人姓名及联系方式" prop="safetyManagerName">
+            <el-row>
+              <el-col :span="6">
+                <el-input v-model="form.safetyManagerName" placeholder="姓名" />
+              </el-col>
+              <el-col :span="18">
+                <el-input v-model="form.safetyManagerPhone" placeholder="联系方式"  :maxlength="11" show-word-limit/>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="社会统一信用代码编号" prop="socialUniformCreditCodeNumber">
+            <el-input v-model="form.socialUniformCreditCodeNumber" placeholder="请输入社会统一信用代码编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="法人代表及联系方式" prop="legalRepresentative">
+            <el-row>
+              <el-col :span="6">
+                <el-input v-model="form.legalRepresentative" placeholder="姓名" />
+              </el-col>
+              <el-col :span="18">
+                <el-input v-model="form.legalRepresentativePhone" placeholder="联系方式"  :maxlength="11" show-word-limit/>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="安全管理人员" prop="safetyPeopleName">
+            <el-input v-model="form.safetyPeopleName" placeholder="请输入安全管理人员" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="服务电话" prop="servicePhone">
+            <el-input v-model="form.servicePhone" placeholder="请输入企业服务电话"   :maxlength="11" show-word-limit/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="报价" prop="offer">
+            <el-input v-model="form.offer"  placeholder="请输入起始报价" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            企业道路运输经营许可证
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="transportPermission">
+
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in transportPermission">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="transportPermission.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="transportPermission.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            企业营业执照
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange1"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="enterpriseBusinessLicense">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in enterpriseBusinessLicense">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="enterpriseBusinessLicense.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="enterpriseBusinessLicense.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            安全员考核合格证明
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange2"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="safetyOfficerQualificationCertificate">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in safetyOfficerQualificationCertificate">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="safetyOfficerQualificationCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="safetyOfficerQualificationCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            企业负责人安全考核证
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange3"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="safetyCertificate">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in safetyCertificate">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="safetyCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="safetyCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            停车场全景图
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange4"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="carParkPanorama">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in carParkPanorama">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="carParkPanorama.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="carParkPanorama.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            公司头像或LOGO
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg"
+              :on-change="fileChange5"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="companyLogo">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in companyLogo">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="companyLogo.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <!--        <el-form-item label="" prop="environmentalApproval">-->
+      <!--          <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="" prop="authorization">-->
+      <!--          <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="" prop="otherInformation">-->
+      <!--          <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="运输企业" prop="companyIds">-->
+      <!--          <el-input v-model="form.companyIds" placeholder="请输入运输企业" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="审批状态,0=审批中,1=审批通过,2=被驳回">-->
+      <!--          <el-radio-group v-model="form.status">-->
+      <!--            <el-radio label="1">请选择字典生成</el-radio>-->
+      <!--          </el-radio-group>-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="二维码" prop="qrCode">-->
+      <!--          <el-input v-model="form.qrCode" placeholder="请输入二维码" />-->
+      <!--        </el-form-item>-->
+    </el-form>
+    <div slot="footer" class="dialog-footer" style="margin-top: 20px">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+    <el-dialog title="高德地图" :visible.sync="openMap" width="1600px" height="750px" append-to-body>
+      <div class="serach_map">
+        搜索：
+        <el-select
+          v-model="keywords"
+          filterable
+          remote
+          placeholder="请输入关键词"
+          :remote-method="remoteMethod"
+          :loading="loading"
+          :clearable="true"
+          size="mini"
+          @change="currentSelect"
+          style="width: 250px"
+        >
+          <el-option
+            v-for="item in mapOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item"
+            class="one-text"
+          >
+            <span style="float: left">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{
+                item.district
+              }}</span>
+          </el-option>
+        </el-select>
+      </div>
+      <div v-loading="loading" id="enterpriseContainer" class="am-map" style="width:100%;height: 700px;"></div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="openMap = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEnterprise, getEnterprise, delEnterprise, addEnterprise, updateEnterprise, exportEnterprise } from "@/api/unit/enterprise";
+import Treeselect from "@riophae/vue-treeselect";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {getAreaList} from "@/api/casefile/remoteServer";
+import AMapLoader from '@amap/amap-jsapi-loader';
+
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  securityJsCode: 'aa1db7d8f534f3da3f6d8a6a71382802',
+}
+export default {
+  name: "DisposalSite",
+  components: {Treeselect,AMapLoader},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 处理场所管理表格数据
+      disposalSiteList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      openMap: false,
+      // 表单参数
+      form: {
+        officeAddress: "",
+      },
+      // 表单校验
+      rules: {
+        name: [
+          {required: true, message: "请输入企业名称", trigger: "blur"}
+        ],
+        abbreviation: [
+          {required: true, message: "请输入简称", trigger: "blur"}
+        ],
+        registrationArea: [
+          {required: true, message: "请输入注册地所在区域", trigger: "blur"}
+        ],
+        transportPermissionDate: [
+          {required: true, message: "请选择企业道路运输经营许可证有效期", trigger: "blur"}
+        ],
+        enterDate: [
+          {required: true, message: "请选择企业入市时间", trigger: "blur"}
+        ],
+        businessLicenseDate: [
+          {required: true, message: "请选择企业营业执照有效期", trigger: "blur"}
+        ],
+        parkingLotLocation: [
+          {required: true, message: "请输入停车场位置", trigger: "blur"}
+        ],
+        parkingArea: [
+          {required: true, message: "请输入停车场面积", trigger: "blur"},
+          {pattern: /^\d+(\.\d+)?$/, message: "只能输入正数和小数", trigger: "blur"}
+        ],
+        safetyManagerName: [
+          {required: true, message: "请输入企业安全负责人姓名", trigger: "blur"}
+        ],
+        socialUniformCreditCodeNumber: [
+          {required: true, message: "请输入社会统一信用代码编号", trigger: "blur"}
+        ],
+        legalRepresentative: [
+          {required: true, message: "请输入法人代表", trigger: "blur"}
+        ],
+        safetyPeopleName: [
+          {required: true, message: "请输入安全管理人员", trigger: "blur"}
+        ],
+        servicePhone: [
+          {required: true, message: "请输入企业服务手机号码", trigger: "blur"},
+          {
+            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            message: '手机号格式错误',
+            trigger: 'change'
+          }
+        ],
+        offer: [
+          {required: true, message: "必填", trigger: "blur"},
+          {
+            pattern: /^\d+(?:\.\d{1,2})?$/,
+            message: "请输入正确的金额",
+            trigger: "blur"
+          }
+        ],
+      },
+      areas:[],
+      // 企业道路运输经营许可证
+      transportPermission:[],
+      // 企业营业执照
+      enterpriseBusinessLicense:[],
+      // 安全员考核合格证明
+      safetyOfficerQualificationCertificate:[],
+      // 企业负责人安全考核证
+      safetyCertificate:[],
+      // 停车场全景图
+      carParkPanorama:[],
+      //公司logo,公司头像
+      companyLogo:[],
+      enterpriseList:[],
+      // 地图
+      map: null,
+      keywords: "",
+      mapOptions: [],
+      AutoComplete: null,
+      searchMarker: null,
+    };
+  },
+
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+    this.queryParams = {
+      companyType:"0"
+    }
+    listEnterprise(this.queryParams).then(response => {
+      this.enterpriseList = response.rows;
+    });
+    this.initData();
+  },
+  watch: {
+    '$route.query.enterpriseId': 'initData'
+  },
+  methods: {
+    openMapDialog(){
+      this.openMap = true;
+      this.initAMap();
+      this.keywords = this.form.officeAddress;
+    },
+    // 选中提示
+    currentSelect(val) {
+      console.log(val);
+      // 清空时不执行后面代码
+      if (!val) {
+        return ;
+      }
+
+      //清除marker
+      if (this.searchMarker){
+        this.map.remove(this.searchMarker)
+      }
+      //设置marker
+      this.searchMarker = new AMap.Marker({
+        map: this.map,
+        position: [val.location.lng, val.location.lat],
+      });
+      // 自动适应显示想显示的范围区域
+      this.map.setFitView();
+      this.keywords = val.name
+      //定位
+      this.map.setCenter([val.location.lng, val.location.lat])
+      this.form.officeAddressGps = val.location.lng+","+val.location.lat;
+      this.form.officeAddress = val.district + val.name;
+    },
+    // 搜索地址
+    remoteMethod(query) {
+      if (query !== "") {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.AutoComplete.search(query, (status, result) => {
+            this.mapOptions = result.tips;
+          });
+        }, 200);
+      } else {
+        this.mapOptions = [];
+      }
+    },
+    initAMap() {
+      const _this = this
+      // 加载高德地图
+      AMapLoader.load({
+        key: _this.$aMapKey,  //设置高德地图申请的key
+        version: "2.0",  // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: ['AMap.ToolBar', 'AMap.PolygonEditor','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Marker'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        AMapUI: {
+          version: "1.1",
+          plugins: []
+        },
+        Loca: {
+          version: "2.0"
+        },
+      }).then(async (AMap) => {
+        _this.map = await new AMap.Map("enterpriseContainer", { //设置地图容器id
+          viewMode: "2D",  // 默认使用 2D 模式
+          center: [113.01814545605467, 28.201039299894283], // 初始化地图中心点位置
+          zoom: 11, //初始化地图层级
+          resizeEnable: true,
+          willreadoften: true
+        });
+
+        _this.AutoComplete = await new AMap.AutoComplete({city:'长沙'});
+
+        // 图层样式切换控件(卫星图)
+        AMapUI.loadUI(['control/BasicControl'], function(BasicControl) {
+          //图层切换控件
+          _this.map.addControl(new BasicControl.LayerSwitcher({
+            position: 'rb' // 右下角
+          }));
+        });
+
+        if(_this.form.officeAddressGps.indexOf(",")>=0){
+          let lng = _this.form.officeAddressGps.split(",")[0];
+          let lat = _this.form.officeAddressGps.split(",")[1];
+          //清除marker
+          if (_this.searchMarker){
+            _this.map.remove(_this.searchMarker)
+          }
+          //设置marker
+          _this.searchMarker = new AMap.Marker({
+            map: this.map,
+            position: [lng, lat],
+          });
+          //定位
+          _this.map.setCenter([lng, lat])
+          // 自动适应显示想显示的范围区域
+          _this.map.setFitView();
+        }
+
+      }).catch(e => {
+        console.log(e);
+      });
+      this.loading = false;
+      // this.openMap = false;
+    },
+    reset(){
+      this.form = {};
+      this.transportPermission = [];
+      this.enterpriseBusinessLicense = [];
+      this.safetyOfficerQualificationCertificate = [];
+      this.safetyCertificate = [];
+      this.carParkPanorama = [];
+      this.companyLogo = [];
+    },
+    initData(){
+      this.reset();
+      let id = this.$route.query.enterpriseId;
+      if(id!=null){
+        getEnterprise(id).then(response => {
+          this.form = response.data;
+          //将附件转换为前端可视化数组
+          if(this.form.transportPermission!=null&&this.form.transportPermission!==""){
+            let approvalDocument = this.form.transportPermission.split(";");
+            approvalDocument.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.transportPermission.push({name:name,url:item})
+            })
+          }
+          if(this.form.enterpriseBusinessLicense!=null&&this.form.enterpriseBusinessLicense!==""){
+            let approvalData = this.form.enterpriseBusinessLicense.split(";");
+            approvalData.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.enterpriseBusinessLicense.push({name:name,url:item})
+            })
+          }
+          if(this.form.safetyOfficerQualificationCertificate!=null&&this.form.safetyOfficerQualificationCertificate!==""){
+            let scenePhoto = this.form.safetyOfficerQualificationCertificate.split(";");
+            scenePhoto.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.safetyOfficerQualificationCertificate.push({name:name,url:item})
+            })
+          }
+          if(this.form.safetyCertificate!=null&&this.form.safetyCertificate!==""){
+            let carWashingFacilitiesImage = this.form.safetyCertificate.split(";");
+            carWashingFacilitiesImage.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.safetyCertificate.push({name:name,url:item})
+            })
+          }
+          if(this.form.carParkPanorama!=null&&this.form.carParkPanorama!==""){
+            let safetyAssessmentReport = this.form.carParkPanorama.split(";");
+            safetyAssessmentReport.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.carParkPanorama.push({name:name,url:item})
+            })
+          }
+          if(this.form.companyLogo!=null&&this.form.companyLogo!==""){
+            let safetyAssessmentReport = this.form.companyLogo.split(";");
+            safetyAssessmentReport.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.companyLogo.push({name:name,url:item})
+            })
+          }
+        });
+      }
+    },
+    createUrl(file){
+      if(file.raw!=null){
+        return URL.createObjectURL(file.raw);
+      }else{
+        return process.env.VUE_APP_BASE_API + file.url;
+      }
+
+    },
+    tempDownload(row){
+      let name = row.name;
+      let url = "";
+      if(row.raw!=null){
+        url = URL.createObjectURL(row.raw);
+      }else{
+        url = process.env.VUE_APP_BASE_API + row.url;
+      }
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', url);
+      a.click()
+    },
+    // 取消按钮
+    cancel() {
+      this.$tab.closePage({path:"/enterprise/info"}).then(() => {
+        this.$tab.openPage("处理场所管理", "/tool/enterprise",{enterpriseRefresh:1})
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let phoneTest = /^1[3456789]\d{9}$/;
+          if(phoneTest.test(this.form.safetyManagerPhone)===false){
+            this.msgError("请输入正确的企业安全负责人联系方式");
+            return false;
+          }
+          if(phoneTest.test(this.form.legalRepresentativePhone)===false){
+            this.msgError("请输入正确的法人代表联系方式");
+            return false;
+          }
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+
+          //先清空原有的附件
+          form.transportPermission = null;
+          form.enterpriseBusinessLicense = null;
+          form.safetyOfficerQualificationCertificate = null;
+          form.safetyCertificate = null;
+          form.carParkPanorama = null;
+          form.companyLogo = null;
+          form.companyType = "1";
+
+          this.transportPermission.forEach(item => {
+            if (item.raw != null) {
+              formData.append('transportPermissionFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.transportPermission = form.transportPermission!==null?form.transportPermission+";"+item.url:item.url;
+            }
+          })
+
+          this.enterpriseBusinessLicense.forEach(item => {
+            if (item.raw != null) {
+              formData.append('enterpriseBusinessLicenseFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.enterpriseBusinessLicense = form.enterpriseBusinessLicense!==null?form.enterpriseBusinessLicense+";"+item.url:item.url;
+            }
+          })
+          this.safetyOfficerQualificationCertificate.forEach(item => {
+            if (item.raw != null) {
+              formData.append('safetyOfficerQualificationCertificateFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.safetyOfficerQualificationCertificate = form.safetyOfficerQualificationCertificate!==null?form.safetyOfficerQualificationCertificate+";"+item.url:item.url;
+            }
+          })
+          this.safetyCertificate.forEach(item => {
+            if (item.raw != null) {
+              formData.append('safetyCertificateFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.safetyCertificate = form.safetyCertificate!==null?form.safetyCertificate+";"+item.url:item.url;
+            }
+          })
+          this.carParkPanorama.forEach(item => {
+            if (item.raw != null) {
+              formData.append('carParkPanoramaFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.carParkPanorama = form.carParkPanorama!==null?form.carParkPanorama+";"+item.url:item.url;
+            }
+          })
+          this.companyLogo.forEach(item => {
+            if (item.raw != null) {
+              formData.append('companyLogoFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.companyLogo = form.companyLogo!==null?form.companyLogo+";"+item.url:item.url;
+            }
+          })
+          for (let key in form) {
+            formData.append(key, form[key] == null ? "" : form[key])
+          }
+          if (this.form.id != null) {
+            updateEnterprise(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.$tab.closePage({path:"/enterprise/infoEdit"}).then(() => {
+                this.$tab.openPage("运输企业管理", "/tool/enterprise",{enterpriseRefresh:1})
+              })
+            });
+          } else {
+            addEnterprise(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.$tab.closePage({path:"/enterprise/info"}).then(() => {
+                this.$tab.openPage("运输企业管理", "/tool/enterprise",{enterpriseRefresh:1})
+              })
+            });
+          }
+        }
+      });
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过20M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.transportPermission = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange1(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.enterpriseBusinessLicense = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange2(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.safetyOfficerQualificationCertificate = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange3(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.safetyCertificate = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange4(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.carParkPanorama = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange5(file, fileList) {
+      if(fileList.length>1){
+        this.$message({
+          message: '只能上传一张图片！',
+          type: 'warning'
+        });
+        return false;
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.companyLogo = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+  }
+};
+</script>
+<style  lang="scss"  scoped>
+.upload_lable{
+  border-right: 1px solid #dcdfe6;
+  padding: 27px 30px;
+  background: #fafafa;
+  text-align: center;
+}
+.upload_btn{
+  max-height: 106px;
+}
+.upload_close{
+  position: absolute;
+  left: 105px;
+  z-index:99;
+  top:-1px;
+  font-size:18px;
+  color:red;
+}
+.upload_close_file{
+  position: absolute;
+  left: 80px;
+  z-index:99;
+  top:-1px;
+  font-size:18px;
+  color:red;
+}
+.upload_div_image{
+  display: inline-block;
+  width: 110px;
+  height: 95px;
+  position: relative;
+  float: left;
+  margin-left: 5px;
+}
+.upload_div_file{
+  display: inline-block;
+  width: 110px;
+  height: 95px;
+  text-align: center;
+  float:left;
+  margin: 5px;
+  position: relative;
+}
+.serach_map{
+  position: absolute;
+  top: 100px;
+  left: 25px;
+  z-index: 999;
+  background: #fff;
+  padding: 10px;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0,0,0,.2);
+}
+</style>
@@ -32,8 +32,12 @@ public class DisposalSite extends BaseEntity
     @Excel(name = "所在地址")
     private String address;
+    /** 所在地址GPS */
+    @Excel(name = "所在地址Gps")
+    private String addressGps;
+
     /** 消纳（回填）场所工程性质 */
-    @Excel(name = "消纳", readConverterExp = "回=填")
+    @Excel(name = "消纳（回填）场所工程性质")
     private String engineeringProperty;
     /** 建筑垃圾处理场所类型 */
@@ -53,11 +57,11 @@ public class DisposalSite extends BaseEntity
     private String trashType;
     /** 建设（施工）单位名称 */
-    @Excel(name = "建设", readConverterExp = "施=工")
+    @Excel(name = "建设（施工）单位名称")
     private String constructionUnit;
     /** 建设（施工）单位责任人 */
-    @Excel(name = "建设", readConverterExp = "施=工")
+    @Excel(name = "建设（施工）单位责任人")
     private String constructionUnitPerson;
     /** 责任人联系电话 */
@@ -174,6 +178,14 @@ public class DisposalSite extends BaseEntity
     @Excel(name = "审核情况")
     private String auditStatus;
+    public String getAddressGps() {
+        return addressGps;
+    }
+
+    public void setAddressGps(String addressGps) {
+        this.addressGps = addressGps;
+    }
+
     public String getAuditStatus() {
         return auditStatus;
     }
@@ -560,6 +572,7 @@ public class DisposalSite extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("updateBy", getUpdateBy())
             .append("qrCode", getQrCode())
+            .append("addressGps", getAddressGps())
             .toString();
     }
 }
@@ -55,6 +55,19 @@ public class GpsOrientation extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String createTimeEnd;
+    /**
+     * 速度 km/h
+     */
+    private String speed;
+
+    public String getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(String speed) {
+        this.speed = speed;
+    }
+
     public String getCreateTimeStart() {
         return createTimeStart;
     }
@@ -47,10 +47,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="updateBy"    column="update_by"    />
         <result property="qrCode"    column="qr_code"    />
         <result property="auditStatus"    column="audit_status"    />
+        <result property="addressGps"    column="address_gps"    />
     </resultMap>
     <sql id="selectDisposalSiteVo">
-        select id, name, certificate_number, address, engineering_property, site_type, local_area, operating_area, trash_type, construction_unit, construction_unit_person, construction_unit_person_phone, validity_begin_date, validity_end_date, square_measure, surplus_square_measure, car_washing_facilities, exit_road_condition, lighting_facility, video_surveillance_facility, preparer, handling_advice, absorb_source, electronic_fence, credit_status, approval_document, approval_data, scene_photo, car_washing_facilities_image, term_range, safety_assessment_report, environmental_approval, `authorization`, other_information, company_ids, status, create_time, create_by, update_time, update_by, qr_code,audit_status from disposal_site
+        select id, name, certificate_number, address, engineering_property, site_type, local_area, operating_area, trash_type, construction_unit, construction_unit_person, construction_unit_person_phone, validity_begin_date, validity_end_date, square_measure, surplus_square_measure, car_washing_facilities, exit_road_condition, lighting_facility, video_surveillance_facility, preparer, handling_advice, absorb_source, electronic_fence, credit_status, approval_document, approval_data, scene_photo, car_washing_facilities_image, term_range, safety_assessment_report, environmental_approval, `authorization`, other_information, company_ids, status, create_time, create_by, update_time, update_by, qr_code,audit_status,address_gps from disposal_site
     </sql>
     <select id="selectDisposalSiteList" parameterType="DisposalSite" resultMap="DisposalSiteResult">
@@ -87,7 +88,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="termRange != null  and termRange != ''"> and term_range = #{termRange}</if>
             <if test="safetyAssessmentReport != null  and safetyAssessmentReport != ''"> and safety_assessment_report = #{safetyAssessmentReport}</if>
             <if test="environmentalApproval != null  and environmentalApproval != ''"> and environmental_approval = #{environmentalApproval}</if>
-            <if test="authorization != null  and authorization != ''"> and authorization = #{authorization}</if>
+            <if test="authorization != null  and authorization != ''"> and `authorization` = #{authorization}</if>
             <if test="otherInformation != null  and otherInformation != ''"> and other_information = #{otherInformation}</if>
             <if test="companyIds != null  and companyIds != ''"> and company_ids = #{companyIds}</if>
             <if test="status != null "> and status = #{status}</if>
@@ -135,7 +136,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="termRange != null">term_range,</if>
             <if test="safetyAssessmentReport != null">safety_assessment_report,</if>
             <if test="environmentalApproval != null">environmental_approval,</if>
-            <if test="authorization != null">authorization,</if>
+            <if test="authorization != null">`authorization`,</if>
             <if test="otherInformation != null">other_information,</if>
             <if test="companyIds != null">company_ids,</if>
             <if test="status != null">status,</if>
@@ -145,6 +146,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="updateBy != null">update_by,</if>
             <if test="qrCode != null">qr_code,</if>
             <if test="auditStatus != null">audit_status,</if>
+            <if test="addressGps != null">address_gps,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -188,6 +190,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="updateBy != null">#{updateBy},</if>
             <if test="qrCode != null">#{qrCode},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="addressGps != null">#{addressGps},</if>
          </trim>
     </insert>
@@ -225,7 +228,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="termRange != null">term_range = #{termRange},</if>
             <if test="safetyAssessmentReport != null">safety_assessment_report = #{safetyAssessmentReport},</if>
             <if test="environmentalApproval != null">environmental_approval = #{environmentalApproval},</if>
-            <if test="authorization != null">authorization = #{authorization},</if>
+            <if test="authorization != null">`authorization` = #{authorization},</if>
             <if test="otherInformation != null">other_information = #{otherInformation},</if>
             <if test="companyIds != null">company_ids = #{companyIds},</if>
             <if test="status != null">`status` = #{status},</if>
@@ -233,6 +236,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="addressGps != null">address_gps = #{addressGps},</if>
         </trim>
         where id = #{id}
     </update>
@@ -11,10 +11,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="latitude"    column="latitude"    />
         <result property="createTime"    column="create_time"    />
         <result property="carCode"    column="car_code"    />
+        <result property="speed"    column="speed"    />
     </resultMap>
     <sql id="selectGpsOrientationVo">
-        select id, terminal_number, longitude, latitude, create_time,car_code from gps_orientation_${yearMonth}
+        select id, terminal_number, longitude, latitude, create_time,car_code,speed from gps_orientation_${yearMonth}
     </sql>
     <select id="selectGpsOrientationList" parameterType="GpsOrientation" resultMap="GpsOrientationResult">
@@ -39,6 +40,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="latitude != null">latitude,</if>
             <if test="createTime != null">create_time,</if>
             <if test="carCode != null">car_code,</if>
+            <if test="speed != null">speed,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="terminalNumber != null">#{terminalNumber},</if>
@@ -46,6 +48,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="latitude != null">#{latitude},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="carCode != null">#{carCode},</if>
+            <if test="speed != null">#{speed},</if>
          </trim>
     </insert>
@@ -57,6 +60,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="latitude != null">latitude = #{latitude},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="carCode != null">car_code = #{carCode},</if>
+            <if test="speed != null">speed = #{speed},</if>
         </trim>
         where id = #{id}
     </update>
@@ -85,6 +89,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             latitude varchar(20) DEFAULT NULL COMMENT '纬度',
             create_time datetime DEFAULT NULL COMMENT '创建时间',
             car_code varchar(20) DEFAULT NULL COMMENT '车牌号',
+            speed varchar(20) DEFAULT NULL COMMENT '速度km/h',
             PRIMARY KEY (id)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='gps定位表';
     </update>
+package com.trash.casefile.kafka;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.support.SendResult;
+import org.springframework.stereotype.Component;
+import org.springframework.util.concurrent.ListenableFuture;
+import org.springframework.util.concurrent.ListenableFutureCallback;
+
+/**
+ * kafka数据对接-生产者
+ */
+@Component("producer")
+public class Producer {
+    @Autowired
+    private KafkaTemplate kafkaTemplate;
+
+    private static final Logger log = LoggerFactory.getLogger(Producer.class);
+
+    /**
+     * 发送数据
+     * @param json
+     */
+    public void sendLog(String json,String key){
+        ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("TEST",key,json);
+        future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
+
+            @Override
+            public void onSuccess(SendResult<String, String> result) {
+                log.info("kafka发送数据成功"+json, result);
+            }
+
+            @Override
+            public void onFailure(Throwable ex) {
+                log.error("kafka发送数据异常", ex);
+            }
+        });
+    }
+
+
+}