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 fa98196..07b562d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -230,6 +230,42 @@
 
     }
 
+    public boolean editMarkerAndPhoto(MarkerDto markerDto, Long companyId,String[] fileNames, String[] fileBuffers){
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String strDirPath = request.getSession().getServletContext().getRealPath("");
+        FileOutputStream fos = null;
+        String month = TimeFormat.format(Calendar.getInstance().getTime(), "yyyyMM");
+        String webPath = "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String toDir = strDirPath + "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String filePaths = "";
+        try {
+            for (int i = 0; i < fileBuffers.length; i++) {
+                if (fileBuffers[i] != null && fileNames[i] != null) {
+//                    filePaths += toDir+fileNames[i]+",";
+                    filePaths += webPath + fileNames[i] + ",";
+                    byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);   //对android传过来的图片字符串进行解码
+                    File destDir = new File(toDir);
+                    if (!destDir.exists())
+                        destDir.mkdirs();
+                    File imageFile = new File(destDir, fileNames[i]);
+                    fos = new FileOutputStream(imageFile);   //保存图片
+                    fos.write(buffer);
+                    fos.flush();
+                    fos.close();
+                }
+            }
+            if (filePaths.endsWith(",")) {
+                filePaths = filePaths.substring(0, filePaths.length() - 1);
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        markerDto.setPhotos(filePaths);
+        List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+        markerDtos.add(markerDto);
+        batchSave(markerDtos,companyId);
+        return true;
+    }
     /**
      * 新增标识器 8-9
      *
@@ -272,6 +308,7 @@
             marker.setPipeMaterial(markerDto.getPipeMaterial());
             marker.setArea(markerDto.getArea());
             marker.setLine(markerDto.getLine());
+            marker.setPhotos(markerDto.getPhotos());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             try {
                 if (StringUtils.isNotBlank(markerDto.getCreateTime())) {

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 fa98196..07b562d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -230,6 +230,42 @@
 
     }
 
+    public boolean editMarkerAndPhoto(MarkerDto markerDto, Long companyId,String[] fileNames, String[] fileBuffers){
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String strDirPath = request.getSession().getServletContext().getRealPath("");
+        FileOutputStream fos = null;
+        String month = TimeFormat.format(Calendar.getInstance().getTime(), "yyyyMM");
+        String webPath = "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String toDir = strDirPath + "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String filePaths = "";
+        try {
+            for (int i = 0; i < fileBuffers.length; i++) {
+                if (fileBuffers[i] != null && fileNames[i] != null) {
+//                    filePaths += toDir+fileNames[i]+",";
+                    filePaths += webPath + fileNames[i] + ",";
+                    byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);   //对android传过来的图片字符串进行解码
+                    File destDir = new File(toDir);
+                    if (!destDir.exists())
+                        destDir.mkdirs();
+                    File imageFile = new File(destDir, fileNames[i]);
+                    fos = new FileOutputStream(imageFile);   //保存图片
+                    fos.write(buffer);
+                    fos.flush();
+                    fos.close();
+                }
+            }
+            if (filePaths.endsWith(",")) {
+                filePaths = filePaths.substring(0, filePaths.length() - 1);
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        markerDto.setPhotos(filePaths);
+        List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+        markerDtos.add(markerDto);
+        batchSave(markerDtos,companyId);
+        return true;
+    }
     /**
      * 新增标识器 8-9
      *
@@ -272,6 +308,7 @@
             marker.setPipeMaterial(markerDto.getPipeMaterial());
             marker.setArea(markerDto.getArea());
             marker.setLine(markerDto.getLine());
+            marker.setPhotos(markerDto.getPhotos());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             try {
                 if (StringUtils.isNotBlank(markerDto.getCreateTime())) {
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 c6cd733..ddf89de 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -140,6 +140,55 @@
         return map;
     }
 
+    @RequestMapping("marker-info-photo")
+    @ResponseBody
+    public Map<String, Object> saveInfoAndPhoto(@RequestParam(value = "fileBuffer1", required = false) MultipartFile fileBuffer1,
+                                                @RequestParam(value = "fileBuffer2", required = false) MultipartFile fileBuffer2,
+                                                @RequestParam(value = "fileBuffer3", required = false) MultipartFile fileBuffer3,
+                                                @RequestParam(value = "jsonMarker", required = true) String jsonMarker,
+                                                HttpSession session){
+        Map<String, Object> map = new HashMap<String, Object>();
+        Gson gson = new Gson();
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        try {
+            MarkerDto marker = gson.fromJson(jsonMarker, MarkerDto.class);
+            if (marker == null) {
+                map.put("success", false);
+                map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
+                return map;
+            }
+            String[] fileNames = new String[3];
+            String[] fileBuffers = new String[3];
+            if (fileBuffer1 != null) {
+                fileNames[0] = marker.getMarkerId() + "_" + fileBuffer1.getOriginalFilename();
+                byte[] fis = fileBuffer1.getBytes();
+                fileBuffers[0] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer2 != null) {
+                fileNames[1] = marker.getMarkerId() + "_" + fileBuffer2.getOriginalFilename();
+                byte[] fis = fileBuffer2.getBytes();
+                fileBuffers[1] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer3 != null) {
+                fileNames[2] = marker.getMarkerId() + "_" + fileBuffer3.getOriginalFilename();
+                byte[] fis = fileBuffer3.getBytes();
+                fileBuffers[2] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, Base64.BASE64DEFAULTLENGTH));
+            }
+            markerManager.editMarkerAndPhoto(marker,companyId,fileNames,fileBuffers);
+            map.put("success", true);
+            map.put("message", "编辑成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("success", false);
+            map.put("message", "编辑失败");
+            return map;
+        }
+        map.put("success", true);
+        map.put("message", "编辑成功");
+        return map;
+    }
+
     /**
      * 保存标识器属性及图片信息
      * @param fileBuffer1

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 fa98196..07b562d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -230,6 +230,42 @@
 
     }
 
+    public boolean editMarkerAndPhoto(MarkerDto markerDto, Long companyId,String[] fileNames, String[] fileBuffers){
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String strDirPath = request.getSession().getServletContext().getRealPath("");
+        FileOutputStream fos = null;
+        String month = TimeFormat.format(Calendar.getInstance().getTime(), "yyyyMM");
+        String webPath = "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String toDir = strDirPath + "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String filePaths = "";
+        try {
+            for (int i = 0; i < fileBuffers.length; i++) {
+                if (fileBuffers[i] != null && fileNames[i] != null) {
+//                    filePaths += toDir+fileNames[i]+",";
+                    filePaths += webPath + fileNames[i] + ",";
+                    byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);   //对android传过来的图片字符串进行解码
+                    File destDir = new File(toDir);
+                    if (!destDir.exists())
+                        destDir.mkdirs();
+                    File imageFile = new File(destDir, fileNames[i]);
+                    fos = new FileOutputStream(imageFile);   //保存图片
+                    fos.write(buffer);
+                    fos.flush();
+                    fos.close();
+                }
+            }
+            if (filePaths.endsWith(",")) {
+                filePaths = filePaths.substring(0, filePaths.length() - 1);
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        markerDto.setPhotos(filePaths);
+        List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+        markerDtos.add(markerDto);
+        batchSave(markerDtos,companyId);
+        return true;
+    }
     /**
      * 新增标识器 8-9
      *
@@ -272,6 +308,7 @@
             marker.setPipeMaterial(markerDto.getPipeMaterial());
             marker.setArea(markerDto.getArea());
             marker.setLine(markerDto.getLine());
+            marker.setPhotos(markerDto.getPhotos());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             try {
                 if (StringUtils.isNotBlank(markerDto.getCreateTime())) {
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 c6cd733..ddf89de 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -140,6 +140,55 @@
         return map;
     }
 
+    @RequestMapping("marker-info-photo")
+    @ResponseBody
+    public Map<String, Object> saveInfoAndPhoto(@RequestParam(value = "fileBuffer1", required = false) MultipartFile fileBuffer1,
+                                                @RequestParam(value = "fileBuffer2", required = false) MultipartFile fileBuffer2,
+                                                @RequestParam(value = "fileBuffer3", required = false) MultipartFile fileBuffer3,
+                                                @RequestParam(value = "jsonMarker", required = true) String jsonMarker,
+                                                HttpSession session){
+        Map<String, Object> map = new HashMap<String, Object>();
+        Gson gson = new Gson();
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        try {
+            MarkerDto marker = gson.fromJson(jsonMarker, MarkerDto.class);
+            if (marker == null) {
+                map.put("success", false);
+                map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
+                return map;
+            }
+            String[] fileNames = new String[3];
+            String[] fileBuffers = new String[3];
+            if (fileBuffer1 != null) {
+                fileNames[0] = marker.getMarkerId() + "_" + fileBuffer1.getOriginalFilename();
+                byte[] fis = fileBuffer1.getBytes();
+                fileBuffers[0] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer2 != null) {
+                fileNames[1] = marker.getMarkerId() + "_" + fileBuffer2.getOriginalFilename();
+                byte[] fis = fileBuffer2.getBytes();
+                fileBuffers[1] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer3 != null) {
+                fileNames[2] = marker.getMarkerId() + "_" + fileBuffer3.getOriginalFilename();
+                byte[] fis = fileBuffer3.getBytes();
+                fileBuffers[2] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, Base64.BASE64DEFAULTLENGTH));
+            }
+            markerManager.editMarkerAndPhoto(marker,companyId,fileNames,fileBuffers);
+            map.put("success", true);
+            map.put("message", "编辑成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("success", false);
+            map.put("message", "编辑失败");
+            return map;
+        }
+        map.put("success", true);
+        map.put("message", "编辑成功");
+        return map;
+    }
+
     /**
      * 保存标识器属性及图片信息
      * @param fileBuffer1
diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp
index 0aee35b..18634f5 100644
--- a/src/main/webapp/content/marker/marker-info-edit-new.jsp
+++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>

<%@include file="/taglibs.jsp" %>

<%pageContext.setAttribute("currentMenu", "marker1");%>

<!DOCTYPE html>

<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->

<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->

<!--[if IE 10]> <html lang="en" class="ie10"> <![endif]-->

<!--[if IE 11]> <html lang="en" class="ie11"> <![endif]-->

<!--[if !IE]><!-->
<html lang="en"> <!--<![endif]-->

<head>

    <meta charset="utf-8"/>

    <title>地下管线电子标识系统</title>

    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>

    <meta content="" name="description"/>

    <meta content="" name="author"/>

    <!-- BEGIN GLOBAL MANDATORY STYLES -->

    <link href="${ctx}/s/media/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-metro.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-responsive.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/blue.css" rel="stylesheet" type="text/css" id="style_color"/>

    <link href="${ctx}/s/media/css/uniform.default.css" rel="stylesheet" type="text/css"/>

    <!-- END GLOBAL MANDATORY STYLES -->

    <!-- BEGIN PAGE LEVEL STYLES -->

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.gritter.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.tagsinput.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/clockface.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-wysihtml5.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/timepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/colorpicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-toggle-buttons.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/daterangepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datetimepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/multi-select-metro.css"/>

    <link href="${ctx}/s/media/css/bootstrap-modal.css" rel="stylesheet" type="text/css"/>

    <!-- END PAGE LEVEL STYLES -->

    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">

<input type="hidden" id="context" value="${ctx}">

<!-- BEGIN HEADER -->

<%@include file="/common/layout/header.jsp" %>

<!-- END HEADER -->

<!-- BEGIN CONTAINER -->

<div class="page-container">

<!-- BEGIN SIDEBAR -->

<%@include file="/common/layout/menu_new.jsp" %>

<!-- END SIDEBAR -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->
        <div class="container-fluid">

            <div class="clearfix"></div>

            <!--BEGIN SECOND MENU-->
            <%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
            <!--BEGIN SECOND MENU-->

            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN PAGE CONTENT-->
            <div class="row-fluid" style="position: relative">

                <div class="span8" style="position: relative" >

                    <div class="portlet box blue">

                        <div class="portlet-title">
                            <div class="caption"><i class="icon-edit"></i>标识器管理信息编辑</div>
                        </div>

                        <div class="portlet-body form">
                            <div class="portlet-body form">
                                <form action="" class="form-horizontal" id="submit_form">
                                    <div class="alert alert-error hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        操作失败：
                                        <span id="errorMessage"></span>
                                    </div>

                                    <div class="alert alert-success hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        添加成功
                                    </div>

                                    <!--用户名称与密码 -->
                                    <div class="control-group">
                                        <label class="control-label">标识对象类别</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识对象类别" name="recordType" data-with-diselect="1" class="m-wrap span6" id="selectObjectType">
                                                <option value="1"  ${ 1==model.recordType ? 'selected' : '' } >管线</option>
                                                <option value="2"  ${ 2==model.recordType ? 'selected' : '' }>管线附属物</option>
                                                <option value="3"  ${ 3==model.recordType ? 'selected' : '' }>管线特征点</option>
                                                <option value="4"  ${ 4==model.recordType ? 'selected' : '' }>交叉穿越点</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label"  id="pipeTypeLabel">管线种类</label>
                                        <div class="controls">
                                            <input type="text" name="markerObjectType" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group"  hidden="hidden">
                                        <div class="controls">
                                            <input type="text" name="latitude" id="latitude" class="m-wrap  span6"
                                                   value="${model.latitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group" hidden="hidden" >
                                        <div class="controls">
                                            <input type="text" name="longitude" id="longitude" class="m-wrap  span6"
                                                   value="${model.longitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeDiameterLabel">管线直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeDiameter" id="pipeDiameter" value="${model.pipeDiameter}" />毫米
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeMaterialLabel">管线材质</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeMaterial" id="pipeMaterial" value="${model.pipeMaterial}"/>
                                        </div>
                                    </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管种类</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="belowType" id="belowPipeType" value="${model.belowType}"/>
                                        </div>
                                    </div>


                                        <div class="control-group below">
                                            <label class="control-label">下层管埋深</label>

                                            <div class="controls">
                                                <input type="text" class="m-wrap span6"  name="belowDepth" id="belowPipeDepth" value="${model.belowDepth}"/>
                                            </div>
                                        </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowDiameter" id="belowPipeDiameter"  value="${model.belowDiameter}"/>
                                        </div>
                                </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管材料</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowMaterial" id="belowPipeMaterial" value="${model.belowMaterial}"/>
                                        </div>
                                    </div>

                                   <div class="control-group">
                                        <label class="control-label" id="pipeDepthLabel">管线埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="depth" id="pipeDepth" value="${model.depth}"/>
                                        </div>
                                    </div>

                                    <div class="control-group pipeOnly">
                                        <label class="control-label">埋设方式</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="layStyle" id="layStyle" value="${model.layStyle}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属区域</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="area" id="area" value="${model.area}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属线路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="line" id="line" value="${model.line}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属道路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="road" id="road" value="${model.road}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">建设年代</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="constructTime" id="constructTime"  value="${model.constructTime}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">权属单位</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="ownerComp" id="ownerComp"  value="${model.ownerComp}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">标示对象ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerObjectId" id="markerObjectId" value="${model.markerObjectId}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerId" id="markerId" value="${model.markerId}" />
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标示器类型</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerType" id="markerType"  value="${model.markerType}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerDepth" id="markerDepth" value="${model.markerDepth}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">安装部门</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="creator" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识点颜色</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识点颜色类型" name="colorType" data-with-diselect="1" class="m-wrap span6" id="colorType">
                                                <option value="0"  ${ 0==model.colorType ? 'selected' : '' }>蓝色（默认）</option>
                                                <option value="1"  ${ 1==model.colorType ? 'selected' : '' }>橙色</option>
                                                <option value="2"  ${ 2==model.colorType ? 'selected' : '' }>红色</option>
                                                <option value="3"  ${ 3==model.colorType ? 'selected' : '' }>黑色</option>
                                                <option value="4"  ${ 4==model.colorType ? 'selected' : '' }>粉紫色</option>
                                                <option value="5"  ${ 5==model.colorType ? 'selected' : '' }>黄色</option>
                                                <option value="6"  ${ 6==model.colorType ? 'selected' : '' }>绿色</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">备注</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="memo" id="memo" value="${model.memo}"/>
                                        </div>
                                    </div>


                                    <div class="control-group hidden">
                                        <label class="control-label">主键ID</label>
                                        <div class="controls">
                                            <input type="text" name="id" value="${model.id}" id="id"/>
                                            <span class="help-inline"></span>
                                        </div>
                                    </div>

                                    <div class="form-actions">
                                        <button type="submit" class="btn blue">提交</button>
                                        <button type="button" class="btn" id="cancelBtn">取消</button>
                                    </div>

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

        <div class="clearfix"></div>

    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

<%@include file="/common/layout/footer.jsp" %>

<!-- END FOOTER -->

<!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->

<!-- BEGIN CORE PLUGINS -->

<script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>

<!-- IMPORTANT! Load jquery-ui-1.10.1.custom.min.js before bootstrap.min.js to fix bootstrap tooltip conflict with jquery ui tooltip -->

<script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>

<!--[if lt IE 9]>

<script src="${ctx}/s/media/js/excanvas.min.js"></script>

<script src="${ctx}/s/media/js/respond.min.js"></script>

<![endif]-->

<script src="${ctx}/s/media/js/jquery.slimscroll.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.blockui.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.cookie.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.uniform.min.js" type="text/javascript"></script>

<!-- END CORE PLUGINS -->

<!-- BEGIN PAGE LEVEL PLUGINS -->

<%--<script type="text/javascript" src="${ctx}/s/media/js/ckeditor.js"></script>--%>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/wysihtml5-0.3.0.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-wysihtml5.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.tagsinput.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.toggle.buttons.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datetimepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/clockface.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/date.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/daterangepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-colorpicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-timepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.inputmask.bundle.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.input-ip-address-control-1.0.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.multi-select.js"></script>

<script src="${ctx}/s/media/js/bootstrap-modal.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap-modalmanager.js" type="text/javascript"></script>


<script type="text/javascript" src="${ctx}/s/media/js/jquery.validate.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/additional-methods.min.js"></script>

<!-- END PAGE LEVEL PLUGINS -->

<!-- BEGIN PAGE LEVEL SCRIPTS -->

<script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>

<script src="${ctx}/s/app/marker/marker-info-edit.js"></script>

<!-- END PAGE LEVEL SCRIPTS -->

<script>

    jQuery(document).ready(function () {

        App.init();

        MarkerInfoEdit.initForms();

    });

</script>

<!-- END JAVASCRIPTS -->

<!-- END BODY -->
</body>
</html>
\ No newline at end of file
+<%@page contentType="text/html;charset=UTF-8" %>

<%@include file="/taglibs.jsp" %>

<%pageContext.setAttribute("currentMenu", "marker1");%>

<!DOCTYPE html>

<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->

<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->

<!--[if IE 10]> <html lang="en" class="ie10"> <![endif]-->

<!--[if IE 11]> <html lang="en" class="ie11"> <![endif]-->

<!--[if !IE]><!-->
<html lang="en"> <!--<![endif]-->

<head>

    <meta charset="utf-8"/>

    <title>地下管线电子标识系统</title>

    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>

    <meta content="" name="description"/>

    <meta content="" name="author"/>

    <!-- BEGIN GLOBAL MANDATORY STYLES -->

    <link href="${ctx}/s/media/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-metro.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-responsive.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/blue.css" rel="stylesheet" type="text/css" id="style_color"/>

    <link href="${ctx}/s/media/css/uniform.default.css" rel="stylesheet" type="text/css"/>

    <!-- END GLOBAL MANDATORY STYLES -->

    <!-- BEGIN PAGE LEVEL STYLES -->

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.gritter.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.tagsinput.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/clockface.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-wysihtml5.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/timepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/colorpicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-toggle-buttons.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/daterangepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datetimepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/multi-select-metro.css"/>

    <link href="${ctx}/s/media/css/bootstrap-modal.css" rel="stylesheet" type="text/css"/>

    <!-- END PAGE LEVEL STYLES -->

    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

    <style>
        .uploadImg {
            width: 300px;
        }
    </style>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">

<input type="hidden" id="context" value="${ctx}">

<!-- BEGIN HEADER -->

<%@include file="/common/layout/header.jsp" %>

<!-- END HEADER -->

<!-- BEGIN CONTAINER -->

<div class="page-container">

<!-- BEGIN SIDEBAR -->

<%@include file="/common/layout/menu_new.jsp" %>

<!-- END SIDEBAR -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->
        <div class="container-fluid">

            <div class="clearfix"></div>

            <!--BEGIN SECOND MENU-->
            <%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
            <!--BEGIN SECOND MENU-->

            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN PAGE CONTENT-->
            <div class="row-fluid" style="position: relative">

                <div class="span8" style="position: relative" >

                    <div class="portlet box blue">



                        <div class="portlet-title">
                            <div class="caption"><i class="icon-edit"></i>标识器管理信息编辑</div>
                        </div>

                        <div class="portlet-body form">
                            <div class="portlet-body form">
                                <form action="" class="form-horizontal" id="submit_form" enctype="multipart/form-data">
                                    <div class="alert alert-error hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        操作失败：
                                        <span id="errorMessage"></span>
                                    </div>

                                    <div class="alert alert-success hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        添加成功
                                    </div>

                                    <!--用户名称与密码 -->
                                    <div class="control-group">
                                        <label class="control-label">标识对象类别</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识对象类别" name="recordType" data-with-diselect="1" class="m-wrap span6" id="selectObjectType">
                                                <option value="1"  ${ 1==model.recordType ? 'selected' : '' } >管线</option>
                                                <option value="2"  ${ 2==model.recordType ? 'selected' : '' }>管线附属物</option>
                                                <option value="3"  ${ 3==model.recordType ? 'selected' : '' }>管线特征点</option>
                                                <option value="4"  ${ 4==model.recordType ? 'selected' : '' }>交叉穿越点</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label"  id="pipeTypeLabel">管线种类</label>
                                        <div class="controls">
                                            <input type="text" name="markerObjectType" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group"  hidden="hidden">
                                        <div class="controls">
                                            <input type="text" name="latitude" id="latitude" class="m-wrap  span6"
                                                   value="${model.latitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group" hidden="hidden" >
                                        <div class="controls">
                                            <input type="text" name="longitude" id="longitude" class="m-wrap  span6"
                                                   value="${model.longitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeDiameterLabel">管线直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeDiameter" id="pipeDiameter" value="${model.pipeDiameter}" />毫米
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeMaterialLabel">管线材质</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeMaterial" id="pipeMaterial" value="${model.pipeMaterial}"/>
                                        </div>
                                    </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管种类</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="belowType" id="belowPipeType" value="${model.belowType}"/>
                                        </div>
                                    </div>


                                        <div class="control-group below">
                                            <label class="control-label">下层管埋深</label>

                                            <div class="controls">
                                                <input type="text" class="m-wrap span6"  name="belowDepth" id="belowPipeDepth" value="${model.belowDepth}"/>
                                            </div>
                                        </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowDiameter" id="belowPipeDiameter"  value="${model.belowDiameter}"/>
                                        </div>
                                </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管材料</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowMaterial" id="belowPipeMaterial" value="${model.belowMaterial}"/>
                                        </div>
                                    </div>

                                   <div class="control-group">
                                        <label class="control-label" id="pipeDepthLabel">管线埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="depth" id="pipeDepth" value="${model.depth}"/>
                                        </div>
                                    </div>

                                    <div class="control-group pipeOnly">
                                        <label class="control-label">埋设方式</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="layStyle" id="layStyle" value="${model.layStyle}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属区域</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="area" id="area" value="${model.area}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属线路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="line" id="line" value="${model.line}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属道路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="road" id="road" value="${model.road}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">建设年代</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="constructTime" id="constructTime"  value="${model.constructTime}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">权属单位</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="ownerComp" id="ownerComp"  value="${model.ownerComp}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">标示对象ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerObjectId" id="markerObjectId" value="${model.markerObjectId}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerId" id="markerId" value="${model.markerId}" />
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标示器类型</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerType" id="markerType"  value="${model.markerType}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerDepth" id="markerDepth" value="${model.markerDepth}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">安装部门</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="creator" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识点颜色</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识点颜色类型" name="colorType" data-with-diselect="1" class="m-wrap span6" id="colorType">
                                                <option value="0"  ${ 0==model.colorType ? 'selected' : '' }>蓝色（默认）</option>
                                                <option value="1"  ${ 1==model.colorType ? 'selected' : '' }>橙色</option>
                                                <option value="2"  ${ 2==model.colorType ? 'selected' : '' }>红色</option>
                                                <option value="3"  ${ 3==model.colorType ? 'selected' : '' }>黑色</option>
                                                <option value="4"  ${ 4==model.colorType ? 'selected' : '' }>粉紫色</option>
                                                <option value="5"  ${ 5==model.colorType ? 'selected' : '' }>黄色</option>
                                                <option value="6"  ${ 6==model.colorType ? 'selected' : '' }>绿色</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">备注</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="memo" id="memo" value="${model.memo}"/>
                                        </div>
                                    </div>

                                    <input type="hidden" id="photo" value="${model.photos}">

                                    <div class="control-group">
                                        <label class="control-label">图片1</label>
                                        <div class="controls">
                                            <img class="uploadImg" id="img1" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file1" type="file" class="uploadBtn" name="file1">
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">图片2</label>
                                        <div class="controls">
                                            <img class="uploadImg" id="img2" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file2" type="file" class="uploadBtn" name="file2">
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">图片3</label>
                                        <div class="controls">
                                            <img id="img3" class="uploadImg" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file3" type="file" class="uploadBtn" name="file3">
                                        </div>
                                    </div>


                                    <div class="control-group hidden">
                                        <label class="control-label">主键ID</label>
                                        <div class="controls">
                                            <input type="text" name="id" value="${model.id}" id="id"/>
                                            <span class="help-inline"></span>
                                        </div>
                                    </div>

                                    <div class="form-actions">
                                        <button type="submit" class="btn blue">提交</button>
                                        <button type="button" class="btn" id="cancelBtn">取消</button>
                                    </div>

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

        <div class="clearfix"></div>

    </div>

    <!-- 图片放大模态框 -->
    <div id="ShowImage_Form" class="modal hide modal-lg">
        <div class="modal-header" style="height:10px">
            <button data-dismiss="modal" class="close" type="button"></button>
        </div>
        <div class="modal-body">
            <div id="img_show">
            </div>
        </div>
    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

<%@include file="/common/layout/footer.jsp" %>

<!-- END FOOTER -->

<!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->

<!-- BEGIN CORE PLUGINS -->

<script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>

<!-- IMPORTANT! Load jquery-ui-1.10.1.custom.min.js before bootstrap.min.js to fix bootstrap tooltip conflict with jquery ui tooltip -->

<script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>

<!--[if lt IE 9]>

<script src="${ctx}/s/media/js/excanvas.min.js"></script>

<script src="${ctx}/s/media/js/respond.min.js"></script>

<![endif]-->

<script src="${ctx}/s/media/js/jquery.slimscroll.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.blockui.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.cookie.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.uniform.min.js" type="text/javascript"></script>

<!-- END CORE PLUGINS -->

<!-- BEGIN PAGE LEVEL PLUGINS -->

<%--<script type="text/javascript" src="${ctx}/s/media/js/ckeditor.js"></script>--%>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/wysihtml5-0.3.0.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-wysihtml5.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.tagsinput.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.toggle.buttons.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datetimepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/clockface.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/date.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/daterangepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-colorpicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-timepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.inputmask.bundle.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.input-ip-address-control-1.0.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.multi-select.js"></script>

<script src="${ctx}/s/media/js/bootstrap-modal.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap-modalmanager.js" type="text/javascript"></script>


<script type="text/javascript" src="${ctx}/s/media/js/jquery.validate.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/additional-methods.min.js"></script>

<!-- END PAGE LEVEL PLUGINS -->

<!-- BEGIN PAGE LEVEL SCRIPTS -->

<script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>

<script src="${ctx}/s/app/marker/marker-info-edit.js"></script>

<!-- END PAGE LEVEL SCRIPTS -->

<script>

    jQuery(document).ready(function () {

        App.init();

        MarkerInfoEdit.initForms();

    });

</script>

<!-- END JAVASCRIPTS -->

<!-- END BODY -->
</body>
</html>
\ No newline at end of file

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 fa98196..07b562d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -230,6 +230,42 @@
 
     }
 
+    public boolean editMarkerAndPhoto(MarkerDto markerDto, Long companyId,String[] fileNames, String[] fileBuffers){
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String strDirPath = request.getSession().getServletContext().getRealPath("");
+        FileOutputStream fos = null;
+        String month = TimeFormat.format(Calendar.getInstance().getTime(), "yyyyMM");
+        String webPath = "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String toDir = strDirPath + "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String filePaths = "";
+        try {
+            for (int i = 0; i < fileBuffers.length; i++) {
+                if (fileBuffers[i] != null && fileNames[i] != null) {
+//                    filePaths += toDir+fileNames[i]+",";
+                    filePaths += webPath + fileNames[i] + ",";
+                    byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);   //对android传过来的图片字符串进行解码
+                    File destDir = new File(toDir);
+                    if (!destDir.exists())
+                        destDir.mkdirs();
+                    File imageFile = new File(destDir, fileNames[i]);
+                    fos = new FileOutputStream(imageFile);   //保存图片
+                    fos.write(buffer);
+                    fos.flush();
+                    fos.close();
+                }
+            }
+            if (filePaths.endsWith(",")) {
+                filePaths = filePaths.substring(0, filePaths.length() - 1);
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        markerDto.setPhotos(filePaths);
+        List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+        markerDtos.add(markerDto);
+        batchSave(markerDtos,companyId);
+        return true;
+    }
     /**
      * 新增标识器 8-9
      *
@@ -272,6 +308,7 @@
             marker.setPipeMaterial(markerDto.getPipeMaterial());
             marker.setArea(markerDto.getArea());
             marker.setLine(markerDto.getLine());
+            marker.setPhotos(markerDto.getPhotos());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             try {
                 if (StringUtils.isNotBlank(markerDto.getCreateTime())) {
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 c6cd733..ddf89de 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -140,6 +140,55 @@
         return map;
     }
 
+    @RequestMapping("marker-info-photo")
+    @ResponseBody
+    public Map<String, Object> saveInfoAndPhoto(@RequestParam(value = "fileBuffer1", required = false) MultipartFile fileBuffer1,
+                                                @RequestParam(value = "fileBuffer2", required = false) MultipartFile fileBuffer2,
+                                                @RequestParam(value = "fileBuffer3", required = false) MultipartFile fileBuffer3,
+                                                @RequestParam(value = "jsonMarker", required = true) String jsonMarker,
+                                                HttpSession session){
+        Map<String, Object> map = new HashMap<String, Object>();
+        Gson gson = new Gson();
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        try {
+            MarkerDto marker = gson.fromJson(jsonMarker, MarkerDto.class);
+            if (marker == null) {
+                map.put("success", false);
+                map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
+                return map;
+            }
+            String[] fileNames = new String[3];
+            String[] fileBuffers = new String[3];
+            if (fileBuffer1 != null) {
+                fileNames[0] = marker.getMarkerId() + "_" + fileBuffer1.getOriginalFilename();
+                byte[] fis = fileBuffer1.getBytes();
+                fileBuffers[0] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer2 != null) {
+                fileNames[1] = marker.getMarkerId() + "_" + fileBuffer2.getOriginalFilename();
+                byte[] fis = fileBuffer2.getBytes();
+                fileBuffers[1] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer3 != null) {
+                fileNames[2] = marker.getMarkerId() + "_" + fileBuffer3.getOriginalFilename();
+                byte[] fis = fileBuffer3.getBytes();
+                fileBuffers[2] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, Base64.BASE64DEFAULTLENGTH));
+            }
+            markerManager.editMarkerAndPhoto(marker,companyId,fileNames,fileBuffers);
+            map.put("success", true);
+            map.put("message", "编辑成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("success", false);
+            map.put("message", "编辑失败");
+            return map;
+        }
+        map.put("success", true);
+        map.put("message", "编辑成功");
+        return map;
+    }
+
     /**
      * 保存标识器属性及图片信息
      * @param fileBuffer1
diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp
index 0aee35b..18634f5 100644
--- a/src/main/webapp/content/marker/marker-info-edit-new.jsp
+++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>

<%@include file="/taglibs.jsp" %>

<%pageContext.setAttribute("currentMenu", "marker1");%>

<!DOCTYPE html>

<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->

<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->

<!--[if IE 10]> <html lang="en" class="ie10"> <![endif]-->

<!--[if IE 11]> <html lang="en" class="ie11"> <![endif]-->

<!--[if !IE]><!-->
<html lang="en"> <!--<![endif]-->

<head>

    <meta charset="utf-8"/>

    <title>地下管线电子标识系统</title>

    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>

    <meta content="" name="description"/>

    <meta content="" name="author"/>

    <!-- BEGIN GLOBAL MANDATORY STYLES -->

    <link href="${ctx}/s/media/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-metro.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-responsive.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/blue.css" rel="stylesheet" type="text/css" id="style_color"/>

    <link href="${ctx}/s/media/css/uniform.default.css" rel="stylesheet" type="text/css"/>

    <!-- END GLOBAL MANDATORY STYLES -->

    <!-- BEGIN PAGE LEVEL STYLES -->

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.gritter.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.tagsinput.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/clockface.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-wysihtml5.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/timepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/colorpicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-toggle-buttons.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/daterangepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datetimepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/multi-select-metro.css"/>

    <link href="${ctx}/s/media/css/bootstrap-modal.css" rel="stylesheet" type="text/css"/>

    <!-- END PAGE LEVEL STYLES -->

    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">

<input type="hidden" id="context" value="${ctx}">

<!-- BEGIN HEADER -->

<%@include file="/common/layout/header.jsp" %>

<!-- END HEADER -->

<!-- BEGIN CONTAINER -->

<div class="page-container">

<!-- BEGIN SIDEBAR -->

<%@include file="/common/layout/menu_new.jsp" %>

<!-- END SIDEBAR -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->
        <div class="container-fluid">

            <div class="clearfix"></div>

            <!--BEGIN SECOND MENU-->
            <%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
            <!--BEGIN SECOND MENU-->

            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN PAGE CONTENT-->
            <div class="row-fluid" style="position: relative">

                <div class="span8" style="position: relative" >

                    <div class="portlet box blue">

                        <div class="portlet-title">
                            <div class="caption"><i class="icon-edit"></i>标识器管理信息编辑</div>
                        </div>

                        <div class="portlet-body form">
                            <div class="portlet-body form">
                                <form action="" class="form-horizontal" id="submit_form">
                                    <div class="alert alert-error hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        操作失败：
                                        <span id="errorMessage"></span>
                                    </div>

                                    <div class="alert alert-success hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        添加成功
                                    </div>

                                    <!--用户名称与密码 -->
                                    <div class="control-group">
                                        <label class="control-label">标识对象类别</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识对象类别" name="recordType" data-with-diselect="1" class="m-wrap span6" id="selectObjectType">
                                                <option value="1"  ${ 1==model.recordType ? 'selected' : '' } >管线</option>
                                                <option value="2"  ${ 2==model.recordType ? 'selected' : '' }>管线附属物</option>
                                                <option value="3"  ${ 3==model.recordType ? 'selected' : '' }>管线特征点</option>
                                                <option value="4"  ${ 4==model.recordType ? 'selected' : '' }>交叉穿越点</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label"  id="pipeTypeLabel">管线种类</label>
                                        <div class="controls">
                                            <input type="text" name="markerObjectType" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group"  hidden="hidden">
                                        <div class="controls">
                                            <input type="text" name="latitude" id="latitude" class="m-wrap  span6"
                                                   value="${model.latitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group" hidden="hidden" >
                                        <div class="controls">
                                            <input type="text" name="longitude" id="longitude" class="m-wrap  span6"
                                                   value="${model.longitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeDiameterLabel">管线直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeDiameter" id="pipeDiameter" value="${model.pipeDiameter}" />毫米
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeMaterialLabel">管线材质</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeMaterial" id="pipeMaterial" value="${model.pipeMaterial}"/>
                                        </div>
                                    </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管种类</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="belowType" id="belowPipeType" value="${model.belowType}"/>
                                        </div>
                                    </div>


                                        <div class="control-group below">
                                            <label class="control-label">下层管埋深</label>

                                            <div class="controls">
                                                <input type="text" class="m-wrap span6"  name="belowDepth" id="belowPipeDepth" value="${model.belowDepth}"/>
                                            </div>
                                        </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowDiameter" id="belowPipeDiameter"  value="${model.belowDiameter}"/>
                                        </div>
                                </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管材料</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowMaterial" id="belowPipeMaterial" value="${model.belowMaterial}"/>
                                        </div>
                                    </div>

                                   <div class="control-group">
                                        <label class="control-label" id="pipeDepthLabel">管线埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="depth" id="pipeDepth" value="${model.depth}"/>
                                        </div>
                                    </div>

                                    <div class="control-group pipeOnly">
                                        <label class="control-label">埋设方式</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="layStyle" id="layStyle" value="${model.layStyle}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属区域</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="area" id="area" value="${model.area}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属线路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="line" id="line" value="${model.line}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属道路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="road" id="road" value="${model.road}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">建设年代</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="constructTime" id="constructTime"  value="${model.constructTime}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">权属单位</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="ownerComp" id="ownerComp"  value="${model.ownerComp}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">标示对象ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerObjectId" id="markerObjectId" value="${model.markerObjectId}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerId" id="markerId" value="${model.markerId}" />
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标示器类型</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerType" id="markerType"  value="${model.markerType}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerDepth" id="markerDepth" value="${model.markerDepth}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">安装部门</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="creator" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识点颜色</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识点颜色类型" name="colorType" data-with-diselect="1" class="m-wrap span6" id="colorType">
                                                <option value="0"  ${ 0==model.colorType ? 'selected' : '' }>蓝色（默认）</option>
                                                <option value="1"  ${ 1==model.colorType ? 'selected' : '' }>橙色</option>
                                                <option value="2"  ${ 2==model.colorType ? 'selected' : '' }>红色</option>
                                                <option value="3"  ${ 3==model.colorType ? 'selected' : '' }>黑色</option>
                                                <option value="4"  ${ 4==model.colorType ? 'selected' : '' }>粉紫色</option>
                                                <option value="5"  ${ 5==model.colorType ? 'selected' : '' }>黄色</option>
                                                <option value="6"  ${ 6==model.colorType ? 'selected' : '' }>绿色</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">备注</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="memo" id="memo" value="${model.memo}"/>
                                        </div>
                                    </div>


                                    <div class="control-group hidden">
                                        <label class="control-label">主键ID</label>
                                        <div class="controls">
                                            <input type="text" name="id" value="${model.id}" id="id"/>
                                            <span class="help-inline"></span>
                                        </div>
                                    </div>

                                    <div class="form-actions">
                                        <button type="submit" class="btn blue">提交</button>
                                        <button type="button" class="btn" id="cancelBtn">取消</button>
                                    </div>

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

        <div class="clearfix"></div>

    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

<%@include file="/common/layout/footer.jsp" %>

<!-- END FOOTER -->

<!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->

<!-- BEGIN CORE PLUGINS -->

<script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>

<!-- IMPORTANT! Load jquery-ui-1.10.1.custom.min.js before bootstrap.min.js to fix bootstrap tooltip conflict with jquery ui tooltip -->

<script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>

<!--[if lt IE 9]>

<script src="${ctx}/s/media/js/excanvas.min.js"></script>

<script src="${ctx}/s/media/js/respond.min.js"></script>

<![endif]-->

<script src="${ctx}/s/media/js/jquery.slimscroll.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.blockui.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.cookie.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.uniform.min.js" type="text/javascript"></script>

<!-- END CORE PLUGINS -->

<!-- BEGIN PAGE LEVEL PLUGINS -->

<%--<script type="text/javascript" src="${ctx}/s/media/js/ckeditor.js"></script>--%>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/wysihtml5-0.3.0.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-wysihtml5.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.tagsinput.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.toggle.buttons.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datetimepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/clockface.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/date.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/daterangepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-colorpicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-timepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.inputmask.bundle.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.input-ip-address-control-1.0.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.multi-select.js"></script>

<script src="${ctx}/s/media/js/bootstrap-modal.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap-modalmanager.js" type="text/javascript"></script>


<script type="text/javascript" src="${ctx}/s/media/js/jquery.validate.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/additional-methods.min.js"></script>

<!-- END PAGE LEVEL PLUGINS -->

<!-- BEGIN PAGE LEVEL SCRIPTS -->

<script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>

<script src="${ctx}/s/app/marker/marker-info-edit.js"></script>

<!-- END PAGE LEVEL SCRIPTS -->

<script>

    jQuery(document).ready(function () {

        App.init();

        MarkerInfoEdit.initForms();

    });

</script>

<!-- END JAVASCRIPTS -->

<!-- END BODY -->
</body>
</html>
\ No newline at end of file
+<%@page contentType="text/html;charset=UTF-8" %>

<%@include file="/taglibs.jsp" %>

<%pageContext.setAttribute("currentMenu", "marker1");%>

<!DOCTYPE html>

<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->

<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->

<!--[if IE 10]> <html lang="en" class="ie10"> <![endif]-->

<!--[if IE 11]> <html lang="en" class="ie11"> <![endif]-->

<!--[if !IE]><!-->
<html lang="en"> <!--<![endif]-->

<head>

    <meta charset="utf-8"/>

    <title>地下管线电子标识系统</title>

    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>

    <meta content="" name="description"/>

    <meta content="" name="author"/>

    <!-- BEGIN GLOBAL MANDATORY STYLES -->

    <link href="${ctx}/s/media/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-metro.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-responsive.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/blue.css" rel="stylesheet" type="text/css" id="style_color"/>

    <link href="${ctx}/s/media/css/uniform.default.css" rel="stylesheet" type="text/css"/>

    <!-- END GLOBAL MANDATORY STYLES -->

    <!-- BEGIN PAGE LEVEL STYLES -->

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.gritter.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.tagsinput.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/clockface.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-wysihtml5.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/timepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/colorpicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-toggle-buttons.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/daterangepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datetimepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/multi-select-metro.css"/>

    <link href="${ctx}/s/media/css/bootstrap-modal.css" rel="stylesheet" type="text/css"/>

    <!-- END PAGE LEVEL STYLES -->

    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

    <style>
        .uploadImg {
            width: 300px;
        }
    </style>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">

<input type="hidden" id="context" value="${ctx}">

<!-- BEGIN HEADER -->

<%@include file="/common/layout/header.jsp" %>

<!-- END HEADER -->

<!-- BEGIN CONTAINER -->

<div class="page-container">

<!-- BEGIN SIDEBAR -->

<%@include file="/common/layout/menu_new.jsp" %>

<!-- END SIDEBAR -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->
        <div class="container-fluid">

            <div class="clearfix"></div>

            <!--BEGIN SECOND MENU-->
            <%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
            <!--BEGIN SECOND MENU-->

            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN PAGE CONTENT-->
            <div class="row-fluid" style="position: relative">

                <div class="span8" style="position: relative" >

                    <div class="portlet box blue">



                        <div class="portlet-title">
                            <div class="caption"><i class="icon-edit"></i>标识器管理信息编辑</div>
                        </div>

                        <div class="portlet-body form">
                            <div class="portlet-body form">
                                <form action="" class="form-horizontal" id="submit_form" enctype="multipart/form-data">
                                    <div class="alert alert-error hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        操作失败：
                                        <span id="errorMessage"></span>
                                    </div>

                                    <div class="alert alert-success hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        添加成功
                                    </div>

                                    <!--用户名称与密码 -->
                                    <div class="control-group">
                                        <label class="control-label">标识对象类别</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识对象类别" name="recordType" data-with-diselect="1" class="m-wrap span6" id="selectObjectType">
                                                <option value="1"  ${ 1==model.recordType ? 'selected' : '' } >管线</option>
                                                <option value="2"  ${ 2==model.recordType ? 'selected' : '' }>管线附属物</option>
                                                <option value="3"  ${ 3==model.recordType ? 'selected' : '' }>管线特征点</option>
                                                <option value="4"  ${ 4==model.recordType ? 'selected' : '' }>交叉穿越点</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label"  id="pipeTypeLabel">管线种类</label>
                                        <div class="controls">
                                            <input type="text" name="markerObjectType" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group"  hidden="hidden">
                                        <div class="controls">
                                            <input type="text" name="latitude" id="latitude" class="m-wrap  span6"
                                                   value="${model.latitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group" hidden="hidden" >
                                        <div class="controls">
                                            <input type="text" name="longitude" id="longitude" class="m-wrap  span6"
                                                   value="${model.longitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeDiameterLabel">管线直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeDiameter" id="pipeDiameter" value="${model.pipeDiameter}" />毫米
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeMaterialLabel">管线材质</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeMaterial" id="pipeMaterial" value="${model.pipeMaterial}"/>
                                        </div>
                                    </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管种类</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="belowType" id="belowPipeType" value="${model.belowType}"/>
                                        </div>
                                    </div>


                                        <div class="control-group below">
                                            <label class="control-label">下层管埋深</label>

                                            <div class="controls">
                                                <input type="text" class="m-wrap span6"  name="belowDepth" id="belowPipeDepth" value="${model.belowDepth}"/>
                                            </div>
                                        </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowDiameter" id="belowPipeDiameter"  value="${model.belowDiameter}"/>
                                        </div>
                                </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管材料</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowMaterial" id="belowPipeMaterial" value="${model.belowMaterial}"/>
                                        </div>
                                    </div>

                                   <div class="control-group">
                                        <label class="control-label" id="pipeDepthLabel">管线埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="depth" id="pipeDepth" value="${model.depth}"/>
                                        </div>
                                    </div>

                                    <div class="control-group pipeOnly">
                                        <label class="control-label">埋设方式</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="layStyle" id="layStyle" value="${model.layStyle}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属区域</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="area" id="area" value="${model.area}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属线路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="line" id="line" value="${model.line}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属道路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="road" id="road" value="${model.road}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">建设年代</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="constructTime" id="constructTime"  value="${model.constructTime}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">权属单位</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="ownerComp" id="ownerComp"  value="${model.ownerComp}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">标示对象ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerObjectId" id="markerObjectId" value="${model.markerObjectId}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerId" id="markerId" value="${model.markerId}" />
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标示器类型</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerType" id="markerType"  value="${model.markerType}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerDepth" id="markerDepth" value="${model.markerDepth}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">安装部门</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="creator" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识点颜色</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识点颜色类型" name="colorType" data-with-diselect="1" class="m-wrap span6" id="colorType">
                                                <option value="0"  ${ 0==model.colorType ? 'selected' : '' }>蓝色（默认）</option>
                                                <option value="1"  ${ 1==model.colorType ? 'selected' : '' }>橙色</option>
                                                <option value="2"  ${ 2==model.colorType ? 'selected' : '' }>红色</option>
                                                <option value="3"  ${ 3==model.colorType ? 'selected' : '' }>黑色</option>
                                                <option value="4"  ${ 4==model.colorType ? 'selected' : '' }>粉紫色</option>
                                                <option value="5"  ${ 5==model.colorType ? 'selected' : '' }>黄色</option>
                                                <option value="6"  ${ 6==model.colorType ? 'selected' : '' }>绿色</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">备注</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="memo" id="memo" value="${model.memo}"/>
                                        </div>
                                    </div>

                                    <input type="hidden" id="photo" value="${model.photos}">

                                    <div class="control-group">
                                        <label class="control-label">图片1</label>
                                        <div class="controls">
                                            <img class="uploadImg" id="img1" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file1" type="file" class="uploadBtn" name="file1">
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">图片2</label>
                                        <div class="controls">
                                            <img class="uploadImg" id="img2" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file2" type="file" class="uploadBtn" name="file2">
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">图片3</label>
                                        <div class="controls">
                                            <img id="img3" class="uploadImg" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file3" type="file" class="uploadBtn" name="file3">
                                        </div>
                                    </div>


                                    <div class="control-group hidden">
                                        <label class="control-label">主键ID</label>
                                        <div class="controls">
                                            <input type="text" name="id" value="${model.id}" id="id"/>
                                            <span class="help-inline"></span>
                                        </div>
                                    </div>

                                    <div class="form-actions">
                                        <button type="submit" class="btn blue">提交</button>
                                        <button type="button" class="btn" id="cancelBtn">取消</button>
                                    </div>

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

        <div class="clearfix"></div>

    </div>

    <!-- 图片放大模态框 -->
    <div id="ShowImage_Form" class="modal hide modal-lg">
        <div class="modal-header" style="height:10px">
            <button data-dismiss="modal" class="close" type="button"></button>
        </div>
        <div class="modal-body">
            <div id="img_show">
            </div>
        </div>
    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

<%@include file="/common/layout/footer.jsp" %>

<!-- END FOOTER -->

<!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->

<!-- BEGIN CORE PLUGINS -->

<script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>

<!-- IMPORTANT! Load jquery-ui-1.10.1.custom.min.js before bootstrap.min.js to fix bootstrap tooltip conflict with jquery ui tooltip -->

<script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>

<!--[if lt IE 9]>

<script src="${ctx}/s/media/js/excanvas.min.js"></script>

<script src="${ctx}/s/media/js/respond.min.js"></script>

<![endif]-->

<script src="${ctx}/s/media/js/jquery.slimscroll.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.blockui.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.cookie.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.uniform.min.js" type="text/javascript"></script>

<!-- END CORE PLUGINS -->

<!-- BEGIN PAGE LEVEL PLUGINS -->

<%--<script type="text/javascript" src="${ctx}/s/media/js/ckeditor.js"></script>--%>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/wysihtml5-0.3.0.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-wysihtml5.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.tagsinput.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.toggle.buttons.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datetimepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/clockface.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/date.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/daterangepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-colorpicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-timepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.inputmask.bundle.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.input-ip-address-control-1.0.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.multi-select.js"></script>

<script src="${ctx}/s/media/js/bootstrap-modal.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap-modalmanager.js" type="text/javascript"></script>


<script type="text/javascript" src="${ctx}/s/media/js/jquery.validate.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/additional-methods.min.js"></script>

<!-- END PAGE LEVEL PLUGINS -->

<!-- BEGIN PAGE LEVEL SCRIPTS -->

<script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>

<script src="${ctx}/s/app/marker/marker-info-edit.js"></script>

<!-- END PAGE LEVEL SCRIPTS -->

<script>

    jQuery(document).ready(function () {

        App.init();

        MarkerInfoEdit.initForms();

    });

</script>

<!-- END JAVASCRIPTS -->

<!-- END BODY -->
</body>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/s/app/ems/EMSBean.js b/src/main/webapp/s/app/ems/EMSBean.js
index a3b1dca..f3473dc 100644
--- a/src/main/webapp/s/app/ems/EMSBean.js
+++ b/src/main/webapp/s/app/ems/EMSBean.js
@@ -1,6 +1,6 @@
 EMSBean = function (markerObjectType,pipeMaterial,pipeDiameter, layStyle, depth, belowType, belowDepth, belowDiameter, belowMaterial, road,
                     constructTime, ownerComp, markerObjectId, markerId, markerType, markerDepth, creator, createTime, memo, lat, long,
-                    recordType,id,line,area, colorType) {
+                    recordType,id,line,area, colorType,photos) {
 
     this.markerObjectType = markerObjectType;
     this.pipeMaterial = pipeMaterial;
@@ -28,4 +28,5 @@
     this.line=line;
     this.area =area;
     this.colorType = colorType;
+    this.photos = photos;
 };

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 fa98196..07b562d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -230,6 +230,42 @@
 
     }
 
+    public boolean editMarkerAndPhoto(MarkerDto markerDto, Long companyId,String[] fileNames, String[] fileBuffers){
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String strDirPath = request.getSession().getServletContext().getRealPath("");
+        FileOutputStream fos = null;
+        String month = TimeFormat.format(Calendar.getInstance().getTime(), "yyyyMM");
+        String webPath = "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String toDir = strDirPath + "/images/markers/" + month + "/";   //本地存储路径，每个月的图片单独保存
+        String filePaths = "";
+        try {
+            for (int i = 0; i < fileBuffers.length; i++) {
+                if (fileBuffers[i] != null && fileNames[i] != null) {
+//                    filePaths += toDir+fileNames[i]+",";
+                    filePaths += webPath + fileNames[i] + ",";
+                    byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);   //对android传过来的图片字符串进行解码
+                    File destDir = new File(toDir);
+                    if (!destDir.exists())
+                        destDir.mkdirs();
+                    File imageFile = new File(destDir, fileNames[i]);
+                    fos = new FileOutputStream(imageFile);   //保存图片
+                    fos.write(buffer);
+                    fos.flush();
+                    fos.close();
+                }
+            }
+            if (filePaths.endsWith(",")) {
+                filePaths = filePaths.substring(0, filePaths.length() - 1);
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        markerDto.setPhotos(filePaths);
+        List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+        markerDtos.add(markerDto);
+        batchSave(markerDtos,companyId);
+        return true;
+    }
     /**
      * 新增标识器 8-9
      *
@@ -272,6 +308,7 @@
             marker.setPipeMaterial(markerDto.getPipeMaterial());
             marker.setArea(markerDto.getArea());
             marker.setLine(markerDto.getLine());
+            marker.setPhotos(markerDto.getPhotos());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             try {
                 if (StringUtils.isNotBlank(markerDto.getCreateTime())) {
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 c6cd733..ddf89de 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -140,6 +140,55 @@
         return map;
     }
 
+    @RequestMapping("marker-info-photo")
+    @ResponseBody
+    public Map<String, Object> saveInfoAndPhoto(@RequestParam(value = "fileBuffer1", required = false) MultipartFile fileBuffer1,
+                                                @RequestParam(value = "fileBuffer2", required = false) MultipartFile fileBuffer2,
+                                                @RequestParam(value = "fileBuffer3", required = false) MultipartFile fileBuffer3,
+                                                @RequestParam(value = "jsonMarker", required = true) String jsonMarker,
+                                                HttpSession session){
+        Map<String, Object> map = new HashMap<String, Object>();
+        Gson gson = new Gson();
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        try {
+            MarkerDto marker = gson.fromJson(jsonMarker, MarkerDto.class);
+            if (marker == null) {
+                map.put("success", false);
+                map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
+                return map;
+            }
+            String[] fileNames = new String[3];
+            String[] fileBuffers = new String[3];
+            if (fileBuffer1 != null) {
+                fileNames[0] = marker.getMarkerId() + "_" + fileBuffer1.getOriginalFilename();
+                byte[] fis = fileBuffer1.getBytes();
+                fileBuffers[0] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer2 != null) {
+                fileNames[1] = marker.getMarkerId() + "_" + fileBuffer2.getOriginalFilename();
+                byte[] fis = fileBuffer2.getBytes();
+                fileBuffers[1] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, com.sun.org.apache.xml.internal.security.utils.Base64.BASE64DEFAULTLENGTH));
+            }
+            if (fileBuffer3 != null) {
+                fileNames[2] = marker.getMarkerId() + "_" + fileBuffer3.getOriginalFilename();
+                byte[] fis = fileBuffer3.getBytes();
+                fileBuffers[2] = new String(com.sun.org.apache.xml.internal.security.utils.Base64.encode(fis, Base64.BASE64DEFAULTLENGTH));
+            }
+            markerManager.editMarkerAndPhoto(marker,companyId,fileNames,fileBuffers);
+            map.put("success", true);
+            map.put("message", "编辑成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("success", false);
+            map.put("message", "编辑失败");
+            return map;
+        }
+        map.put("success", true);
+        map.put("message", "编辑成功");
+        return map;
+    }
+
     /**
      * 保存标识器属性及图片信息
      * @param fileBuffer1
diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp
index 0aee35b..18634f5 100644
--- a/src/main/webapp/content/marker/marker-info-edit-new.jsp
+++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>

<%@include file="/taglibs.jsp" %>

<%pageContext.setAttribute("currentMenu", "marker1");%>

<!DOCTYPE html>

<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->

<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->

<!--[if IE 10]> <html lang="en" class="ie10"> <![endif]-->

<!--[if IE 11]> <html lang="en" class="ie11"> <![endif]-->

<!--[if !IE]><!-->
<html lang="en"> <!--<![endif]-->

<head>

    <meta charset="utf-8"/>

    <title>地下管线电子标识系统</title>

    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>

    <meta content="" name="description"/>

    <meta content="" name="author"/>

    <!-- BEGIN GLOBAL MANDATORY STYLES -->

    <link href="${ctx}/s/media/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-metro.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-responsive.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/blue.css" rel="stylesheet" type="text/css" id="style_color"/>

    <link href="${ctx}/s/media/css/uniform.default.css" rel="stylesheet" type="text/css"/>

    <!-- END GLOBAL MANDATORY STYLES -->

    <!-- BEGIN PAGE LEVEL STYLES -->

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.gritter.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.tagsinput.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/clockface.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-wysihtml5.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/timepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/colorpicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-toggle-buttons.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/daterangepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datetimepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/multi-select-metro.css"/>

    <link href="${ctx}/s/media/css/bootstrap-modal.css" rel="stylesheet" type="text/css"/>

    <!-- END PAGE LEVEL STYLES -->

    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">

<input type="hidden" id="context" value="${ctx}">

<!-- BEGIN HEADER -->

<%@include file="/common/layout/header.jsp" %>

<!-- END HEADER -->

<!-- BEGIN CONTAINER -->

<div class="page-container">

<!-- BEGIN SIDEBAR -->

<%@include file="/common/layout/menu_new.jsp" %>

<!-- END SIDEBAR -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->
        <div class="container-fluid">

            <div class="clearfix"></div>

            <!--BEGIN SECOND MENU-->
            <%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
            <!--BEGIN SECOND MENU-->

            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN PAGE CONTENT-->
            <div class="row-fluid" style="position: relative">

                <div class="span8" style="position: relative" >

                    <div class="portlet box blue">

                        <div class="portlet-title">
                            <div class="caption"><i class="icon-edit"></i>标识器管理信息编辑</div>
                        </div>

                        <div class="portlet-body form">
                            <div class="portlet-body form">
                                <form action="" class="form-horizontal" id="submit_form">
                                    <div class="alert alert-error hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        操作失败：
                                        <span id="errorMessage"></span>
                                    </div>

                                    <div class="alert alert-success hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        添加成功
                                    </div>

                                    <!--用户名称与密码 -->
                                    <div class="control-group">
                                        <label class="control-label">标识对象类别</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识对象类别" name="recordType" data-with-diselect="1" class="m-wrap span6" id="selectObjectType">
                                                <option value="1"  ${ 1==model.recordType ? 'selected' : '' } >管线</option>
                                                <option value="2"  ${ 2==model.recordType ? 'selected' : '' }>管线附属物</option>
                                                <option value="3"  ${ 3==model.recordType ? 'selected' : '' }>管线特征点</option>
                                                <option value="4"  ${ 4==model.recordType ? 'selected' : '' }>交叉穿越点</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label"  id="pipeTypeLabel">管线种类</label>
                                        <div class="controls">
                                            <input type="text" name="markerObjectType" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group"  hidden="hidden">
                                        <div class="controls">
                                            <input type="text" name="latitude" id="latitude" class="m-wrap  span6"
                                                   value="${model.latitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group" hidden="hidden" >
                                        <div class="controls">
                                            <input type="text" name="longitude" id="longitude" class="m-wrap  span6"
                                                   value="${model.longitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeDiameterLabel">管线直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeDiameter" id="pipeDiameter" value="${model.pipeDiameter}" />毫米
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeMaterialLabel">管线材质</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeMaterial" id="pipeMaterial" value="${model.pipeMaterial}"/>
                                        </div>
                                    </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管种类</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="belowType" id="belowPipeType" value="${model.belowType}"/>
                                        </div>
                                    </div>


                                        <div class="control-group below">
                                            <label class="control-label">下层管埋深</label>

                                            <div class="controls">
                                                <input type="text" class="m-wrap span6"  name="belowDepth" id="belowPipeDepth" value="${model.belowDepth}"/>
                                            </div>
                                        </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowDiameter" id="belowPipeDiameter"  value="${model.belowDiameter}"/>
                                        </div>
                                </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管材料</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowMaterial" id="belowPipeMaterial" value="${model.belowMaterial}"/>
                                        </div>
                                    </div>

                                   <div class="control-group">
                                        <label class="control-label" id="pipeDepthLabel">管线埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="depth" id="pipeDepth" value="${model.depth}"/>
                                        </div>
                                    </div>

                                    <div class="control-group pipeOnly">
                                        <label class="control-label">埋设方式</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="layStyle" id="layStyle" value="${model.layStyle}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属区域</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="area" id="area" value="${model.area}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属线路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="line" id="line" value="${model.line}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属道路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="road" id="road" value="${model.road}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">建设年代</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="constructTime" id="constructTime"  value="${model.constructTime}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">权属单位</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="ownerComp" id="ownerComp"  value="${model.ownerComp}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">标示对象ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerObjectId" id="markerObjectId" value="${model.markerObjectId}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerId" id="markerId" value="${model.markerId}" />
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标示器类型</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerType" id="markerType"  value="${model.markerType}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerDepth" id="markerDepth" value="${model.markerDepth}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">安装部门</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="creator" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识点颜色</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识点颜色类型" name="colorType" data-with-diselect="1" class="m-wrap span6" id="colorType">
                                                <option value="0"  ${ 0==model.colorType ? 'selected' : '' }>蓝色（默认）</option>
                                                <option value="1"  ${ 1==model.colorType ? 'selected' : '' }>橙色</option>
                                                <option value="2"  ${ 2==model.colorType ? 'selected' : '' }>红色</option>
                                                <option value="3"  ${ 3==model.colorType ? 'selected' : '' }>黑色</option>
                                                <option value="4"  ${ 4==model.colorType ? 'selected' : '' }>粉紫色</option>
                                                <option value="5"  ${ 5==model.colorType ? 'selected' : '' }>黄色</option>
                                                <option value="6"  ${ 6==model.colorType ? 'selected' : '' }>绿色</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">备注</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="memo" id="memo" value="${model.memo}"/>
                                        </div>
                                    </div>


                                    <div class="control-group hidden">
                                        <label class="control-label">主键ID</label>
                                        <div class="controls">
                                            <input type="text" name="id" value="${model.id}" id="id"/>
                                            <span class="help-inline"></span>
                                        </div>
                                    </div>

                                    <div class="form-actions">
                                        <button type="submit" class="btn blue">提交</button>
                                        <button type="button" class="btn" id="cancelBtn">取消</button>
                                    </div>

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

        <div class="clearfix"></div>

    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

<%@include file="/common/layout/footer.jsp" %>

<!-- END FOOTER -->

<!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->

<!-- BEGIN CORE PLUGINS -->

<script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>

<!-- IMPORTANT! Load jquery-ui-1.10.1.custom.min.js before bootstrap.min.js to fix bootstrap tooltip conflict with jquery ui tooltip -->

<script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>

<!--[if lt IE 9]>

<script src="${ctx}/s/media/js/excanvas.min.js"></script>

<script src="${ctx}/s/media/js/respond.min.js"></script>

<![endif]-->

<script src="${ctx}/s/media/js/jquery.slimscroll.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.blockui.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.cookie.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.uniform.min.js" type="text/javascript"></script>

<!-- END CORE PLUGINS -->

<!-- BEGIN PAGE LEVEL PLUGINS -->

<%--<script type="text/javascript" src="${ctx}/s/media/js/ckeditor.js"></script>--%>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/wysihtml5-0.3.0.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-wysihtml5.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.tagsinput.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.toggle.buttons.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datetimepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/clockface.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/date.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/daterangepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-colorpicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-timepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.inputmask.bundle.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.input-ip-address-control-1.0.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.multi-select.js"></script>

<script src="${ctx}/s/media/js/bootstrap-modal.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap-modalmanager.js" type="text/javascript"></script>


<script type="text/javascript" src="${ctx}/s/media/js/jquery.validate.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/additional-methods.min.js"></script>

<!-- END PAGE LEVEL PLUGINS -->

<!-- BEGIN PAGE LEVEL SCRIPTS -->

<script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>

<script src="${ctx}/s/app/marker/marker-info-edit.js"></script>

<!-- END PAGE LEVEL SCRIPTS -->

<script>

    jQuery(document).ready(function () {

        App.init();

        MarkerInfoEdit.initForms();

    });

</script>

<!-- END JAVASCRIPTS -->

<!-- END BODY -->
</body>
</html>
\ No newline at end of file
+<%@page contentType="text/html;charset=UTF-8" %>

<%@include file="/taglibs.jsp" %>

<%pageContext.setAttribute("currentMenu", "marker1");%>

<!DOCTYPE html>

<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->

<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->

<!--[if IE 10]> <html lang="en" class="ie10"> <![endif]-->

<!--[if IE 11]> <html lang="en" class="ie11"> <![endif]-->

<!--[if !IE]><!-->
<html lang="en"> <!--<![endif]-->

<head>

    <meta charset="utf-8"/>

    <title>地下管线电子标识系统</title>

    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>

    <meta content="" name="description"/>

    <meta content="" name="author"/>

    <!-- BEGIN GLOBAL MANDATORY STYLES -->

    <link href="${ctx}/s/media/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-metro.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/style-responsive.css" rel="stylesheet" type="text/css"/>

    <link href="${ctx}/s/media/css/blue.css" rel="stylesheet" type="text/css" id="style_color"/>

    <link href="${ctx}/s/media/css/uniform.default.css" rel="stylesheet" type="text/css"/>

    <!-- END GLOBAL MANDATORY STYLES -->

    <!-- BEGIN PAGE LEVEL STYLES -->

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.gritter.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/jquery.tagsinput.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/clockface.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-wysihtml5.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/timepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/colorpicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-toggle-buttons.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/daterangepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datetimepicker.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/multi-select-metro.css"/>

    <link href="${ctx}/s/media/css/bootstrap-modal.css" rel="stylesheet" type="text/css"/>

    <!-- END PAGE LEVEL STYLES -->

    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

    <style>
        .uploadImg {
            width: 300px;
        }
    </style>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">

<input type="hidden" id="context" value="${ctx}">

<!-- BEGIN HEADER -->

<%@include file="/common/layout/header.jsp" %>

<!-- END HEADER -->

<!-- BEGIN CONTAINER -->

<div class="page-container">

<!-- BEGIN SIDEBAR -->

<%@include file="/common/layout/menu_new.jsp" %>

<!-- END SIDEBAR -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->
        <div class="container-fluid">

            <div class="clearfix"></div>

            <!--BEGIN SECOND MENU-->
            <%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
            <!--BEGIN SECOND MENU-->

            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN PAGE CONTENT-->
            <div class="row-fluid" style="position: relative">

                <div class="span8" style="position: relative" >

                    <div class="portlet box blue">



                        <div class="portlet-title">
                            <div class="caption"><i class="icon-edit"></i>标识器管理信息编辑</div>
                        </div>

                        <div class="portlet-body form">
                            <div class="portlet-body form">
                                <form action="" class="form-horizontal" id="submit_form" enctype="multipart/form-data">
                                    <div class="alert alert-error hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        操作失败：
                                        <span id="errorMessage"></span>
                                    </div>

                                    <div class="alert alert-success hide">
                                        <button class="close" data-dismiss="alert"></button>
                                        添加成功
                                    </div>

                                    <!--用户名称与密码 -->
                                    <div class="control-group">
                                        <label class="control-label">标识对象类别</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识对象类别" name="recordType" data-with-diselect="1" class="m-wrap span6" id="selectObjectType">
                                                <option value="1"  ${ 1==model.recordType ? 'selected' : '' } >管线</option>
                                                <option value="2"  ${ 2==model.recordType ? 'selected' : '' }>管线附属物</option>
                                                <option value="3"  ${ 3==model.recordType ? 'selected' : '' }>管线特征点</option>
                                                <option value="4"  ${ 4==model.recordType ? 'selected' : '' }>交叉穿越点</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label"  id="pipeTypeLabel">管线种类</label>
                                        <div class="controls">
                                            <input type="text" name="markerObjectType" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group"  hidden="hidden">
                                        <div class="controls">
                                            <input type="text" name="latitude" id="latitude" class="m-wrap  span6"
                                                   value="${model.latitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group" hidden="hidden" >
                                        <div class="controls">
                                            <input type="text" name="longitude" id="longitude" class="m-wrap  span6"
                                                   value="${model.longitude}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeDiameterLabel">管线直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeDiameter" id="pipeDiameter" value="${model.pipeDiameter}" />毫米
                                        </div>
                                    </div>

                                    <div class="control-group up-pipe">
                                        <label class="control-label" id="pipeMaterialLabel">管线材质</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="pipeMaterial" id="pipeMaterial" value="${model.pipeMaterial}"/>
                                        </div>
                                    </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管种类</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="belowType" id="belowPipeType" value="${model.belowType}"/>
                                        </div>
                                    </div>


                                        <div class="control-group below">
                                            <label class="control-label">下层管埋深</label>

                                            <div class="controls">
                                                <input type="text" class="m-wrap span6"  name="belowDepth" id="belowPipeDepth" value="${model.belowDepth}"/>
                                            </div>
                                        </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管直径</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowDiameter" id="belowPipeDiameter"  value="${model.belowDiameter}"/>
                                        </div>
                                </div>

                                    <div class="control-group below">
                                        <label class="control-label">下层管材料</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="belowMaterial" id="belowPipeMaterial" value="${model.belowMaterial}"/>
                                        </div>
                                    </div>

                                   <div class="control-group">
                                        <label class="control-label" id="pipeDepthLabel">管线埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="depth" id="pipeDepth" value="${model.depth}"/>
                                        </div>
                                    </div>

                                    <div class="control-group pipeOnly">
                                        <label class="control-label">埋设方式</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="layStyle" id="layStyle" value="${model.layStyle}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属区域</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="area" id="area" value="${model.area}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属线路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="line" id="line" value="${model.line}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">所属道路</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="road" id="road" value="${model.road}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">建设年代</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="constructTime" id="constructTime"  value="${model.constructTime}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">权属单位</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="ownerComp" id="ownerComp"  value="${model.ownerComp}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">标示对象ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerObjectId" id="markerObjectId" value="${model.markerObjectId}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器ID</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerId" id="markerId" value="${model.markerId}" />
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标示器类型</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerType" id="markerType"  value="${model.markerType}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识器埋深</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="markerDepth" id="markerDepth" value="${model.markerDepth}"/>
                                        </div>
                                    </div>
                                    <div class="control-group">
                                        <label class="control-label">安装部门</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6"  name="creator" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">标识点颜色</label>

                                        <div class="controls">
                                            <select data-placeholder="选择标识点颜色类型" name="colorType" data-with-diselect="1" class="m-wrap span6" id="colorType">
                                                <option value="0"  ${ 0==model.colorType ? 'selected' : '' }>蓝色（默认）</option>
                                                <option value="1"  ${ 1==model.colorType ? 'selected' : '' }>橙色</option>
                                                <option value="2"  ${ 2==model.colorType ? 'selected' : '' }>红色</option>
                                                <option value="3"  ${ 3==model.colorType ? 'selected' : '' }>黑色</option>
                                                <option value="4"  ${ 4==model.colorType ? 'selected' : '' }>粉紫色</option>
                                                <option value="5"  ${ 5==model.colorType ? 'selected' : '' }>黄色</option>
                                                <option value="6"  ${ 6==model.colorType ? 'selected' : '' }>绿色</option>
                                            </select>
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">备注</label>

                                        <div class="controls">
                                            <input type="text" class="m-wrap span6" name="memo" id="memo" value="${model.memo}"/>
                                        </div>
                                    </div>

                                    <input type="hidden" id="photo" value="${model.photos}">

                                    <div class="control-group">
                                        <label class="control-label">图片1</label>
                                        <div class="controls">
                                            <img class="uploadImg" id="img1" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file1" type="file" class="uploadBtn" name="file1">
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">图片2</label>
                                        <div class="controls">
                                            <img class="uploadImg" id="img2" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file2" type="file" class="uploadBtn" name="file2">
                                        </div>
                                    </div>

                                    <div class="control-group">
                                        <label class="control-label">图片3</label>
                                        <div class="controls">
                                            <img id="img3" class="uploadImg" src="" alt=""/>
                                        </div>
                                        <div class="controls">
                                            <input id="file3" type="file" class="uploadBtn" name="file3">
                                        </div>
                                    </div>


                                    <div class="control-group hidden">
                                        <label class="control-label">主键ID</label>
                                        <div class="controls">
                                            <input type="text" name="id" value="${model.id}" id="id"/>
                                            <span class="help-inline"></span>
                                        </div>
                                    </div>

                                    <div class="form-actions">
                                        <button type="submit" class="btn blue">提交</button>
                                        <button type="button" class="btn" id="cancelBtn">取消</button>
                                    </div>

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

        <div class="clearfix"></div>

    </div>

    <!-- 图片放大模态框 -->
    <div id="ShowImage_Form" class="modal hide modal-lg">
        <div class="modal-header" style="height:10px">
            <button data-dismiss="modal" class="close" type="button"></button>
        </div>
        <div class="modal-body">
            <div id="img_show">
            </div>
        </div>
    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

<%@include file="/common/layout/footer.jsp" %>

<!-- END FOOTER -->

<!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->

<!-- BEGIN CORE PLUGINS -->

<script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>

<!-- IMPORTANT! Load jquery-ui-1.10.1.custom.min.js before bootstrap.min.js to fix bootstrap tooltip conflict with jquery ui tooltip -->

<script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>

<!--[if lt IE 9]>

<script src="${ctx}/s/media/js/excanvas.min.js"></script>

<script src="${ctx}/s/media/js/respond.min.js"></script>

<![endif]-->

<script src="${ctx}/s/media/js/jquery.slimscroll.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.blockui.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.cookie.min.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/jquery.uniform.min.js" type="text/javascript"></script>

<!-- END CORE PLUGINS -->

<!-- BEGIN PAGE LEVEL PLUGINS -->

<%--<script type="text/javascript" src="${ctx}/s/media/js/ckeditor.js"></script>--%>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/wysihtml5-0.3.0.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-wysihtml5.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.tagsinput.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.toggle.buttons.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datetimepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/clockface.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/date.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/daterangepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-colorpicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-timepicker.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.inputmask.bundle.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.input-ip-address-control-1.0.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/jquery.multi-select.js"></script>

<script src="${ctx}/s/media/js/bootstrap-modal.js" type="text/javascript"></script>

<script src="${ctx}/s/media/js/bootstrap-modalmanager.js" type="text/javascript"></script>


<script type="text/javascript" src="${ctx}/s/media/js/jquery.validate.min.js"></script>

<script type="text/javascript" src="${ctx}/s/media/js/additional-methods.min.js"></script>

<!-- END PAGE LEVEL PLUGINS -->

<!-- BEGIN PAGE LEVEL SCRIPTS -->

<script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>

<script src="${ctx}/s/app/marker/marker-info-edit.js"></script>

<!-- END PAGE LEVEL SCRIPTS -->

<script>

    jQuery(document).ready(function () {

        App.init();

        MarkerInfoEdit.initForms();

    });

</script>

<!-- END JAVASCRIPTS -->

<!-- END BODY -->
</body>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/s/app/ems/EMSBean.js b/src/main/webapp/s/app/ems/EMSBean.js
index a3b1dca..f3473dc 100644
--- a/src/main/webapp/s/app/ems/EMSBean.js
+++ b/src/main/webapp/s/app/ems/EMSBean.js
@@ -1,6 +1,6 @@
 EMSBean = function (markerObjectType,pipeMaterial,pipeDiameter, layStyle, depth, belowType, belowDepth, belowDiameter, belowMaterial, road,
                     constructTime, ownerComp, markerObjectId, markerId, markerType, markerDepth, creator, createTime, memo, lat, long,
-                    recordType,id,line,area, colorType) {
+                    recordType,id,line,area, colorType,photos) {
 
     this.markerObjectType = markerObjectType;
     this.pipeMaterial = pipeMaterial;
@@ -28,4 +28,5 @@
     this.line=line;
     this.area =area;
     this.colorType = colorType;
+    this.photos = photos;
 };
diff --git a/src/main/webapp/s/app/marker/marker-info-edit.js b/src/main/webapp/s/app/marker/marker-info-edit.js
index e87b319..fa55842 100644
--- a/src/main/webapp/s/app/marker/marker-info-edit.js
+++ b/src/main/webapp/s/app/marker/marker-info-edit.js
@@ -39,20 +39,90 @@
         })
     }
 
+    function editPhotoInit(photos) {
+        console.log(photos);
+        console.log($('#context').val())
+        console.log(window.location.host)
+        var imgs = photos.split(",")
+        for(var i=0;i<imgs.length;i++){
+            var imgId = "img" + (i+1);
+            var path = "http://"+window.location.host+ $('#context').val()+ imgs[i]
+            console.log(path);
+            $("#"+imgId).attr('src',path);
+        }
+    }
+
+    function serializeJson(form) {
+        var arr = form.serializeArray();
+        var json ={};
+        $.each(arr, function() {
+            json[this.name] = this.value;
+        });
+        return JSON.stringify(json);
+    }
+
     return {
         initForms: function () {
             editFormInit();
-
+            editPhotoInit($("#photo").val());
             var form = $('#submit_form');
             var error = $('.alert-error', form);
             var success = $('.alert-success', form);
 
+
+
             $('#cancelBtn').live('click', function (e) {
 
                 location.href = $("#context").val() + "/content/marker/marker-info-list.jsp";
 
             });
 
+            // 选择图片并预览
+            $('input#file1').on('change',function () {
+                var file1 = $('#file1').get(0).files[0];
+                console.log(file1);
+                var reader = new FileReader();
+                reader.readAsDataURL(file1);
+                reader.onload = function (e){
+                    $('#img1').get(0).src = e.target.result;
+                }
+            });
+            $('input#file2').on('change',function () {
+                var file2 = $('#file2').get(0).files[0];
+                console.log(file2);
+                var reader = new FileReader();
+                reader.readAsDataURL(file2);
+                reader.onload = function (e){
+                    $('#img2').get(0).src = e.target.result;
+                }
+            });
+            $('input#file3').on('change',function () {
+                var file3 = $('#file3').get(0).files[0];
+                console.log(file3);
+                var reader = new FileReader();
+                reader.readAsDataURL(file3);
+                reader.onload = function (e){
+                    $('#img3').get(0).src = e.target.result;
+                }
+            });
+
+            // 点击图片放大
+            $('#img1').click(function(){
+                var source = $("#img1")[0].src;
+                $("#ShowImage_Form").find("#img_show").html("<image src='"+source+"' class='carousel-inner img-responsive img-rounded' />");
+                $("#ShowImage_Form").modal();
+            });
+            $('#img2').click(function(){
+                var source = $("#img2")[0].src;
+                $("#ShowImage_Form").find("#img_show").html("<image src='"+source+"' class='carousel-inner img-responsive img-rounded' />");
+                $("#ShowImage_Form").modal();
+            });
+            $('#img3').click(function(){
+                var source = $("#img3")[0].src;
+                $("#ShowImage_Form").find("#img_show").html("<image src='"+source+"' class='carousel-inner img-responsive img-rounded' />");
+                $("#ShowImage_Form").modal();
+            });
+
             form.validate({
                 doNotHideMessage: true, //this option enables to show the error/success messages on tab switch.
                 errorElement: 'span', //default input error message container
@@ -100,14 +170,26 @@
                 },
 
                 submitHandler: function (form) {
+                    var formData = new FormData();
+                    formData.append('fileBuffer1', $('#file1')[0].files[0]);
+                    formData.append('fileBuffer2', $('#file2')[0].files[0]);
+                    formData.append('fileBuffer3', $('#file3')[0].files[0]);
+                    formData.append('jsonMarker',serializeJson($('#submit_form')));
+                    console.log(formData.get("fileBuffer1"));
+                    console.log(formData.get("fileBuffer2"));
+                    console.log(formData.get("fileBuffer3"));
+
                     //add here some ajax code to submit your form or just call form.submit() if you want to submit the form without ajax
                     $.ajax({
                         type: "POST",
-                        url: $('#context').val() + "/marker/marker-info-save.do",
+                        url: $('#context').val() + "/marker/marker-info-photo.do",
                         //  dataType:'json',
                         //TODO LIST：按条件查询服务器数据
                         //   data: JSON.stringify($('#submit_form').serialize()),
-                        data: $('#submit_form').serialize(),
+                        // data: $('#submit_form').serialize(),
+                        data: formData,
+                        contentType: false,
+                        processData: false,
                         success: function (data) {
                             var jData = eval(data);
                             if (jData.success) {