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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());

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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());
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 659fa3e..44f74e2 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -20,6 +20,7 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.collections.CollectionUtils;
+import org.geotools.styling.Mark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by lenovo on 2016/5/16.
@@ -108,20 +106,23 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
-        if (markerDto.getId() == null) {//新增
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+//        if (markerDto.getId() == null) {//新增
 //            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
 //            marker.setValid(1);
 //            marker.setCompanyId(user.getCompany().getId());
 //            markerManager.saveMarker(marker);
 //            map.put("success", true);
 //            map.put("message", "新增成功");
-        } else {
             try {
-                Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {//编辑marker,下面要增加页面展示项
-                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-                    markerManager.saveMarker(marker0);
-                }
+//                Marker marker0 = markerManager.get(markerDto.getId());
+                List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+                markerManager.batchSave(markerDtos,companyId);
+//                if (null != marker0) {//编辑marker,下面要增加页面展示项
+////                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
+//                    markerManager.saveMarker(marker0);
+//                }
                 map.put("success", true);
                 map.put("message", "编辑成功");
             } catch (Exception e) {
@@ -129,7 +130,7 @@
                 map.put("message", "编辑失败");
             }
 
-        }
+
         return map;
     }
 

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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());
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 659fa3e..44f74e2 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -20,6 +20,7 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.collections.CollectionUtils;
+import org.geotools.styling.Mark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by lenovo on 2016/5/16.
@@ -108,20 +106,23 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
-        if (markerDto.getId() == null) {//新增
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+//        if (markerDto.getId() == null) {//新增
 //            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
 //            marker.setValid(1);
 //            marker.setCompanyId(user.getCompany().getId());
 //            markerManager.saveMarker(marker);
 //            map.put("success", true);
 //            map.put("message", "新增成功");
-        } else {
             try {
-                Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {//编辑marker,下面要增加页面展示项
-                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-                    markerManager.saveMarker(marker0);
-                }
+//                Marker marker0 = markerManager.get(markerDto.getId());
+                List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+                markerManager.batchSave(markerDtos,companyId);
+//                if (null != marker0) {//编辑marker,下面要增加页面展示项
+////                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
+//                    markerManager.saveMarker(marker0);
+//                }
                 map.put("success", true);
                 map.put("message", "编辑成功");
             } catch (Exception e) {
@@ -129,7 +130,7 @@
                 map.put("message", "编辑失败");
             }
 
-        }
+
         return map;
     }
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index bdabfe0..30b3e1f 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -489,8 +489,7 @@
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        Ems.initAddMarkerSelect();
-        EmsMarkerOpt.init();
+//        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
     })
 </script>
 

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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());
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 659fa3e..44f74e2 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -20,6 +20,7 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.collections.CollectionUtils;
+import org.geotools.styling.Mark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by lenovo on 2016/5/16.
@@ -108,20 +106,23 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
-        if (markerDto.getId() == null) {//新增
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+//        if (markerDto.getId() == null) {//新增
 //            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
 //            marker.setValid(1);
 //            marker.setCompanyId(user.getCompany().getId());
 //            markerManager.saveMarker(marker);
 //            map.put("success", true);
 //            map.put("message", "新增成功");
-        } else {
             try {
-                Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {//编辑marker,下面要增加页面展示项
-                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-                    markerManager.saveMarker(marker0);
-                }
+//                Marker marker0 = markerManager.get(markerDto.getId());
+                List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+                markerManager.batchSave(markerDtos,companyId);
+//                if (null != marker0) {//编辑marker,下面要增加页面展示项
+////                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
+//                    markerManager.saveMarker(marker0);
+//                }
                 map.put("success", true);
                 map.put("message", "编辑成功");
             } catch (Exception e) {
@@ -129,7 +130,7 @@
                 map.put("message", "编辑失败");
             }
 
-        }
+
         return map;
     }
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index bdabfe0..30b3e1f 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -489,8 +489,7 @@
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        Ems.initAddMarkerSelect();
-        EmsMarkerOpt.init();
+//        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
     })
 </script>
 
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 3f1e4c3..574c9d0 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">标识器名称<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerName" class="m-wrap span6" name="markerName"
                                                   value="${model.markerName}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属区域<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属区域" tabindex="1" name="featureId">

                                                <c:forEach items="${features}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属线路<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属线路" tabindex="1" name="lineId">

                                                <c:forEach items="${lines}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>


                                    <div class="control-group">

                                        <label class="control-label">类型<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"></span>
                                        </div>


                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">里程1<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="mileage" class="m-wrap span6" name="mileage"
                                                   value="${model.mileage}">
                                            <span class="help-inline"></span>
                                        </div>

                                    </div>

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


                                    <%--隐藏字段--%>
                                    <div class="control-group hidden">
                                        <label class="control-label">是否有效</label>
                                        <div class="controls">
                                            <input type="text" id="isValid" class="m-wrap span6" name="isValid"
                                                   value="${model.isValid}">
                                            <span class="help-inline"></span>
                                        </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/media/js/jquery-1.10.1.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"/>

