diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 05a7c0f..71f67d7 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -307,7 +307,7 @@
     public static MarkerDto convert2MarkerDto(Marker marker) {
         if (marker == null) return null;
         MarkerDto result = new MarkerDto();
-
+        if(marker.getLongitude()==null||marker.getLatitude()==null) return null;
         result.setCreateTime(marker.getCreateTime().toString().substring(0, 19));
         result.setDepth(doNullChange(marker.getDepth()));
         result.setId(marker.getId());

diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 05a7c0f..71f67d7 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -307,7 +307,7 @@
     public static MarkerDto convert2MarkerDto(Marker marker) {
         if (marker == null) return null;
         MarkerDto result = new MarkerDto();
-
+        if(marker.getLongitude()==null||marker.getLatitude()==null) return null;
         result.setCreateTime(marker.getCreateTime().toString().substring(0, 19));
         result.setDepth(doNullChange(marker.getDepth()));
         result.setId(marker.getId());
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 b51cf3c..fd44f19 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -187,9 +187,12 @@
             return false;
         }
         for (MarkerDto markerDto : markers) {
+            //暂时改为出现经纬度为空立即返回保存失败
             Marker marker = new Marker();
             if (markerDto.getId() != null) {
                 marker.setId(markerDto.getId());
+            }else{
+                if(markerDto.getLatitude()==null||markerDto.getLongitude()==null) return false;
             }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());

diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 05a7c0f..71f67d7 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -307,7 +307,7 @@
     public static MarkerDto convert2MarkerDto(Marker marker) {
         if (marker == null) return null;
         MarkerDto result = new MarkerDto();
-
+        if(marker.getLongitude()==null||marker.getLatitude()==null) return null;
         result.setCreateTime(marker.getCreateTime().toString().substring(0, 19));
         result.setDepth(doNullChange(marker.getDepth()));
         result.setId(marker.getId());
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 b51cf3c..fd44f19 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -187,9 +187,12 @@
             return false;
         }
         for (MarkerDto markerDto : markers) {
+            //暂时改为出现经纬度为空立即返回保存失败
             Marker marker = new Marker();
             if (markerDto.getId() != null) {
                 marker.setId(markerDto.getId());
+            }else{
+                if(markerDto.getLatitude()==null||markerDto.getLongitude()==null) return false;
             }
             marker.setMarkerId(markerDto.getMarkerId());
             marker.setRoad(markerDto.getRoad());
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 e9db731..15759cd 100644
--- a/src/main/webapp/content/marker/marker-info-edit-new.jsp
+++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>

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

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

<!DOCTYPE html>

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

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

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

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

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

<head>

    <meta charset="utf-8"/>

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

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

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

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

    <!-- BEGIN GLOBAL MANDATORY STYLES -->

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

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

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

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

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

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

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

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

    <!-- END GLOBAL MANDATORY STYLES -->

    <!-- BEGIN PAGE LEVEL STYLES -->

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <!-- END PAGE LEVEL STYLES -->

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

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

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

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

<!-- BEGIN HEADER -->

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

<!-- END HEADER -->

<!-- BEGIN CONTAINER -->

<div class="page-container">

<!-- BEGIN SIDEBAR -->

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

<!-- END SIDEBAR -->

    <div class="page-content">

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

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

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

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

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

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

                    <div class="portlet box blue">

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

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

    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

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

<!-- END FOOTER -->

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

<!-- BEGIN CORE PLUGINS -->

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

                                </form>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--END PAGE CONTENT-->

        </div>

        <!-- END PAGE CONTAINER-->

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

    </div>

<!-- END PAGE CONTAINER-->

</div>

</div>

<!-- END CONTAINER -->

<!-- BEGIN FOOTER -->

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

<!-- END FOOTER -->

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

<!-- BEGIN CORE PLUGINS -->

<script src="${ctx}/s/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