Merge branch 'master' of http://218.59.175.43:3000/zhangzl/rongxin.dashboard

src/views/resource/land/index.vue

@@ -779,22 +779,20 @@ export default {
     },
     /** 地图修改按钮操作 */
     handleMap(row) {
-      getLandDetail(row.fid).then((theGeomRes) => {
-        this.mapTheGeomId = theGeomRes.data;
-        getInfoByImportCode(row.importCode).then((res) => {
-          let insertCode = res.data;
-          if (insertCode != null) {
-            this.tGeoOrganizationLat = insertCode.latitude;
-            this.tGeoOrganizationLng = insertCode.longitude;
-          }
-          const tableRow = { importCode: row.importCode };
-          listLandQuery(tableRow).then(response => {
-            this.openMap = true;
-            this.title = "修改地图";
-            setTimeout(() => {
-              this.pointDarw(response.rows);
-            }, 500);
-          });
+      this.mapTheGeomId = row;
+      getInfoByImportCode(row.importCode).then((res) => {
+        let insertCode = res.data;
+        if (insertCode != null) {
+          this.tGeoOrganizationLat = insertCode.latitude;
+          this.tGeoOrganizationLng = insertCode.longitude;
+        }
+        const tableRow = { importCode: row.importCode };
+        listLandQuery(tableRow).then(response => {
+          this.openMap = true;
+          this.title = "修改地图";
+          setTimeout(() => {
+            this.pointDarw(response.rows);
+          }, 500);
         });
       });
     },
@@ -803,6 +801,8 @@ export default {
       this.diglogStatus = false;
       if(this.drawInsert !=null && this.drawInsert !=""){
         this.mapTheGeomId.theGeom = JSON.stringify(this.drawInsert);
+      }else{
+        this.mapTheGeomId.theGeom = this.mapTheGeomId.theGeomText
       }
       let sysGis = { tableName: 't_resource_land',priId: 'fid',id: this.mapTheGeomId.fid,theGeom: this.mapTheGeomId.theGeom };
       if (this.mapTheGeomId != null) {