</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="选择标识对象类别" 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" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

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

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




                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">标识器名称<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerName" class="m-wrap span6" name="markerName"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"> </span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属区域<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属区域" tabindex="1" name="featureId">--%>

                                                <%--<c:forEach items="${features}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属线路<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属线路" tabindex="1" name="lineId">--%>

                                                <%--<c:forEach items="${lines}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>


                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">类型<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>


                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">里程1<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage" class="m-wrap span6" name="mileage"--%>
                                                   <%--value="${model.mileage}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">里程2</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage2" class="m-wrap span6" name="mileage2"--%>
                                                   <%--value="${model.mileage2}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>


                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<div class="control-group hidden">--%>
                                        <%--<label class="control-label">是否有效</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="isValid" class="m-wrap span6" name="isValid"--%>
                                                   <%--value="${model.isValid}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>
                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<!--隐藏主键-->--%>
                                    <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/media/js/jquery-1.10.1.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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());
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 659fa3e..44f74e2 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -20,6 +20,7 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.collections.CollectionUtils;
+import org.geotools.styling.Mark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by lenovo on 2016/5/16.
@@ -108,20 +106,23 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
-        if (markerDto.getId() == null) {//新增
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+//        if (markerDto.getId() == null) {//新增
 //            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
 //            marker.setValid(1);
 //            marker.setCompanyId(user.getCompany().getId());
 //            markerManager.saveMarker(marker);
 //            map.put("success", true);
 //            map.put("message", "新增成功");
-        } else {
             try {
-                Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {//编辑marker,下面要增加页面展示项
-                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-                    markerManager.saveMarker(marker0);
-                }
+//                Marker marker0 = markerManager.get(markerDto.getId());
+                List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+                markerManager.batchSave(markerDtos,companyId);
+//                if (null != marker0) {//编辑marker,下面要增加页面展示项
+////                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
+//                    markerManager.saveMarker(marker0);
+//                }
                 map.put("success", true);
                 map.put("message", "编辑成功");
             } catch (Exception e) {
@@ -129,7 +130,7 @@
                 map.put("message", "编辑失败");
             }
 
-        }
+
         return map;
     }
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index bdabfe0..30b3e1f 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -489,8 +489,7 @@
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        Ems.initAddMarkerSelect();
-        EmsMarkerOpt.init();
+//        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
     })
 </script>
 
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 3f1e4c3..574c9d0 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">标识器名称<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerName" class="m-wrap span6" name="markerName"
                                                   value="${model.markerName}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属区域<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属区域" tabindex="1" name="featureId">

                                                <c:forEach items="${features}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属线路<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属线路" tabindex="1" name="lineId">

                                                <c:forEach items="${lines}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>


                                    <div class="control-group">

                                        <label class="control-label">类型<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"></span>
                                        </div>


                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">里程1<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="mileage" class="m-wrap span6" name="mileage"
                                                   value="${model.mileage}">
                                            <span class="help-inline"></span>
                                        </div>

                                    </div>

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


                                    <%--隐藏字段--%>
                                    <div class="control-group hidden">
                                        <label class="control-label">是否有效</label>
                                        <div class="controls">
                                            <input type="text" id="isValid" class="m-wrap span6" name="isValid"
                                                   value="${model.isValid}">
                                            <span class="help-inline"></span>
                                        </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/media/js/jquery-1.10.1.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"/>

</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="选择标识对象类别" 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" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

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

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




                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">标识器名称<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerName" class="m-wrap span6" name="markerName"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"> </span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属区域<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属区域" tabindex="1" name="featureId">--%>

                                                <%--<c:forEach items="${features}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属线路<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属线路" tabindex="1" name="lineId">--%>

                                                <%--<c:forEach items="${lines}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>


                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">类型<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>


                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">里程1<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage" class="m-wrap span6" name="mileage"--%>
                                                   <%--value="${model.mileage}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">里程2</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage2" class="m-wrap span6" name="mileage2"--%>
                                                   <%--value="${model.mileage2}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>


                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<div class="control-group hidden">--%>
                                        <%--<label class="control-label">是否有效</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="isValid" class="m-wrap span6" name="isValid"--%>
                                                   <%--value="${model.isValid}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>
                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<!--隐藏主键-->--%>
                                    <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/media/js/jquery-1.10.1.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/content/task/task.jsp b/src/main/webapp/content/task/task.jsp
index 460e768..d97ef38 100644
--- a/src/main/webapp/content/task/task.jsp
+++ b/src/main/webapp/content/task/task.jsp
@@ -28,9 +28,12 @@
     <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 href="${ctx}/s/media/css/jquery.fancybox.css" rel="stylesheet" />--%>
+    <%--<link href="${ctx}/s/media/css/chosen.css" rel="stylesheet" type="text/css"/>--%>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/list/list.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"/>
@@ -147,9 +150,35 @@
 
         <div class="portlet-body form">
             <!-- BEGIN FORM-->
-            <form action="#" class="form-horizontal">
+            <%--<form action="#" class="form-horizontal">--%>
                 <%--隐藏字段--%>
                 <!--隐藏主键-->
+
+            <%--<div class="row-fluid hidden">--%>
+                <%--<div class="span12">--%>
+                    <%--<div class="item hidden">--%>
+                        <%--<a class="fancybox-button hidden" data-rel="fancybox-button" title="Photo" href="${ctx}/images/events/image1.jpg">--%>
+                            <%--<div class="zoom">--%>
+                                <%--<img src="${ctx}/images/events/image1.jpg" alt="Photo" />--%>
+                                <%--<div class="zoom-icon hidden"></div>--%>
+                            <%--</div>--%>
+                        <%--</a>--%>
+                        <%--<div class="details">--%>
+                            <%--<a href="#" class="icon"><i class="icon-paper-clip"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-link"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-pencil"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-remove"></i></a>--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+
+
+            </div>
+
+
+        <%--</div>--%>
+
+
                 <div class="hidden">
                     <div class="controls">
                         <input type="text" name="id" value="" id="eventId"/>
@@ -165,7 +194,8 @@
                       <p id="eventImg" ></p>
                        <p id="eventPagination" class="pagination"></p>
                     </div>
-            </form>
+
+            <%--</form>--%>
             <!-- END FORM-->
         </div>
 
@@ -268,6 +298,7 @@
 <script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>
+<%--<script src="${ctx}/s/media/js/jquery.fancybox.pack.js"></script>--%>
 <script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
