diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index aab5f0d..b51cf3c 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -573,13 +573,13 @@
     }
 
     public void exportClientExcel( HttpServletRequest request, HttpServletResponse response,User user, String strMarkerDto){
-
         List<MarkerDto> markerDtos = null;
         int type = 0;
         String excelName = "管线信息";
         String excelColumns = "";
         String alias = "";
         if (StringUtils.isNotBlank(strMarkerDto)) {
+            strMarkerDto = strMarkerDto.replace('\n',' ');
             MarkerDto markerDto = new Gson().fromJson(strMarkerDto, MarkerDto.class);
             type = markerDto.getRecordType() == null ? 0 : markerDto.getRecordType();
             markerDtos = getMarkerDtosByCondition(markerDto, user.getCompany(), type);

diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index aab5f0d..b51cf3c 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -573,13 +573,13 @@
     }
 
     public void exportClientExcel( HttpServletRequest request, HttpServletResponse response,User user, String strMarkerDto){
-
         List<MarkerDto> markerDtos = null;
         int type = 0;
         String excelName = "管线信息";
         String excelColumns = "";
         String alias = "";
         if (StringUtils.isNotBlank(strMarkerDto)) {
+            strMarkerDto = strMarkerDto.replace('\n',' ');
             MarkerDto markerDto = new Gson().fromJson(strMarkerDto, MarkerDto.class);
             type = markerDto.getRecordType() == null ? 0 : markerDto.getRecordType();
             markerDtos = getMarkerDtosByCondition(markerDto, user.getCompany(), type);
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1a191cd..1fee6ef 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -205,6 +205,7 @@
     @RequestMapping("batchSave-na")
     @ResponseBody
     public Map<String, Object> batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) {
+        strMarkers = strMarkers.replace('\n',' ');
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("message", "批量导入失败,或无导入标识器信息");
         Gson gson = new Gson();

diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index aab5f0d..b51cf3c 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -573,13 +573,13 @@
     }
 
     public void exportClientExcel( HttpServletRequest request, HttpServletResponse response,User user, String strMarkerDto){
-
         List<MarkerDto> markerDtos = null;
         int type = 0;
         String excelName = "管线信息";
         String excelColumns = "";
         String alias = "";
         if (StringUtils.isNotBlank(strMarkerDto)) {
+            strMarkerDto = strMarkerDto.replace('\n',' ');
             MarkerDto markerDto = new Gson().fromJson(strMarkerDto, MarkerDto.class);
             type = markerDto.getRecordType() == null ? 0 : markerDto.getRecordType();
             markerDtos = getMarkerDtosByCondition(markerDto, user.getCompany(), type);
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1a191cd..1fee6ef 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -205,6 +205,7 @@
     @RequestMapping("batchSave-na")
     @ResponseBody
     public Map<String, Object> batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) {
+        strMarkers = strMarkers.replace('\n',' ');
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("message", "批量导入失败,或无导入标识器信息");
         Gson gson = new Gson();
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index aeb148a..0efb9a9 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -67,26 +67,33 @@
                     }
                     return;
                 }
+               if(confirm("删除是不可恢复的，你确认要删除吗？")){
+                   //删除操作：
+                   $.ajax({
+                       type: "get",
+                       url: $('#context').val() + "/marker/delMarkerByIds.do",
+                       dataType: "json",
+                       cache: false,
+                       data: {
+                           "ids": readyToDel
+                       },
+                       success: function (r) {
+                           if (r.success) {//请求成功
+                               window.markerData = [];
+                               location.href = $('#context').val() + "/content/ems/ems.jsp";
+                           }
+                       },
+                       error: function (d) {//请求出错
+                           alert(d.responseText);
+                       }
+                   });
+               }else{
+                   for (var i in drawOverlays) {
+                       map.removeOverlay(drawOverlays[i]);
+                   }
+                   return;
+               }
 
-                //删除操作：
-                $.ajax({
-                    type: "get",
-                    url: $('#context').val() + "/marker/delMarkerByIds.do",
-                    dataType: "json",
-                    cache: false,
-                    data: {
-                        "ids": readyToDel
-                    },
-                    success: function (r) {
-                        if (r.success) {//请求成功
-                            window.markerData = [];
-                            location.href = $('#context').val() + "/content/ems/ems.jsp";
-                        }
-                    },
-                    error: function (d) {//请求出错
-                        alert(d.responseText);
-                    }
-                });
 
 
             }
@@ -163,9 +170,9 @@
             for (var i = 0; i < readyToUploadMarkers.length; i++) {
                 map.removeOverlay(readyToUploadMarkers[i]);
             }
+            readyToUploadPoints = [];
             drawOverlays = [];
             readyToUploadMarkers = [];
-
         },