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 c9c15de..d75e83d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -58,8 +58,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto,Long companyId) {
-        List<Feature> features = null;
-        List<Feature> lines = null;
+//        List<Feature> features = null;
+//        List<Feature> lines = null;
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
         DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
         int start = parameter.getiDisplayStart();
@@ -70,13 +70,18 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-
+            if (markerDto1.getRecordType()!=null) {
+                criteria1.add(Restrictions.eq("recordType", markerDto1.getRecordType()));
+            }
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
             if (StringUtils.isNotBlank(markerDto1.getRoad())) {
                 criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
             }
+            if (StringUtils.isNotBlank(markerDto1.getOwnerComp())) {
+                criteria1.add(Restrictions.like("ownerComp", markerDto1.getOwnerComp(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }

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 c9c15de..d75e83d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -58,8 +58,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto,Long companyId) {
-        List<Feature> features = null;
-        List<Feature> lines = null;
+//        List<Feature> features = null;
+//        List<Feature> lines = null;
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
         DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
         int start = parameter.getiDisplayStart();
@@ -70,13 +70,18 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-
+            if (markerDto1.getRecordType()!=null) {
+                criteria1.add(Restrictions.eq("recordType", markerDto1.getRecordType()));
+            }
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
             if (StringUtils.isNotBlank(markerDto1.getRoad())) {
                 criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
             }
+            if (StringUtils.isNotBlank(markerDto1.getOwnerComp())) {
+                criteria1.add(Restrictions.like("ownerComp", markerDto1.getOwnerComp(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }
diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp
index ffe4c93..69a4d42 100644
--- a/src/main/webapp/content/marker/marker-info-list.jsp
+++ b/src/main/webapp/content/marker/marker-info-list.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>
<%@include file="/taglibs.jsp" %>
<%pageContext.setAttribute("currentMenu", "markerManagerMenu");%>
<!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"/>
    <!--TODO LIST:修改为对应系统-->
    <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"/>


    <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" href="${ctx}/s/media/css/DT_bootstrap.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.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/bootstrap-wysihtml5.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/bootstrap-modal.css"/>
    <link rel="shortcut icon" href="${ctx}/s/media/image/favicon.ico" />
    <link rel="stylesheet" href="${ctx}/s/media/css/DT_bootstrap.css"/>
    <!--TODO List:此处统一换成网站的图标-->
    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

    <!-- END PAGE LEVEL STYLES -->

    <style type="text/css">

        #table_marker th {
            font-size: 10pt;
            color: #ffffff;
        }

        #table_marker thead tr {
            background-color: #3D3D3D;
        }

    </style>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">
<input type="hidden" id="context" value="${ctx}">
<!-- BEGIN HEADER -->
<%@include file="/common/layout/header.jsp" %>
<!-- END HEADER -->
<!-- BEGIN CONTAINER -->
<div class="page-container">
    <!-- BEGIN SIDEBAR -->
    <%@include file="/common/layout/menu_new.jsp" %>
    <!-- END SIDEBAR -->
    <!-- BEGIN PAGE -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->

        <div class="container-fluid">

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

            <!--BEGIN SECOND MENU-->

            <%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN SECOND MENU-->

            <!--Start the content-->

            <div class="row-fluid">

                <div class="span12">

                    <div class="portlet box blue">

                        <div class="portlet-title">

                            <!--TODO LIST：换成模块名称，即使一级标题的名称-->
                            <div class="caption"><i class="icon-edit"></i>标识器管理</div>

                            <div class="tools">

                                <a href="javascript:;" class="collapse"></a>

                            </div>

                        </div>

                        <div class="portlet-body">
                            <div class="row-fluid">

                                <!--综合查询条件表单-->
                                <div class="span12">
                                    <form action="#" class="horizontal-form" style="margin-bottom: 0px;margin-top: 10px">
                                        <div class="row-fluid">
                                            <div class="span12">

                                                <div class="span2">
                                                    <div class="controls" style="width: 160px">
                                                        <select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"
                                                                id="select_area">
                                                            <option value=""></option>
                                                        </select>
                                                    </div>
                                                </div>

                                                <div class="span2">
                                                    <div class="controls" style="width: 160px">
                                                        <select class="span12 select2_area" data-placeholder="所属线路" tabindex="1"
                                                                id="select_line">
                                                            <option value=""></option>
                                                        </select>
                                                    </div>
                                                </div>

                                                <div class="span2" style="border: none">
                                                    <input style="width: 160px" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">
                                                </div>

                                                <div class="span2" style="border: none">
                                                    <input style="width: 160px" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">
                                                </div>

                                                <div class="span2">
                                                    <input style="width: 160px" type="text" id="markerName" class="m-wrap" placeholder="标识器名称">
                                                </div>

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

                                                <div class="span2">
                                                    <input style="width: 145px" type="text" id="memo" class="m-wrap" placeholder="备注">
                                                </div>
                                                <div class="span2">
                                                    <input style="width: 145px" type="text" id="creator" class="m-wrap" placeholder="人员">
                                                </div>
                                                <div class="span2">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd" value="" id="txt_begin_day" placeholder="开始日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span2">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd"  value="" id="txt_end_day" placeholder="结束日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span3">
                                                    <td>
                                                        <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>
                                                    </td>

                                                    <td>
                                                        <button  id="exp" class="btn blue"><i class="icon-add"></i>导出标识器</button>
                                                    </td>
                                                </div>

                                            </div>

                                        </div>


                                    </form>
                                    <!--TODO LIST:此处把table_user改成相关子模块的ID即可-->
                                    <table class="table table-striped table-bordered table-hover" id="table_marker">

                                        <thead>

                                        <tr>
                                            <th>id</th>
                                            <th>标识器编号</th>
                                            <th>标识器名称</th>
                                            <th>区域</th>
                                            <th>线路</th>
                                            <th>类型</th>
                                            <th>埋深</th>
                                            <th>里程1</th>
                                            <th>里程2</th>
                                            <th>安装时间</th>
                                            <th>安装人员</th>
                                            <th>备注</th>
                                            <th>编辑</th>
                                            <th>删除</th>
                                        </tr>

                                        </thead>

                                    </table>

                                </div>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--End the content-->

        </div>

        <!-- END PAGE CONTAINER-->

    </div>

    <!-- END PAGE -->


    <div class="clearfix"></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/chosen.jquery.min.js"></script>--%>
<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/select2.min.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.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/ems/ems.js" type="text/javascript"></script>
<script src="${ctx}/s/app/marker/marker-info-list.js" type="text/javascript"></script>
<!-- END PAGE LEVEL SCRIPTS -->
<script>

    $(function () {
        App.init(); // initlayout and core plugins
        MarkerInfoList.init();
        MarkerInfoList.initForm();
        Ems.initSelect();

    })

</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", "markerManagerMenu");%>
<!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"/>
    <!--TODO LIST:修改为对应系统-->
    <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"/>


    <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" href="${ctx}/s/media/css/DT_bootstrap.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.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/bootstrap-wysihtml5.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/bootstrap-modal.css"/>
    <link rel="shortcut icon" href="${ctx}/s/media/image/favicon.ico" />
    <link rel="stylesheet" href="${ctx}/s/media/css/DT_bootstrap.css"/>
    <!--TODO List:此处统一换成网站的图标-->
    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

    <!-- END PAGE LEVEL STYLES -->

    <style type="text/css">

        #table_marker th {
            font-size: 10pt;
            color: #ffffff;
        }

        #table_marker thead tr {
            background-color: #3D3D3D;
        }

    </style>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">
<input type="hidden" id="context" value="${ctx}">
<!-- BEGIN HEADER -->
<%@include file="/common/layout/header.jsp" %>
<!-- END HEADER -->
<!-- BEGIN CONTAINER -->
<div class="page-container">
    <!-- BEGIN SIDEBAR -->
    <%@include file="/common/layout/menu_new.jsp" %>
    <!-- END SIDEBAR -->
    <!-- BEGIN PAGE -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->

        <div class="container-fluid">

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

            <!--BEGIN SECOND MENU-->

            <%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN SECOND MENU-->

            <!--Start the content-->

            <div class="row-fluid">

                <div class="span12">

                    <div class="portlet box blue">

                        <div class="portlet-title">

                            <!--TODO LIST：换成模块名称，即使一级标题的名称-->
                            <div class="caption"><i class="icon-edit"></i>标识器管理</div>

                            <div class="tools">

                                <a href="javascript:;" class="collapse"></a>

                            </div>

                        </div>

                        <div class="portlet-body">
                            <div class="row-fluid">

                                <!--综合查询条件表单-->
                                <div class="span12">
                                    <form action="#" class="horizontal-form" style="margin-bottom: 0px;margin-top: 10px">
                                        <div class="row-fluid">
                                            <div class="span12">

                                                <div class="span3">
                                                    <div class="controls" style="width: 160px">
                                                        <select class="span12 select2_area" data-placeholder="标识对象类别" tabindex="1"
                                                                id="markerObjectType">
                                                            <option value="1" selected>管线</option>
                                                            <option value="2">管线附属物</option>
                                                            <option value="3">管线特征点</option>
                                                            <option value="4">交叉穿越点</option>
                                                        </select>
                                                    </div>
                                                </div>

                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="road" class="m-wrap" placeholder="所属道路">
                                                </div>

                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="ownerComp" class="m-wrap" placeholder="所属单位">
                                                </div>

                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="memo" class="m-wrap" placeholder="备注">
                                                </div>

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


                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="creator" class="m-wrap" placeholder="人员">
                                                </div>
                                                <div class="span3">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd" value="" id="txt_begin_day" placeholder="开始日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span3">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd"  value="" id="txt_end_day" placeholder="结束日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span3">
                                                    <td>
                                                        <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>
                                                    </td>

                                                    <td>
                                                        <button  id="exp" class="btn blue"><i class="icon-add"></i>导出标识器</button>
                                                    </td>
                                                </div>

                                            </div>

                                        </div>


                                    </form>
                                    <!--TODO LIST:此处把table_user改成相关子模块的ID即可-->
                                    <table class="table table-striped table-bordered table-hover" id="table_marker">

                                        <%--<thead>--%>

                                        <%--<tr>--%>
                                            <%--<th>id</th>--%>
                                            <%--<th>标识器编号</th>--%>
                                            <%--<th>标识器名称</th>--%>
                                            <%--<th>区域</th>--%>
                                            <%--<th>线路</th>--%>
                                            <%--<th>类型</th>--%>
                                            <%--<th>埋深</th>--%>
                                            <%--<th>里程1</th>--%>
                                            <%--<th>里程2</th>--%>
                                            <%--<th>安装时间</th>--%>
                                            <%--<th>安装人员</th>--%>
                                            <%--<th>备注</th>--%>
                                            <%--<th>编辑</th>--%>
                                            <%--<th>删除</th>--%>
                                        <%--</tr>--%>

                                        <%--</thead>--%>

                                    </table>

                                </div>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--End the content-->

        </div>

        <!-- END PAGE CONTAINER-->

    </div>

    <!-- END PAGE -->


    <div class="clearfix"></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/chosen.jquery.min.js"></script>--%>
<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/select2.min.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.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/ems/ems.js" type="text/javascript"></script>
<script src="${ctx}/s/app/marker/marker-info-list.js" type="text/javascript"></script>
<!-- END PAGE LEVEL SCRIPTS -->
<script>

    $(function () {
        App.init(); // initlayout and core plugins
        MarkerInfoList.init();
        Ems.initSelect();

    })

</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 c9c15de..d75e83d 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -58,8 +58,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto,Long companyId) {
-        List<Feature> features = null;
-        List<Feature> lines = null;
+//        List<Feature> features = null;
+//        List<Feature> lines = null;
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
         DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
         int start = parameter.getiDisplayStart();
@@ -70,13 +70,18 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-
+            if (markerDto1.getRecordType()!=null) {
+                criteria1.add(Restrictions.eq("recordType", markerDto1.getRecordType()));
+            }
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
             if (StringUtils.isNotBlank(markerDto1.getRoad())) {
                 criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
             }
+            if (StringUtils.isNotBlank(markerDto1.getOwnerComp())) {
+                criteria1.add(Restrictions.like("ownerComp", markerDto1.getOwnerComp(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }
diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp
index ffe4c93..69a4d42 100644
--- a/src/main/webapp/content/marker/marker-info-list.jsp
+++ b/src/main/webapp/content/marker/marker-info-list.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>
<%@include file="/taglibs.jsp" %>
<%pageContext.setAttribute("currentMenu", "markerManagerMenu");%>
<!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"/>
    <!--TODO LIST:修改为对应系统-->
    <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"/>


    <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" href="${ctx}/s/media/css/DT_bootstrap.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.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/bootstrap-wysihtml5.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/bootstrap-modal.css"/>
    <link rel="shortcut icon" href="${ctx}/s/media/image/favicon.ico" />
    <link rel="stylesheet" href="${ctx}/s/media/css/DT_bootstrap.css"/>
    <!--TODO List:此处统一换成网站的图标-->
    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

    <!-- END PAGE LEVEL STYLES -->

    <style type="text/css">

        #table_marker th {
            font-size: 10pt;
            color: #ffffff;
        }

        #table_marker thead tr {
            background-color: #3D3D3D;
        }

    </style>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">
<input type="hidden" id="context" value="${ctx}">
<!-- BEGIN HEADER -->
<%@include file="/common/layout/header.jsp" %>
<!-- END HEADER -->
<!-- BEGIN CONTAINER -->
<div class="page-container">
    <!-- BEGIN SIDEBAR -->
    <%@include file="/common/layout/menu_new.jsp" %>
    <!-- END SIDEBAR -->
    <!-- BEGIN PAGE -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->

        <div class="container-fluid">

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

            <!--BEGIN SECOND MENU-->

            <%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN SECOND MENU-->

            <!--Start the content-->

            <div class="row-fluid">

                <div class="span12">

                    <div class="portlet box blue">

                        <div class="portlet-title">

                            <!--TODO LIST：换成模块名称，即使一级标题的名称-->
                            <div class="caption"><i class="icon-edit"></i>标识器管理</div>

                            <div class="tools">

                                <a href="javascript:;" class="collapse"></a>

                            </div>

                        </div>

                        <div class="portlet-body">
                            <div class="row-fluid">

                                <!--综合查询条件表单-->
                                <div class="span12">
                                    <form action="#" class="horizontal-form" style="margin-bottom: 0px;margin-top: 10px">
                                        <div class="row-fluid">
                                            <div class="span12">

                                                <div class="span2">
                                                    <div class="controls" style="width: 160px">
                                                        <select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"
                                                                id="select_area">
                                                            <option value=""></option>
                                                        </select>
                                                    </div>
                                                </div>

                                                <div class="span2">
                                                    <div class="controls" style="width: 160px">
                                                        <select class="span12 select2_area" data-placeholder="所属线路" tabindex="1"
                                                                id="select_line">
                                                            <option value=""></option>
                                                        </select>
                                                    </div>
                                                </div>

                                                <div class="span2" style="border: none">
                                                    <input style="width: 160px" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">
                                                </div>

                                                <div class="span2" style="border: none">
                                                    <input style="width: 160px" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">
                                                </div>

                                                <div class="span2">
                                                    <input style="width: 160px" type="text" id="markerName" class="m-wrap" placeholder="标识器名称">
                                                </div>

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

                                                <div class="span2">
                                                    <input style="width: 145px" type="text" id="memo" class="m-wrap" placeholder="备注">
                                                </div>
                                                <div class="span2">
                                                    <input style="width: 145px" type="text" id="creator" class="m-wrap" placeholder="人员">
                                                </div>
                                                <div class="span2">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd" value="" id="txt_begin_day" placeholder="开始日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span2">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd"  value="" id="txt_end_day" placeholder="结束日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span3">
                                                    <td>
                                                        <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>
                                                    </td>

                                                    <td>
                                                        <button  id="exp" class="btn blue"><i class="icon-add"></i>导出标识器</button>
                                                    </td>
                                                </div>

                                            </div>

                                        </div>


                                    </form>
                                    <!--TODO LIST:此处把table_user改成相关子模块的ID即可-->
                                    <table class="table table-striped table-bordered table-hover" id="table_marker">

                                        <thead>

                                        <tr>
                                            <th>id</th>
                                            <th>标识器编号</th>
                                            <th>标识器名称</th>
                                            <th>区域</th>
                                            <th>线路</th>
                                            <th>类型</th>
                                            <th>埋深</th>
                                            <th>里程1</th>
                                            <th>里程2</th>
                                            <th>安装时间</th>
                                            <th>安装人员</th>
                                            <th>备注</th>
                                            <th>编辑</th>
                                            <th>删除</th>
                                        </tr>

                                        </thead>

                                    </table>

                                </div>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--End the content-->

        </div>

        <!-- END PAGE CONTAINER-->

    </div>

    <!-- END PAGE -->


    <div class="clearfix"></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/chosen.jquery.min.js"></script>--%>
<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/select2.min.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.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/ems/ems.js" type="text/javascript"></script>
<script src="${ctx}/s/app/marker/marker-info-list.js" type="text/javascript"></script>
<!-- END PAGE LEVEL SCRIPTS -->
<script>

    $(function () {
        App.init(); // initlayout and core plugins
        MarkerInfoList.init();
        MarkerInfoList.initForm();
        Ems.initSelect();

    })

</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", "markerManagerMenu");%>
<!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"/>
    <!--TODO LIST:修改为对应系统-->
    <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"/>


    <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" href="${ctx}/s/media/css/DT_bootstrap.css"/>

    <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.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/bootstrap-wysihtml5.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/bootstrap-modal.css"/>
    <link rel="shortcut icon" href="${ctx}/s/media/image/favicon.ico" />
    <link rel="stylesheet" href="${ctx}/s/media/css/DT_bootstrap.css"/>
    <!--TODO List:此处统一换成网站的图标-->
    <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>

    <!-- END PAGE LEVEL STYLES -->

    <style type="text/css">

        #table_marker th {
            font-size: 10pt;
            color: #ffffff;
        }

        #table_marker thead tr {
            background-color: #3D3D3D;
        }

    </style>

</head>

<!-- END HEAD -->

<!-- BEGIN BODY -->

<body class="page-header-fixed">
<input type="hidden" id="context" value="${ctx}">
<!-- BEGIN HEADER -->
<%@include file="/common/layout/header.jsp" %>
<!-- END HEADER -->
<!-- BEGIN CONTAINER -->
<div class="page-container">
    <!-- BEGIN SIDEBAR -->
    <%@include file="/common/layout/menu_new.jsp" %>
    <!-- END SIDEBAR -->
    <!-- BEGIN PAGE -->

    <div class="page-content">

        <!-- BEGIN PAGE CONTAINER-->

        <div class="container-fluid">

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

            <!--BEGIN SECOND MENU-->

            <%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
            <div class="row-fluid">
                <div class="span12"></div>
            </div>

            <!--BEGIN SECOND MENU-->

            <!--Start the content-->

            <div class="row-fluid">

                <div class="span12">

                    <div class="portlet box blue">

                        <div class="portlet-title">

                            <!--TODO LIST：换成模块名称，即使一级标题的名称-->
                            <div class="caption"><i class="icon-edit"></i>标识器管理</div>

                            <div class="tools">

                                <a href="javascript:;" class="collapse"></a>

                            </div>

                        </div>

                        <div class="portlet-body">
                            <div class="row-fluid">

                                <!--综合查询条件表单-->
                                <div class="span12">
                                    <form action="#" class="horizontal-form" style="margin-bottom: 0px;margin-top: 10px">
                                        <div class="row-fluid">
                                            <div class="span12">

                                                <div class="span3">
                                                    <div class="controls" style="width: 160px">
                                                        <select class="span12 select2_area" data-placeholder="标识对象类别" tabindex="1"
                                                                id="markerObjectType">
                                                            <option value="1" selected>管线</option>
                                                            <option value="2">管线附属物</option>
                                                            <option value="3">管线特征点</option>
                                                            <option value="4">交叉穿越点</option>
                                                        </select>
                                                    </div>
                                                </div>

                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="road" class="m-wrap" placeholder="所属道路">
                                                </div>

                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="ownerComp" class="m-wrap" placeholder="所属单位">
                                                </div>

                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="memo" class="m-wrap" placeholder="备注">
                                                </div>

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


                                                <div class="span3">
                                                    <input style="width: 145px" type="text" id="creator" class="m-wrap" placeholder="人员">
                                                </div>
                                                <div class="span3">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd" value="" id="txt_begin_day" placeholder="开始日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span3">
                                                    <td style="border: none">
                                                        <div class="m-wrap input-append date date-picker"
                                                             data-date-format="yyyy-mm-dd" data-date-viewmode="years">
                                                            <input style="width: 112px" class="m-wrap m-ctrl-medium date-picker" size="10" type="text"
                                                                   data-date-format="yyyy-mm-dd"  value="" id="txt_end_day" placeholder="结束日期"/>
                                                            <span class="add-on">
                                                                <i class="icon-calendar"></i>
                                                            </span>
                                                        </div>
                                                    </td>
                                                </div>
                                                <div class="span3">
                                                    <td>
                                                        <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>
                                                    </td>

                                                    <td>
                                                        <button  id="exp" class="btn blue"><i class="icon-add"></i>导出标识器</button>
                                                    </td>
                                                </div>

                                            </div>

                                        </div>


                                    </form>
                                    <!--TODO LIST:此处把table_user改成相关子模块的ID即可-->
                                    <table class="table table-striped table-bordered table-hover" id="table_marker">

                                        <%--<thead>--%>

                                        <%--<tr>--%>
                                            <%--<th>id</th>--%>
                                            <%--<th>标识器编号</th>--%>
                                            <%--<th>标识器名称</th>--%>
                                            <%--<th>区域</th>--%>
                                            <%--<th>线路</th>--%>
                                            <%--<th>类型</th>--%>
                                            <%--<th>埋深</th>--%>
                                            <%--<th>里程1</th>--%>
                                            <%--<th>里程2</th>--%>
                                            <%--<th>安装时间</th>--%>
                                            <%--<th>安装人员</th>--%>
                                            <%--<th>备注</th>--%>
                                            <%--<th>编辑</th>--%>
                                            <%--<th>删除</th>--%>
                                        <%--</tr>--%>

                                        <%--</thead>--%>

                                    </table>

                                </div>

                            </div>

                        </div>

                    </div>

                </div>

            </div>

            <!--End the content-->

        </div>

        <!-- END PAGE CONTAINER-->

    </div>

    <!-- END PAGE -->


    <div class="clearfix"></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/chosen.jquery.min.js"></script>--%>
<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/select2.min.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
<script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.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/ems/ems.js" type="text/javascript"></script>
<script src="${ctx}/s/app/marker/marker-info-list.js" type="text/javascript"></script>
<!-- END PAGE LEVEL SCRIPTS -->
<script>

    $(function () {
        App.init(); // initlayout and core plugins
        MarkerInfoList.init();
        Ems.initSelect();

    })

</script>

<!-- END JAVASCRIPTS -->

<!-- END BODY -->
</body>

</html>

\ No newline at end of file
diff --git a/src/main/webapp/s/app/marker/marker-info-list.js b/src/main/webapp/s/app/marker/marker-info-list.js
index 3763f9e..837cce9 100644
--- a/src/main/webapp/s/app/marker/marker-info-list.js
+++ b/src/main/webapp/s/app/marker/marker-info-list.js
@@ -1,19 +1,440 @@
 var MarkerInfoList = function () {
 
     var oTable;
-    var Marker ={};
+    var Marker = {};
+    var typeValue = 1;
+    var aoColums;
+    var aoColumnDefs;
     var handleDatePickers = function () {
 
         if (jQuery().datepicker) {
             $('.date-picker').datepicker({
-                rtl : App.isRTL()
+                rtl: App.isRTL()
             });
         }
     }
 
     return {
 
+        // 初始化表头以及列表中需要展示的列和列宽设置
+        tableTitle: function (type) {
+            if (type == 1) {
+                aoColums = [
+                    {
+                        "mDataProp": "id"
+                    },
+                    {
+                        "mDataProp": "markerObjectType"
+                    },
+                    {
+                        "mDataProp": "pipeDiameter"
+
+                    },
+                    {
+                        "mDataProp": "pipeMaterial"
+
+                    },
+                    {
+                        "mDataProp": "layStyle"
+
+                    },
+                    {
+                        "mDataProp": "depth"
+
+                    },
+                    {
+                        "mDataProp": "road"
+
+                    },
+                    {
+                        "mDataProp": "constructTime"
+
+                    },
+                    {
+                        "mDataProp": "ownerComp"
+
+                    },
+                    {
+                        "mDataProp": "markerType"
+
+                    },
+                    {
+                        "mDataProp": "markerDepth"
+
+                    },
+                    {
+                        "mDataProp": "creator"
+
+                    },
+                    {
+                        "mDataProp": "createTime"
+
+                    },
+                    {
+                        "mDataProp": "memo"
+
+                    },
+                    {
+                        "mDataProp": "btnEdit",
+                        "sWidth": '55px'
+                    },
+                    {
+                        "mDataProp": "btnDelete",
+                        "sWidth": '55px'
+                    }
+                ];
+                aoColumnDefs = [
+                    {
+                        'bSortable': false,
+                        'bVisible': false,
+                        'aTargets': [0]
+                    },
+                    {
+                        'bSortable': false,
+                        'aTargets': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,14,15]
+                    }
+                ];
+                return  "<thead> <tr>"
+                    + "<th hidden='hidden'>id</th>"
+                    + "   <th>管线种类</th>"
+                    + "   <th>管线直径</th>"
+                    + "   <th>管线材质</th>"
+                    + "   <th>埋设方式</th>"
+                    + "   <th>管线埋深</th>"
+                    + "   <th>所属道路</th>"
+                    + "   <th>建设年代</th>"
+                    + "   <th>所属单位</th>"
+                    + "   <th>标识器类型</th>"
+                    + "   <th>标识器埋深</th>"
+                    + "   <th>安装人员</th>"
+                    + "   <th>最后修改时间</th>"
+                    + "   <th>备注</th>"
+                    + "   <th>编辑</th>"
+                    + "  <th>删除</th>"
+                    + "</tr>"
+                    + "</thead> ";
+            } else if (type == 2) {
+                aoColums = [
+                    {
+                        "mDataProp": "id"
+                    },
+                    {
+                        "mDataProp": "markerObjectType"
+                    },
+                    {
+                        "mDataProp": "depth"
+
+                    },
+                    {
+                        "mDataProp": "road"
+
+                    },
+                    {
+                        "mDataProp": "constructTime"
+
+                    },
+                    {
+                        "mDataProp": "ownerComp"
+
+                    },
+                    {
+                        "mDataProp": "markerType"
+
+                    },
+                    {
+                        "mDataProp": "markerDepth"
+
+                    },
+                    {
+                        "mDataProp": "creator"
+
+                    },
+                    {
+                        "mDataProp": "createTime"
+
+                    },
+                    {
+                        "mDataProp": "memo"
+
+                    },
+                    {
+                        "mDataProp": "btnEdit",
+                        "sWidth": '55px'
+                    },
+                    {
+                        "mDataProp": "btnDelete",
+                        "sWidth": '55px'
+                    }
+                ];
+                aoColumnDefs = [
+                    {
+                        'bSortable': false,
+                        'bVisible': false,
+                        'aTargets': [0]
+                    },
+                    {
+                        'bSortable': false,
+                        'aTargets': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,12]
+                    }
+                ];
+                return  "<thead> <tr>"
+                    + "<th hidden='hidden'>id</th>"
+                    + "   <th>附属物名称</th>"
+                    + "   <th>井深</th>"
+                    + "   <th>所属道路</th>"
+                    + "   <th>建设年代</th>"
+                    + "   <th>所属单位</th>"
+                    + "   <th>标识器类型</th>"
+                    + "   <th>标识器埋深</th>"
+                    + "   <th>安装人员</th>"
+                    + "   <th>最后修改时间</th>"
+                    + "   <th>备注</th>"
+                    + "   <th>编辑</th>"
+                    + "  <th>删除</th>"
+                    + "</tr>"
+                    + "</thead> ";
+            } else if (type == 3) {
+                aoColums = [
+                    {
+                        "mDataProp": "id"
+                    },
+                    {
+                        "mDataProp": "markerObjectType"
+                    },
+                    {
+                        "mDataProp": "depth"
+
+                    },
+                    {
+                        "mDataProp": "road"
+
+                    },
+                    {
+                        "mDataProp": "constructTime"
+
+                    },
+                    {
+                        "mDataProp": "ownerComp"
+
+                    },
+                    {
+                        "mDataProp": "markerType"
+
+                    },
+                    {
+                        "mDataProp": "markerDepth"
+
+                    },
+                    {
+                        "mDataProp": "creator"
+
+                    },
+                    {
+                        "mDataProp": "createTime"
+
+                    },
+                    {
+                        "mDataProp": "memo"
+
+                    },
+                    {
+                        "mDataProp": "btnEdit",
+                        "sWidth": '55px'
+                    },
+                    {
+                        "mDataProp": "btnDelete",
+                        "sWidth": '55px'
+                    }
+                ];
+                aoColumnDefs = [
+                    {
+                        'bSortable': false,
+                        'bVisible': false,
+                        'aTargets': [0]
+                    },
+                    {
+                        'bSortable': false,
+                        'aTargets': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,12]
+                    }
+                ];
+                return  "<thead> <tr>"
+                    + "<th hidden='hidden'>id</th>"
+                    + "   <th>管点特征</th>"
+                    + "   <th>特征点埋深</th>"
+                    + "   <th>所属道路</th>"
+                    + "   <th>建设年代</th>"
+                    + "   <th>所属单位</th>"
+                    + "   <th>标识器类型</th>"
+                    + "   <th>标识器埋深</th>"
+                    + "   <th>安装人员</th>"
+                    + "   <th>最后修改时间</th>"
+                    + "   <th>备注</th>"
+                    + "   <th>编辑</th>"
+                    + "  <th>删除</th>"
+                    + "</tr>"
+                    + "</thead> ";
+            } else {
+                aoColums = [
+                    {
+                        "mDataProp": "id"
+                    },
+                    {
+                        "mDataProp": "markerObjectType"
+                    },
+                    {
+                        "mDataProp": "depth"
+
+                    },
+                    {
+                        "mDataProp": "pipeDiameter"
+
+                    },
+                    {
+                        "mDataProp": "pipeMaterial"
+
+                    },
+                    {
+                        "mDataProp": "belowType"
+
+                    },
+                    {
+                        "mDataProp": "belowDepth"
+
+                    },
+                    {
+                        "mDataProp": "belowDiameter"
+
+                    },
+                    {
+                        "mDataProp": "belowMaterial"
+
+                    },
+                    {
+                        "mDataProp": "road"
+
+                    },
+                    {
+                        "mDataProp": "constructTime"
+
+                    },
+                    {
+                        "mDataProp": "ownerComp"
+
+                    },
+                    {
+                        "mDataProp": "markerType"
+
+                    },
+                    {
+                        "mDataProp": "markerDepth"
+
+                    },
+                    {
+                        "mDataProp": "creator"
+
+                    },
+                    {
+                        "mDataProp": "createTime"
+
+                    },
+                    {
+                        "mDataProp": "memo"
+
+                    },
+                    {
+                        "mDataProp": "btnEdit",
+                        "sWidth": '55px'
+                    },
+                    {
+                        "mDataProp": "btnDelete",
+                        "sWidth": '55px'
+                    }
+                ];
+                aoColumnDefs = [
+                    {
+                        'bSortable': false,
+                        'bVisible': false,
+                        'aTargets': [0]
+                    },
+                    {
+                        'bSortable': false,
+                        'aTargets': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,13,14,15,16,17,18]
+                    }
+                ];
+                return  "<thead> <tr>"
+                    + "<th hidden='hidden'>id</th>"
+                    + "   <th>上层管种类</th>"
+                    + "   <th>上层管埋深</th>"
+                    + "   <th>上层管直径</th>"
+                    + "   <th>上层管材料</th>"
+                    + "   <th>下层管种类</th>"
+                    + "   <th>下层管埋深</th>"
+                    + "   <th>下层管直径</th>"
+                    + "   <th>下层管材料</th>"
+                    + "   <th>所属道路</th>"
+                    + "   <th>建设年代</th>"
+                    + "   <th>所属单位</th>"
+                    + "   <th>标识器类型</th>"
+                    + "   <th>标识器埋深</th>"
+                    + "   <th>安装人员</th>"
+                    + "   <th>最后修改时间</th>"
+                    + "   <th>备注</th>"
+                    + "   <th>编辑</th>"
+                    + "  <th>删除</th>"
+                    + "</tr>"
+                    + "</thead> ";
+            }
+
+        },
+
+
         init: function () {
+            //监听类型下拉列表变化事件，
+            //$("#markerObjectType").chosen();
+            $("#markerObjectType").live("change", function (e) {
+                typeValue = $("#markerObjectType").val();
+                $("#table_marker").children().remove();
+                Marker.recordType = typeValue;
+                var title = MarkerInfoList.tableTitle(typeValue);
+                oTable = $('#table_marker').dataTable({
+                    // set the initial value
+                    "iDisplayLength": 5,
+                    "bAutoWidth": false,
+                    "bDestroy": true,
+                    "bLengthChange": false,
+                    "bFilter": false,
+                    "bServerSide": true,
+                    "bPaginate": true,
+                    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+                    "sPaginationType": "bootstrap",
+                    "sAjaxSource": $('#context').val() + "/marker/marker-info-list.do", //TODO LIST:修改成对应的后台Controller地址
+                    "fnServerData": retrieveData,
+                    "oLanguage": {
+                        "sSearch": "标识器型号:",
+                        "sLengthMenu": "每页显示 _MENU_ 条记录",
+                        "sZeroRecords": "抱歉， 没有找到",
+                        "sInfo": "从 _START_ 到 _END_ /共 _TOTAL_ 条数据",
+                        "sInfoFiltered": "",
+                        "sInfoEmpty": "没有数据",
+                        "oPaginate": {
+                            "sPrevious": "上一页",
+                            "sNext": "下一页",
+                            "sLast": "末页",
+                            "sFirst": "首页"
+                        }
+                    },
+                    "aoColumns": aoColums,
+                    "aoColumnDefs": aoColumnDefs
+                });
+                $("#table_marker thead").children().remove();
+                $("#table_marker thead").remove();
+                $("#table_marker").append(title);
+            });
+
+            Marker.recordType = typeValue;
+            var title = MarkerInfoList.tableTitle(typeValue);
+            $("#table_marker").children().remove();
+            $("#table_marker").append(title);
 
             handleDatePickers();
 
@@ -37,13 +458,10 @@
             }
 
             oTable = $('#table_marker').dataTable({
-//                "aLengthMenu": [
-//                    [5, 15, 20, -1],
-//                    [5, 15, 20, "All"] // change per page values here
-//                ],
                 // set the initial value
                 "iDisplayLength": 5,
-                "bAutoWidth":false,
+                "bAutoWidth": false,
+                "bDestroy": true,
                 "bLengthChange": false,
                 "bFilter": false,
                 "bServerSide": true,
@@ -66,71 +484,8 @@
                         "sFirst": "首页"
                     }
                 },