@@ -284,11 +315,12 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/task/task.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/media/js/gallery.js"></script>
 
 <script>
 
     $(function () {
-
+        Gallery.init();
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
         Task.initMap();
@@ -296,6 +328,7 @@
         Task.initForm();
         Task.initSelect();
 
+
     })
 
     function enlargeImage(){

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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());
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 659fa3e..44f74e2 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -20,6 +20,7 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.collections.CollectionUtils;
+import org.geotools.styling.Mark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by lenovo on 2016/5/16.
@@ -108,20 +106,23 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
-        if (markerDto.getId() == null) {//新增
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+//        if (markerDto.getId() == null) {//新增
 //            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
 //            marker.setValid(1);
 //            marker.setCompanyId(user.getCompany().getId());
 //            markerManager.saveMarker(marker);
 //            map.put("success", true);
 //            map.put("message", "新增成功");
-        } else {
             try {
-                Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {//编辑marker,下面要增加页面展示项
-                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-                    markerManager.saveMarker(marker0);
-                }
+//                Marker marker0 = markerManager.get(markerDto.getId());
+                List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+                markerManager.batchSave(markerDtos,companyId);
+//                if (null != marker0) {//编辑marker,下面要增加页面展示项
+////                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
+//                    markerManager.saveMarker(marker0);
+//                }
                 map.put("success", true);
                 map.put("message", "编辑成功");
             } catch (Exception e) {
@@ -129,7 +130,7 @@
                 map.put("message", "编辑失败");
             }
 
-        }
+
         return map;
     }
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index bdabfe0..30b3e1f 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -489,8 +489,7 @@
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        Ems.initAddMarkerSelect();
-        EmsMarkerOpt.init();
+//        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
     })
 </script>
 
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 3f1e4c3..574c9d0 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">标识器名称<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerName" class="m-wrap span6" name="markerName"
                                                   value="${model.markerName}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属区域<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属区域" tabindex="1" name="featureId">

                                                <c:forEach items="${features}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属线路<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属线路" tabindex="1" name="lineId">

                                                <c:forEach items="${lines}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>


                                    <div class="control-group">

                                        <label class="control-label">类型<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"></span>
                                        </div>


                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">里程1<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="mileage" class="m-wrap span6" name="mileage"
                                                   value="${model.mileage}">
                                            <span class="help-inline"></span>
                                        </div>

                                    </div>

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


                                    <%--隐藏字段--%>
                                    <div class="control-group hidden">
                                        <label class="control-label">是否有效</label>
                                        <div class="controls">
                                            <input type="text" id="isValid" class="m-wrap span6" name="isValid"
                                                   value="${model.isValid}">
                                            <span class="help-inline"></span>
                                        </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/media/js/jquery-1.10.1.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"/>

</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="选择标识对象类别" 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" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

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

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




                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">标识器名称<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerName" class="m-wrap span6" name="markerName"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"> </span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属区域<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属区域" tabindex="1" name="featureId">--%>

                                                <%--<c:forEach items="${features}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属线路<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属线路" tabindex="1" name="lineId">--%>

                                                <%--<c:forEach items="${lines}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>


                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">类型<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>


                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">里程1<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage" class="m-wrap span6" name="mileage"--%>
                                                   <%--value="${model.mileage}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">里程2</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage2" class="m-wrap span6" name="mileage2"--%>
                                                   <%--value="${model.mileage2}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>


                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<div class="control-group hidden">--%>
                                        <%--<label class="control-label">是否有效</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="isValid" class="m-wrap span6" name="isValid"--%>
                                                   <%--value="${model.isValid}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>
                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<!--隐藏主键-->--%>
                                    <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/media/js/jquery-1.10.1.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/content/task/task.jsp b/src/main/webapp/content/task/task.jsp
index 460e768..d97ef38 100644
--- a/src/main/webapp/content/task/task.jsp
+++ b/src/main/webapp/content/task/task.jsp
@@ -28,9 +28,12 @@
     <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 href="${ctx}/s/media/css/jquery.fancybox.css" rel="stylesheet" />--%>
+    <%--<link href="${ctx}/s/media/css/chosen.css" rel="stylesheet" type="text/css"/>--%>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/list/list.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"/>
@@ -147,9 +150,35 @@
 
         <div class="portlet-body form">
             <!-- BEGIN FORM-->
-            <form action="#" class="form-horizontal">
+            <%--<form action="#" class="form-horizontal">--%>
                 <%--隐藏字段--%>
                 <!--隐藏主键-->
+
+            <%--<div class="row-fluid hidden">--%>
+                <%--<div class="span12">--%>
+                    <%--<div class="item hidden">--%>
+                        <%--<a class="fancybox-button hidden" data-rel="fancybox-button" title="Photo" href="${ctx}/images/events/image1.jpg">--%>
+                            <%--<div class="zoom">--%>
+                                <%--<img src="${ctx}/images/events/image1.jpg" alt="Photo" />--%>
+                                <%--<div class="zoom-icon hidden"></div>--%>
+                            <%--</div>--%>
+                        <%--</a>--%>
+                        <%--<div class="details">--%>
+                            <%--<a href="#" class="icon"><i class="icon-paper-clip"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-link"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-pencil"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-remove"></i></a>--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+
+
+            </div>
+
+
+        <%--</div>--%>
+
+
                 <div class="hidden">
                     <div class="controls">
                         <input type="text" name="id" value="" id="eventId"/>
@@ -165,7 +194,8 @@
                       <p id="eventImg" ></p>
                        <p id="eventPagination" class="pagination"></p>
                     </div>
-            </form>
+
+            <%--</form>--%>
             <!-- END FORM-->
         </div>
 
@@ -268,6 +298,7 @@
 <script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>
+<%--<script src="${ctx}/s/media/js/jquery.fancybox.pack.js"></script>--%>
 <script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
@@ -284,11 +315,12 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/task/task.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/media/js/gallery.js"></script>
 
 <script>
 
     $(function () {
-
+        Gallery.init();
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
         Task.initMap();
@@ -296,6 +328,7 @@
         Task.initForm();
         Task.initSelect();
 
+
     })
 
     function enlargeImage(){
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 90d3a9b..ccb4887 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -256,14 +256,6 @@
                 drawOverlays.push(e.overlay);
 
             };
-//            var styleOptions = {
-//                strokeColor: "red",    //边线颜色。
-//                fillColor: "blue",      //填充颜色。当参数为空时，圆形将没有填充效果。
-//                strokeWeight: 3,       //边线的宽度，以像素为单位。
-//                strokeOpacity: 0.2,	   //边线透明度，取值范围0 - 1。
-//                fillOpacity: 0.1,      //填充的透明度，取值范围0 - 1。
-//                strokeStyle: 'solid' //边线的样式，solid或dashed。
-//            }
             //实例化鼠标绘制工具
             var drawingManager = new BMapLib.DrawingManager(map, {
                 isOpen: false, //是否开启绘制模式
@@ -538,46 +530,10 @@
 
         },
 
-        //获取Feature的列表
-//        initAreasArray: function (type, domId) {
-//
-//            $.ajax({
-//                type: "POST",
-//                url: $('#context').val() + "/feature/getFeature.do",
-//                data: {"type": type},
-//                dataType: "json",
-//                success: function (r) {
-//                    //获取面的列表，将下拉列表初始化
-//                    if (r.data) {
-//                        for (var area in r.data) {
-////                                alert(r.data[area].id+":"+r.data[area].featureName);
-//                            var dataArea = r.data[area];
-//                            $("#" + domId).append(" <option value=" + dataArea.id + ">" + dataArea.featureName + "</option>")
-//                        }
-//                        if (domId != "select_area") {
-//                            $("#" + domId).chosen();
-//                        }
-//
-//
-//                    }
-//                },
-//                error: function (request) {
-//                    //提示错误信息
-//                    alert(r.message);
-//                }
-//            });
-//
-//        },
-
         initSelect: function () {
             $("#selectObjectType").chosen();
-//            Ems.initAreasArray(1, "select_area");
-//            Ems.initAreasArray(2, "select_line");
         },
-//        initAddMarkerSelect: function () {
-////            Ems.initAreasArray(1, "addselAra");
-////            Ems.initAreasArray(2, "addselLine");
-//        },
+
 
         addMarker: function (data) {
             if (document.createElement('canvas').getContext) {  // 判断当前浏览器是否支持绘制海量点

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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());
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 659fa3e..44f74e2 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -20,6 +20,7 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.collections.CollectionUtils;
+import org.geotools.styling.Mark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by lenovo on 2016/5/16.
@@ -108,20 +106,23 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
-        if (markerDto.getId() == null) {//新增
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+//        if (markerDto.getId() == null) {//新增
 //            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
 //            marker.setValid(1);
 //            marker.setCompanyId(user.getCompany().getId());
 //            markerManager.saveMarker(marker);
 //            map.put("success", true);
 //            map.put("message", "新增成功");
-        } else {
             try {
-                Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {//编辑marker,下面要增加页面展示项
-                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-                    markerManager.saveMarker(marker0);
-                }
+//                Marker marker0 = markerManager.get(markerDto.getId());
+                List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+                markerManager.batchSave(markerDtos,companyId);
+//                if (null != marker0) {//编辑marker,下面要增加页面展示项
+////                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
+//                    markerManager.saveMarker(marker0);
+//                }
                 map.put("success", true);
                 map.put("message", "编辑成功");
             } catch (Exception e) {
@@ -129,7 +130,7 @@
                 map.put("message", "编辑失败");
             }
 
-        }
+
         return map;
     }
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index bdabfe0..30b3e1f 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -489,8 +489,7 @@
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        Ems.initAddMarkerSelect();
-        EmsMarkerOpt.init();
+//        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
     })
 </script>
 
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 3f1e4c3..574c9d0 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">标识器名称<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerName" class="m-wrap span6" name="markerName"
                                                   value="${model.markerName}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属区域<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属区域" tabindex="1" name="featureId">

                                                <c:forEach items="${features}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属线路<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属线路" tabindex="1" name="lineId">

                                                <c:forEach items="${lines}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>


                                    <div class="control-group">

                                        <label class="control-label">类型<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"></span>
                                        </div>


                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">里程1<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="mileage" class="m-wrap span6" name="mileage"
                                                   value="${model.mileage}">
                                            <span class="help-inline"></span>
                                        </div>

                                    </div>

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


                                    <%--隐藏字段--%>
                                    <div class="control-group hidden">
                                        <label class="control-label">是否有效</label>
                                        <div class="controls">
                                            <input type="text" id="isValid" class="m-wrap span6" name="isValid"
                                                   value="${model.isValid}">
                                            <span class="help-inline"></span>
                                        </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/media/js/jquery-1.10.1.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"/>

</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="选择标识对象类别" 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" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

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

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




                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">标识器名称<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerName" class="m-wrap span6" name="markerName"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"> </span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属区域<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属区域" tabindex="1" name="featureId">--%>

                                                <%--<c:forEach items="${features}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属线路<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属线路" tabindex="1" name="lineId">--%>

                                                <%--<c:forEach items="${lines}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>


                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">类型<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>


                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">里程1<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage" class="m-wrap span6" name="mileage"--%>
                                                   <%--value="${model.mileage}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">里程2</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage2" class="m-wrap span6" name="mileage2"--%>
                                                   <%--value="${model.mileage2}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>


                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<div class="control-group hidden">--%>
                                        <%--<label class="control-label">是否有效</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="isValid" class="m-wrap span6" name="isValid"--%>
                                                   <%--value="${model.isValid}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>
                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<!--隐藏主键-->--%>
                                    <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/media/js/jquery-1.10.1.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/content/task/task.jsp b/src/main/webapp/content/task/task.jsp
index 460e768..d97ef38 100644
--- a/src/main/webapp/content/task/task.jsp
+++ b/src/main/webapp/content/task/task.jsp
@@ -28,9 +28,12 @@
     <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 href="${ctx}/s/media/css/jquery.fancybox.css" rel="stylesheet" />--%>
+    <%--<link href="${ctx}/s/media/css/chosen.css" rel="stylesheet" type="text/css"/>--%>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/list/list.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"/>
@@ -147,9 +150,35 @@
 
         <div class="portlet-body form">
             <!-- BEGIN FORM-->
-            <form action="#" class="form-horizontal">
+            <%--<form action="#" class="form-horizontal">--%>
                 <%--隐藏字段--%>
                 <!--隐藏主键-->
+
+            <%--<div class="row-fluid hidden">--%>
+                <%--<div class="span12">--%>
+                    <%--<div class="item hidden">--%>
+                        <%--<a class="fancybox-button hidden" data-rel="fancybox-button" title="Photo" href="${ctx}/images/events/image1.jpg">--%>
+                            <%--<div class="zoom">--%>
+                                <%--<img src="${ctx}/images/events/image1.jpg" alt="Photo" />--%>
+                                <%--<div class="zoom-icon hidden"></div>--%>
+                            <%--</div>--%>
+                        <%--</a>--%>
+                        <%--<div class="details">--%>
+                            <%--<a href="#" class="icon"><i class="icon-paper-clip"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-link"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-pencil"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-remove"></i></a>--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+
+
+            </div>
+
+
+        <%--</div>--%>
+
+
                 <div class="hidden">
                     <div class="controls">
                         <input type="text" name="id" value="" id="eventId"/>