-                "aoColumns": [
-                    {
-                        "mDataProp": "id"
-                    },
-                    {
-                        "mDataProp": "markerId"
-                    },
-                    {
-                        "mDataProp": "markerName"
-
-                    },
-                    {
-                        "mDataProp": "featureName"
-
-                    },
-                    {
-                        "mDataProp": "lineName"
-
-                    },
-                    {
-                        "mDataProp": "markerObjectType"
-
-                    },
-                    {
-                        "mDataProp": "depth"
-
-                    },
-                    {
-                        "mDataProp": "mileage"
-
-                    },
-                    {
-                        "mDataProp": "mileage2"
-
-                    },
-                    {
-                        "mDataProp": "createTime"
-
-                    },
-                    {
-                        "mDataProp": "creator"
-
-                    },
-                    {
-                        "mDataProp": "memo"
-
-                    },{
-                        "mDataProp" : "btnEdit",
-                        "sWidth" : '55px'
-                    }, {
-                        "mDataProp" : "btnDelete",
-                        "sWidth" : '55px'
-                    }
-                ],
-                "aoColumnDefs": [
-                    {
-                        'bSortable': false,
-                        'bVisible': false,
-                        'aTargets': [0]
-                    },
-                    {
-                        'bSortable': false,
-                        'aTargets': [1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13]
-                    }
-                ]
+                "aoColumns": aoColums,
+                "aoColumnDefs": aoColumnDefs
             });
 
 
@@ -213,13 +568,12 @@
 
             });
             $('#searchMarker').bind('click', function (e) {
-                Marker.markerName = $("#markerName").val();
-                Marker.featureId = $("#select_area").val()?$("#select_area").val():null;
-                Marker.lineId = $("#select_line").val()?$("#select_line").val():null;
-                Marker.mileage = $("#mileStone1").val();
-                Marker.mileage2 = $("#mileStone2").val();
-                Marker.creator = $("#creator").val();
+                Marker = {};
+                Marker.recordType=$("#markerObjectType").val();
+                Marker.road = $("#road").val();
+                Marker.ownerComp = $("#ownerComp").val();
                 Marker.memo = $("#memo").val();
+                Marker.creator = $("#creator").val();
                 Marker.sDate = $("#txt_begin_day").val();
                 Marker.eDate = $("#txt_end_day").val();
                 oTable.fnDraw(true);
@@ -228,31 +582,18 @@
 
             });
             $('#exp').live('click', function (e) {
-                Marker.markerName = $("#markerName").val();
-                Marker.featureId = $("#select_area").val()?$("#select_area").val():null;
-                Marker.lineId = $("#select_line").val()?$("#select_line").val():null;
-                Marker.mileage = $("#mileStone1").val();
-                Marker.mileage2 = $("#mileStone2").val();
-                Marker.creator = $("#creator").val();
+                Marker = {};
+                Marker.recordType = $("#markerObjectType").val();
+                Marker.road = $("#road").val();
+                Marker.ownerComp = $("#ownerComp").val();
                 Marker.memo = $("#memo").val();
+                Marker.creator = $("#creator").val();
                 Marker.sDate = $("#txt_begin_day").val();
                 Marker.eDate = $("#txt_end_day").val();
-                location.href = $('#context').val() + "/marker/export.do?strMarkerDto="+JSON.stringify(Marker);
+                location.href = $('#context').val() + "/marker/export.do?strMarkerDto=" + JSON.stringify(Marker);
 
             });
 
-        },
-
-        initForm: function () {
-
-            $('#select_area').select2({
-                placeholder: "片区选择",
-                allowClear: false
-            });
-            $('#select_line').select2({
-                placeholder: "线路选择",
-                allowClear: false
-            });
         }
     };
 }();
\ No newline at end of file