@@ -165,7 +194,8 @@
                       <p id="eventImg" ></p>
                        <p id="eventPagination" class="pagination"></p>
                     </div>
-            </form>
+
+            <%--</form>--%>
             <!-- END FORM-->
         </div>
 
@@ -268,6 +298,7 @@
 <script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>
+<%--<script src="${ctx}/s/media/js/jquery.fancybox.pack.js"></script>--%>
 <script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
@@ -284,11 +315,12 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/task/task.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/media/js/gallery.js"></script>
 
 <script>
 
     $(function () {
-
+        Gallery.init();
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
         Task.initMap();
@@ -296,6 +328,7 @@
         Task.initForm();
         Task.initSelect();
 
+
     })
 
     function enlargeImage(){
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 90d3a9b..ccb4887 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -256,14 +256,6 @@
                 drawOverlays.push(e.overlay);
 
             };
-//            var styleOptions = {
-//                strokeColor: "red",    //边线颜色。
-//                fillColor: "blue",      //填充颜色。当参数为空时，圆形将没有填充效果。
-//                strokeWeight: 3,       //边线的宽度，以像素为单位。
-//                strokeOpacity: 0.2,	   //边线透明度，取值范围0 - 1。
-//                fillOpacity: 0.1,      //填充的透明度，取值范围0 - 1。
-//                strokeStyle: 'solid' //边线的样式，solid或dashed。
-//            }
             //实例化鼠标绘制工具
             var drawingManager = new BMapLib.DrawingManager(map, {
                 isOpen: false, //是否开启绘制模式
@@ -538,46 +530,10 @@
 
         },
 
-        //获取Feature的列表
-//        initAreasArray: function (type, domId) {
-//
-//            $.ajax({
-//                type: "POST",
-//                url: $('#context').val() + "/feature/getFeature.do",
-//                data: {"type": type},
-//                dataType: "json",
-//                success: function (r) {
-//                    //获取面的列表，将下拉列表初始化
-//                    if (r.data) {
-//                        for (var area in r.data) {
-////                                alert(r.data[area].id+":"+r.data[area].featureName);
-//                            var dataArea = r.data[area];
-//                            $("#" + domId).append(" <option value=" + dataArea.id + ">" + dataArea.featureName + "</option>")
-//                        }
-//                        if (domId != "select_area") {
-//                            $("#" + domId).chosen();
-//                        }
-//
-//
-//                    }
-//                },
-//                error: function (request) {
-//                    //提示错误信息
-//                    alert(r.message);
-//                }
-//            });
-//
-//        },
-
         initSelect: function () {
             $("#selectObjectType").chosen();
-//            Ems.initAreasArray(1, "select_area");
-//            Ems.initAreasArray(2, "select_line");
         },
-//        initAddMarkerSelect: function () {
-////            Ems.initAreasArray(1, "addselAra");
-////            Ems.initAreasArray(2, "addselLine");
-//        },
+
 
         addMarker: function (data) {
             if (document.createElement('canvas').getContext) {  // 判断当前浏览器是否支持绘制海量点
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 ba68411..e3363ff 100644
--- a/src/main/webapp/s/app/marker/marker-info-edit.js
+++ b/src/main/webapp/s/app/marker/marker-info-edit.js
@@ -1,8 +1,47 @@
 var MarkerInfoEdit = function () {
+    function doChange(){
+        var type = $("#selectObjectType").val();
+        if (type == 1) {//管线
+            $("#pipeTypeLabel").text("管线种类");
+            $(".up-pipe").show();
+            $("#pipeDiameterLabel").text("管线直径");
+            $("#pipeMaterialLabel").text("管线材质");
+            $(".below").addClass("hidden");
+            $("#pipeDepthLabel").text("管线埋深");
+            $(".pipeOnly").show();
+        } else if (type == 2) {//管线附属物
+            $("#pipeTypeLabel").text("附属物名称");
+            $(".up-pipe").hide();
+            $(".below").addClass("hidden");
+            $("#pipeDepthLabel").text("井深");
+            $(".pipeOnly").hide();
+        } else if (type == 3) {//管线特征点
+            $("#pipeTypeLabel").text("管点特征");
+            $(".up-pipe").hide();
+            $(".below").addClass("hidden");
+            $("#pipeDepthLabel").text("特征点埋深");
+            $(".pipeOnly").hide();
+        } else {//交叉穿越点
+            $("#pipeTypeLabel").text("上层管种类");
+            $(".up-pipe").show();
+            $("#pipeDiameterLabel").text("上层管直径");
+            $("#pipeMaterialLabel").text("上层管材料");
+            $(".below").removeClass("hidden");
+            $("#pipeDepthLabel").text("上层管埋深");
+            $(".pipeOnly").hide();
+        }
+    }
+
+    function editFormInit() {
+          doChange();
+        $("#selectObjectType").live("change", function (e) {
+           doChange();
+        })
+    }
 
     return {
-
-        initForms:function(){
+        initForms: function () {
+            editFormInit();
 
             var form = $('#submit_form');
             var error = $('.alert-error', form);
@@ -62,20 +101,20 @@
 
                 submitHandler: function (form) {
                     //add here some ajax code to submit your form or just call form.submit() if you want to submit the form without ajax
-                    $.ajax( {
+                    $.ajax({
                         type: "POST",
-                        url: $('#context').val()+"/marker/marker-info-save.do",
+                        url: $('#context').val() + "/marker/marker-info-save.do",
                         //  dataType:'json',
                         //TODO LIST：按条件查询服务器数据
                         //   data: JSON.stringify($('#submit_form').serialize()),
                         data: $('#submit_form').serialize(),
-                        success: function(data) {
+                        success: function (data) {
                             var jData = eval(data);
-                            if(jData.success==true) {
+                            if (jData.success == true) {
 
                                 location.href = $("#context").val() + "/content/marker/marker-info-list.jsp";
                             }
-                            else{
+                            else {
 
                                 success.hide();
                                 $("#errorMessage").html(jData.message);
@@ -83,14 +122,14 @@
 
                             }
                         },
-                        error:function(request){
+                        error: function (request) {
                             success.hide();
                             error.show();
                         }
                     });
                 }
             });
-            $('#cancek_btn').live("click",function(e){
+            $('#cancek_btn').live("click", function (e) {
                 location.href = $("#context").val() + "/content/marker/marker-info-list.jsp";
             })
         }

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 d75e83d..a208635 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -207,6 +207,9 @@
         }
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
+            if(markerDto.getId()!=null){
+                marker.setId(markerDto.getId());
+            }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
             marker.setLayStyle(markerDto.getLayStyle());
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 659fa3e..44f74e2 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -20,6 +20,7 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.collections.CollectionUtils;
+import org.geotools.styling.Mark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by lenovo on 2016/5/16.
@@ -108,20 +106,23 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
-        if (markerDto.getId() == null) {//新增
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+//        if (markerDto.getId() == null) {//新增
 //            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
 //            marker.setValid(1);
 //            marker.setCompanyId(user.getCompany().getId());
 //            markerManager.saveMarker(marker);
 //            map.put("success", true);
 //            map.put("message", "新增成功");
-        } else {
             try {
-                Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {//编辑marker,下面要增加页面展示项
-                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-                    markerManager.saveMarker(marker0);
-                }
+//                Marker marker0 = markerManager.get(markerDto.getId());
+                List<MarkerDto> markerDtos = new ArrayList<MarkerDto>();
+                markerManager.batchSave(markerDtos,companyId);
+//                if (null != marker0) {//编辑marker,下面要增加页面展示项
+////                    marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
+//                    markerManager.saveMarker(marker0);
+//                }
                 map.put("success", true);
                 map.put("message", "编辑成功");
             } catch (Exception e) {
@@ -129,7 +130,7 @@
                 map.put("message", "编辑失败");
             }
 
-        }
+
         return map;
     }
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index bdabfe0..30b3e1f 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -489,8 +489,7 @@
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        Ems.initAddMarkerSelect();
-        EmsMarkerOpt.init();
+//        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
     })
 </script>
 
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 3f1e4c3..574c9d0 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">标识器名称<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerName" class="m-wrap span6" name="markerName"
                                                   value="${model.markerName}">
                                            <span class="help-inline"> </span>
                                        </div>
                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属区域<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属区域" tabindex="1" name="featureId">

                                                <c:forEach items="${features}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">所属线路<span class="required">*</span></label>

                                        <div class="controls">

                                            <select class="span6 chosen" data-with-diselect="1"
                                                    data-placeholder="所属线路" tabindex="1" name="lineId">

                                                <c:forEach items="${lines}" var="item">

                                                    <option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>

                                                </c:forEach>

                                            </select>

                                        </div>

                                    </div>


                                    <div class="control-group">

                                        <label class="control-label">类型<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"
                                                   value="${model.markerObjectType}">
                                            <span class="help-inline"></span>
                                        </div>


                                    </div>

                                    <div class="control-group">

                                        <label class="control-label">里程1<span class="required">*</span></label>
                                        <div class="controls">
                                            <input type="text" id="mileage" class="m-wrap span6" name="mileage"
                                                   value="${model.mileage}">
                                            <span class="help-inline"></span>
                                        </div>

                                    </div>

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


                                    <%--隐藏字段--%>
                                    <div class="control-group hidden">
                                        <label class="control-label">是否有效</label>
                                        <div class="controls">
                                            <input type="text" id="isValid" class="m-wrap span6" name="isValid"
                                                   value="${model.isValid}">
                                            <span class="help-inline"></span>
                                        </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/media/js/jquery-1.10.1.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"/>

</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="选择标识对象类别" 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" id="markerObjectType" class="m-wrap  span6"
                                                   value="${model.markerObjectType}">
                                            <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" id="creator" value="${model.creator}"/>
                                        </div>
                                    </div>

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

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




                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">标识器名称<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerName" class="m-wrap span6" name="markerName"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"> </span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属区域<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属区域" tabindex="1" name="featureId">--%>

                                                <%--<c:forEach items="${features}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.featureId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">所属线路<span class="required">*</span></label>--%>

                                        <%--<div class="controls">--%>

                                            <%--<select class="span6 chosen" data-with-diselect="1"--%>
                                                    <%--data-placeholder="所属线路" tabindex="1" name="lineId">--%>

                                                <%--<c:forEach items="${lines}" var="item">--%>

                                                    <%--<option value="${item.id}"  ${ item.id==model.lineId ? 'selected' : '' }>${item.featureName}</option>--%>

                                                <%--</c:forEach>--%>

                                            <%--</select>--%>

                                        <%--</div>--%>

                                    <%--</div>--%>


                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">类型<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="markerObjectType" class="m-wrap span6" name="markerObjectType"--%>
                                                   <%--value="${model.markerObjectType}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>


                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>

                                        <%--<label class="control-label">里程1<span class="required">*</span></label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage" class="m-wrap span6" name="mileage"--%>
                                                   <%--value="${model.mileage}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>

                                    <%--</div>--%>

                                    <%--<div class="control-group">--%>
                                        <%--<label class="control-label">里程2</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="mileage2" class="m-wrap span6" name="mileage2"--%>
                                                   <%--value="${model.mileage2}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>


                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<div class="control-group hidden">--%>
                                        <%--<label class="control-label">是否有效</label>--%>
                                        <%--<div class="controls">--%>
                                            <%--<input type="text" id="isValid" class="m-wrap span6" name="isValid"--%>
                                                   <%--value="${model.isValid}">--%>
                                            <%--<span class="help-inline"></span>--%>
                                        <%--</div>--%>
                                    <%--</div>--%>
                                    <%--&lt;%&ndash;隐藏字段&ndash;%&gt;--%>
                                    <%--<!--隐藏主键-->--%>
                                    <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/media/js/jquery-1.10.1.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/content/task/task.jsp b/src/main/webapp/content/task/task.jsp
index 460e768..d97ef38 100644
--- a/src/main/webapp/content/task/task.jsp
+++ b/src/main/webapp/content/task/task.jsp
@@ -28,9 +28,12 @@
     <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 href="${ctx}/s/media/css/jquery.fancybox.css" rel="stylesheet" />--%>
+    <%--<link href="${ctx}/s/media/css/chosen.css" rel="stylesheet" type="text/css"/>--%>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/list/list.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"/>
@@ -147,9 +150,35 @@
 
         <div class="portlet-body form">
             <!-- BEGIN FORM-->
-            <form action="#" class="form-horizontal">
+            <%--<form action="#" class="form-horizontal">--%>
                 <%--隐藏字段--%>
                 <!--隐藏主键-->
+
+            <%--<div class="row-fluid hidden">--%>
+                <%--<div class="span12">--%>
+                    <%--<div class="item hidden">--%>
+                        <%--<a class="fancybox-button hidden" data-rel="fancybox-button" title="Photo" href="${ctx}/images/events/image1.jpg">--%>
+                            <%--<div class="zoom">--%>
+                                <%--<img src="${ctx}/images/events/image1.jpg" alt="Photo" />--%>
+                                <%--<div class="zoom-icon hidden"></div>--%>
+                            <%--</div>--%>
+                        <%--</a>--%>
+                        <%--<div class="details">--%>
+                            <%--<a href="#" class="icon"><i class="icon-paper-clip"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-link"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-pencil"></i></a>--%>
+                            <%--<a href="#" class="icon"><i class="icon-remove"></i></a>--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+
+
+            </div>
+
+
+        <%--</div>--%>
+
+
                 <div class="hidden">
                     <div class="controls">
                         <input type="text" name="id" value="" id="eventId"/>
@@ -165,7 +194,8 @@
                       <p id="eventImg" ></p>
                        <p id="eventPagination" class="pagination"></p>
                     </div>
-            </form>
+
+            <%--</form>--%>
             <!-- END FORM-->
         </div>
 
@@ -268,6 +298,7 @@
 <script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>
+<%--<script src="${ctx}/s/media/js/jquery.fancybox.pack.js"></script>--%>
 <script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
@@ -284,11 +315,12 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/task/task.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/media/js/gallery.js"></script>
 
 <script>
 
     $(function () {
-
+        Gallery.init();
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
         Task.initMap();
@@ -296,6 +328,7 @@
         Task.initForm();
         Task.initSelect();
 
+
     })
 
     function enlargeImage(){
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 90d3a9b..ccb4887 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -256,14 +256,6 @@
                 drawOverlays.push(e.overlay);
 
             };
-//            var styleOptions = {
-//                strokeColor: "red",    //边线颜色。
-//                fillColor: "blue",      //填充颜色。当参数为空时，圆形将没有填充效果。
-//                strokeWeight: 3,       //边线的宽度，以像素为单位。
-//                strokeOpacity: 0.2,	   //边线透明度，取值范围0 - 1。
-//                fillOpacity: 0.1,      //填充的透明度，取值范围0 - 1。
-//                strokeStyle: 'solid' //边线的样式，solid或dashed。
-//            }
             //实例化鼠标绘制工具
             var drawingManager = new BMapLib.DrawingManager(map, {
                 isOpen: false, //是否开启绘制模式
@@ -538,46 +530,10 @@
 
         },
 
-        //获取Feature的列表
-//        initAreasArray: function (type, domId) {
-//
-//            $.ajax({
-//                type: "POST",
-//                url: $('#context').val() + "/feature/getFeature.do",
-//                data: {"type": type},
-//                dataType: "json",
-//                success: function (r) {
-//                    //获取面的列表，将下拉列表初始化
-//                    if (r.data) {
-//                        for (var area in r.data) {
-////                                alert(r.data[area].id+":"+r.data[area].featureName);
-//                            var dataArea = r.data[area];
-//                            $("#" + domId).append(" <option value=" + dataArea.id + ">" + dataArea.featureName + "</option>")
-//                        }
-//                        if (domId != "select_area") {
-//                            $("#" + domId).chosen();
-//                        }
-//
-//
-//                    }
-//                },
-//                error: function (request) {
-//                    //提示错误信息
-//                    alert(r.message);
-//                }
-//            });
-//
-//        },
-
         initSelect: function () {
             $("#selectObjectType").chosen();
-//            Ems.initAreasArray(1, "select_area");
-//            Ems.initAreasArray(2, "select_line");
         },
-//        initAddMarkerSelect: function () {
-////            Ems.initAreasArray(1, "addselAra");
-////            Ems.initAreasArray(2, "addselLine");
-//        },
+
 
         addMarker: function (data) {
             if (document.createElement('canvas').getContext) {  // 判断当前浏览器是否支持绘制海量点
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 ba68411..e3363ff 100644
--- a/src/main/webapp/s/app/marker/marker-info-edit.js
+++ b/src/main/webapp/s/app/marker/marker-info-edit.js
@@ -1,8 +1,47 @@
 var MarkerInfoEdit = function () {
+    function doChange(){
+        var type = $("#selectObjectType").val();
+        if (type == 1) {//管线
+            $("#pipeTypeLabel").text("管线种类");
+            $(".up-pipe").show();
+            $("#pipeDiameterLabel").text("管线直径");
+            $("#pipeMaterialLabel").text("管线材质");
+            $(".below").addClass("hidden");
+            $("#pipeDepthLabel").text("管线埋深");
+            $(".pipeOnly").show();
+        } else if (type == 2) {//管线附属物
+            $("#pipeTypeLabel").text("附属物名称");
+            $(".up-pipe").hide();
+            $(".below").addClass("hidden");
+            $("#pipeDepthLabel").text("井深");
+            $(".pipeOnly").hide();
+        } else if (type == 3) {//管线特征点
+            $("#pipeTypeLabel").text("管点特征");
+            $(".up-pipe").hide();
+            $(".below").addClass("hidden");
+            $("#pipeDepthLabel").text("特征点埋深");
+            $(".pipeOnly").hide();
+        } else {//交叉穿越点
+            $("#pipeTypeLabel").text("上层管种类");
+            $(".up-pipe").show();
+            $("#pipeDiameterLabel").text("上层管直径");
+            $("#pipeMaterialLabel").text("上层管材料");
+            $(".below").removeClass("hidden");
+            $("#pipeDepthLabel").text("上层管埋深");
+            $(".pipeOnly").hide();
+        }
+    }
+
+    function editFormInit() {
+          doChange();
+        $("#selectObjectType").live("change", function (e) {
+           doChange();
+        })
+    }
 
     return {
-
-        initForms:function(){
+        initForms: function () {
+            editFormInit();
 
             var form = $('#submit_form');
             var error = $('.alert-error', form);
@@ -62,20 +101,20 @@
 
                 submitHandler: function (form) {
                     //add here some ajax code to submit your form or just call form.submit() if you want to submit the form without ajax
-                    $.ajax( {
+                    $.ajax({
                         type: "POST",
-                        url: $('#context').val()+"/marker/marker-info-save.do",
+                        url: $('#context').val() + "/marker/marker-info-save.do",
                         //  dataType:'json',
                         //TODO LIST：按条件查询服务器数据
                         //   data: JSON.stringify($('#submit_form').serialize()),
                         data: $('#submit_form').serialize(),
-                        success: function(data) {
+                        success: function (data) {
                             var jData = eval(data);
-                            if(jData.success==true) {
+                            if (jData.success == true) {
 
                                 location.href = $("#context").val() + "/content/marker/marker-info-list.jsp";
                             }
-                            else{
+                            else {
 
                                 success.hide();
                                 $("#errorMessage").html(jData.message);
@@ -83,14 +122,14 @@
 
                             }
                         },
-                        error:function(request){
+                        error: function (request) {
                             success.hide();
                             error.show();
                         }
                     });
                 }
             });
-            $('#cancek_btn').live("click",function(e){
+            $('#cancek_btn').live("click", function (e) {
                 location.href = $("#context").val() + "/content/marker/marker-info-list.jsp";
             })
         }
diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js
index bf8c522..d5a73e9 100644
--- a/src/main/webapp/s/app/task/task.js
+++ b/src/main/webapp/s/app/task/task.js
@@ -13,6 +13,7 @@
     var taskLists;
     var taskDetailLists = new Array();
     var eventBeanList = [];
+    var viewPoints = [];
     var options = {
         valueNames: [ 'id', 'patrolerName', 'status', 'deployDate', 'beginDate', 'endDate', 'description', {attr: 'src', name: 'image'} ],
         item: '<li onclick=""><img class="image" src="" style="float: left;width:20px;height:20px">' +
@@ -120,11 +121,23 @@
         var msg2 = "<strong>事件描述:</strong>" + p.Tag.description + "</br>" +
             "<strong>上传时间:</strong>" + p.Tag.createTime + "</br>";
         $("#eventImg").children().remove();//avatar1.jpg
-        var imageDivs="";
+//        var imageDivs="<div class='row-fluid'>";
+        var imageDivs ="";
         var width = 100/images.length;//动态展示
         for(var i =0;i<images.length;i++){
-            imageDivs +="<img height='80%' width='"+width+"%' onclick='enlargeImage()' src=" + $('#context').val() + "/images/events/" + images[i] + ">"
+            var url = $('#context').val() + "/images/events/" + images[i];
+//            imageDivs +="<div  class='span4'><div class='item'><a class='fancybox-button' data-rel='fancybox-button'title='Photo'' href="+url+">" +
+//                                            "<div class='zoom'><img src="+ url + " alt='Photo'/>" +
+//                                                               "<div class='zoom-icon'></div></div></a>" +
+//                                            "<div class='details'>"+
+//                                                 "<a href='#' class='icon'><i class='icon-paper-clip'></i></a>"+
+//                                                    "<a href='#' class='icon'><i class='icon-link'></i></a>"+
+//                                                    " <a href='#' class='icon'><i class='icon-pencil'></i></a>"+
+//                                                    "<a href='#' class='icon'><i class='icon-remove'></i></a>"+
+//                                             "</div></div></div>"
+          imageDivs +="<img height='80%' width='"+width+"%' src="+ url + ">";
         }
+//        imageDivs+="</div>"
         $("#eventImg").append(imageDivs)
         $("#eventDescription").html(msg2);
         $('#eventModal').modal('show').css({width: "300px"});
@@ -372,6 +385,7 @@
 
         bindClickEvent: function () {
             $('#worksheets ul li').live('click', function (e) {
+                viewPoints = [];
                 if (null == this.getElementsByClassName("id")[0]) {
                     return;
                 }
@@ -611,12 +625,13 @@
                     "上传时间:" + eventBeanList[i].createTime + "\r\n";
                 var marker = new BMap.Marker(point, {icon: myIcon, title: msg});  // 创建标注
                 marker.Tag = eventBeanList[i];
-
+                viewPoints.push(point);
                 marker.addEventListener("click", showEventInfo);
                 map.addOverlay(marker);              // 将标注添加到地图中
-                drawEventOverlays.push(marker);
+                drawEventOverlays.push(viewPoints);
 
             }
+            map.setViewport(viewPoints);
         },
         addTaskDetailMarker: function (data) {
             for (var i = 0; i < data.length; i++) {
@@ -629,12 +644,15 @@
                     "描述:" + data[i].description + "\r\n";
                 var marker = new BMap.Marker(point, {icon: myIcon, title: msg});  // 创建标注
 
+                viewPoints.push(point);
                 drawTaskOverlays.push(marker);
                 map.addOverlay(marker);              // 将标注添加到地图中
-                if (i == 0) {
-                    map.centerAndZoom(point, 17);
-                }
+//                if (i == 0) {
+//                    map.centerAndZoom(point, 17);
+//                }
             }
+            map.setViewport(viewPoints);
+
 //            var options = {
 //                size: BMAP_POINT_SIZE_BIG,
 //                shape: BMAP_POINT_SHAPE_STAR,