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 8b9af79..08a290e 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -344,22 +344,6 @@
         result.setConstructTime(doNullChange(marker.getConstructTime()));
         result.setRecordType(marker.getRecordType());
         result.setRoad(doNullChange(marker.getRoad()));
-//        result.setMileage(doNullChange(marker.getMileage()));
-//        result.setMileage2(doNullChange(marker.getMileage2()));
-//
-//        result.setMarkerObjectName(doNullChange(marker.getMarkerObjectName()));
-//        result.setMarkerName(doNullChange(marker.getMarkerName()));
-//        result.setDesignComp(doNullChange(marker.getDesignComp()));
-//        result.setWorkComp(doNullChange(marker.getWorkComp()));
-//        if(null!=marker.getBelongFeature()){
-//            result.setFeatureName(marker.getBelongFeature().getFeatureName());
-//            result.setFeatureId(marker.getBelongFeature().getId());
-//        }
-//        if(null!=marker.getBelongLine()){
-//            result.setLineName(marker.getBelongLine().getFeatureName());
-//            result.setLineId(marker.getBelongLine().getId());
-//        }
-
         return result;
     }
 

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 8b9af79..08a290e 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -344,22 +344,6 @@
         result.setConstructTime(doNullChange(marker.getConstructTime()));
         result.setRecordType(marker.getRecordType());
         result.setRoad(doNullChange(marker.getRoad()));
-//        result.setMileage(doNullChange(marker.getMileage()));
-//        result.setMileage2(doNullChange(marker.getMileage2()));
-//
-//        result.setMarkerObjectName(doNullChange(marker.getMarkerObjectName()));
-//        result.setMarkerName(doNullChange(marker.getMarkerName()));
-//        result.setDesignComp(doNullChange(marker.getDesignComp()));
-//        result.setWorkComp(doNullChange(marker.getWorkComp()));
-//        if(null!=marker.getBelongFeature()){
-//            result.setFeatureName(marker.getBelongFeature().getFeatureName());
-//            result.setFeatureId(marker.getBelongFeature().getId());
-//        }
-//        if(null!=marker.getBelongLine()){
-//            result.setLineName(marker.getBelongLine().getFeatureName());
-//            result.setLineId(marker.getBelongLine().getId());
-//        }
-
         return result;
     }
 
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 db7b925..c9c15de 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -70,27 +70,13 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-//            if (markerDto1.getFeatureId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getFeatureId());
-//                features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//            }
-//
-//            if (markerDto1.getLineId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getLineId());
-//                lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMarkerName())) {
-//                criteria1.add(Restrictions.like("markerName", markerDto1.getMarkerName(), MatchMode.ANYWHERE));
-//            }
+
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage())) {
-//                criteria1.add(Restrictions.like("mileage", markerDto1.getMileage(), MatchMode.ANYWHERE));
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage2())) {
-//                criteria1.add(Restrictions.like("mileage2", markerDto1.getMileage2(), MatchMode.ANYWHERE));
-//            }
+            if (StringUtils.isNotBlank(markerDto1.getRoad())) {
+                criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }
@@ -112,12 +98,7 @@
                     e.printStackTrace();
                 }
             }
-            if (CollectionUtils.isNotEmpty(features)) {
-                criteria1.add(Restrictions.in("belongFeature", features));
-            }
-            if (CollectionUtils.isNotEmpty(lines)) {
-                criteria1.add(Restrictions.in("belongLine", lines));
-            }
+
         }
         criteria1.add(Restrictions.eq("companyId",companyId));
         criteria1.add(Restrictions.eq("isValid", 1));
@@ -209,6 +190,12 @@
         }
     }
 
+    /**
+     * 新增标识器 8-9
+     * @param markers
+     * @param companyId
+     * @return
+     */
     public boolean batchSave(List<MarkerDto> markers, Long companyId) {
         if (CollectionUtils.isEmpty(markers) || companyId == null) {
             return false;
@@ -216,25 +203,22 @@
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
             marker.setMarkerId(markerDto.getMarkerId());
-//            marker.setMarkerName(markerDto.getMarkerName());
-//            if (!markerDto.getLineId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//                marker.setBelongLine(feature);
-//            }
-//            if (!markerDto.getFeatureId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//                marker.setBelongFeature(feature);
-//            }
+            marker.setRoad(markerDto.getRoad());
+            marker.setLayStyle(markerDto.getLayStyle());
+            marker.setBelowType(markerDto.getBelowType());
+            marker.setBelowDepth(markerDto.getBelowDepth());
+            marker.setBelowMaterial(markerDto.getBelowMaterial());
+            marker.setBelowDiameter(markerDto.getBelowDiameter());
+            marker.setConstructTime(markerDto.getConstructTime());
+            marker.setMarkerObjectId(markerDto.getMarkerObjectId());
+            marker.setRecordType(markerDto.getRecordType());
+            marker.setMarkerType(markerDto.getMarkerType());
             marker.setMarkerObjectType(markerDto.getMarkerObjectType());
             marker.setDepth(markerDto.getDepth());
             marker.setMarkerDepth(markerDto.getMarkerDepth());
-//            marker.setMileage(markerDto.getMileage());
-//            marker.setMileage2(markerDto.getMileage2());
             marker.setCreator(markerDto.getCreator());
             marker.setLatitude(markerDto.getLatitude());
             marker.setLongitude(markerDto.getLongitude());
-            marker.setOwnerComp(markerDto.getOwnerComp());
-//            marker.setMarkerObjectName(markerDto.getMarkerObjectName());
             marker.setMemo(markerDto.getMemo());
             marker.setOwnerComp(markerDto.getOwnerComp());
             marker.setPipeDiameter(markerDto.getPipeDiameter());
@@ -292,40 +276,18 @@
      * @return
      */
     public List<MarkerDto> getMarkerDtosByCondition(MarkerDto markerDto, Company company) {
-//        List<Feature> features = null;
-//        if (markerDto.getFeatureId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//            features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//        }
-//        List<Feature> lines = null;
-//        if (markerDto.getLineId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//            lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//        }
+
         Criteria criteria1 = this.getSession().createCriteria(Marker.class);
         criteria1.add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("companyId", company.getId()));
-
-//        if (StringUtils.isNotBlank(markerDto.getMarkerName())) {
-//            criteria1.add(Restrictions.like("markerName", markerDto.getMarkerName(), MatchMode.ANYWHERE));
-//        }
         if (StringUtils.isNotBlank(markerDto.getMemo())) {
             criteria1.add(Restrictions.like("memo", markerDto.getMemo(), MatchMode.ANYWHERE));
         }
-//        if (StringUtils.isNotBlank(markerDto.getMileage())) {
-//            criteria1.add(Restrictions.like("mileage", markerDto.getMileage(), MatchMode.ANYWHERE));
-//        }
-//        if (StringUtils.isNotBlank(markerDto.getMileage2())) {
-//            criteria1.add(Restrictions.like("mileage2", markerDto.getMileage2(), MatchMode.ANYWHERE));
-//        }
+        if (StringUtils.isNotBlank(markerDto.getRoad())) {
+            criteria1.add(Restrictions.like("road", markerDto.getRoad(), MatchMode.ANYWHERE));
+        }
         if (StringUtils.isNotBlank(markerDto.getCreator())) {
             criteria1.add(Restrictions.like("creator", markerDto.getCreator(), MatchMode.ANYWHERE));
         }
-//        if (CollectionUtils.isNotEmpty(features)) {
-//            criteria1.add(Restrictions.in("belongFeature", features));
-//        }
-//        if (CollectionUtils.isNotEmpty(lines)) {
-//            criteria1.add(Restrictions.in("belongLine", lines));
-//        }
         if (StringUtils.isNotBlank(markerDto.getsDate())) {
             try {
                 criteria1.add(Restrictions.ge("createTime", DateUtils.sdf1.parse(markerDto.getsDate())));

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 8b9af79..08a290e 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -344,22 +344,6 @@
         result.setConstructTime(doNullChange(marker.getConstructTime()));
         result.setRecordType(marker.getRecordType());
         result.setRoad(doNullChange(marker.getRoad()));
-//        result.setMileage(doNullChange(marker.getMileage()));
-//        result.setMileage2(doNullChange(marker.getMileage2()));
-//
-//        result.setMarkerObjectName(doNullChange(marker.getMarkerObjectName()));
-//        result.setMarkerName(doNullChange(marker.getMarkerName()));
-//        result.setDesignComp(doNullChange(marker.getDesignComp()));
-//        result.setWorkComp(doNullChange(marker.getWorkComp()));
-//        if(null!=marker.getBelongFeature()){
-//            result.setFeatureName(marker.getBelongFeature().getFeatureName());
-//            result.setFeatureId(marker.getBelongFeature().getId());
-//        }
-//        if(null!=marker.getBelongLine()){
-//            result.setLineName(marker.getBelongLine().getFeatureName());
-//            result.setLineId(marker.getBelongLine().getId());
-//        }
-
         return result;
     }
 
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 db7b925..c9c15de 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -70,27 +70,13 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-//            if (markerDto1.getFeatureId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getFeatureId());
-//                features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//            }
-//
-//            if (markerDto1.getLineId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getLineId());
-//                lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMarkerName())) {
-//                criteria1.add(Restrictions.like("markerName", markerDto1.getMarkerName(), MatchMode.ANYWHERE));
-//            }
+
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage())) {
-//                criteria1.add(Restrictions.like("mileage", markerDto1.getMileage(), MatchMode.ANYWHERE));
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage2())) {
-//                criteria1.add(Restrictions.like("mileage2", markerDto1.getMileage2(), MatchMode.ANYWHERE));
-//            }
+            if (StringUtils.isNotBlank(markerDto1.getRoad())) {
+                criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }
@@ -112,12 +98,7 @@
                     e.printStackTrace();
                 }
             }
-            if (CollectionUtils.isNotEmpty(features)) {
-                criteria1.add(Restrictions.in("belongFeature", features));
-            }
-            if (CollectionUtils.isNotEmpty(lines)) {
-                criteria1.add(Restrictions.in("belongLine", lines));
-            }
+
         }
         criteria1.add(Restrictions.eq("companyId",companyId));
         criteria1.add(Restrictions.eq("isValid", 1));
@@ -209,6 +190,12 @@
         }
     }
 
+    /**
+     * 新增标识器 8-9
+     * @param markers
+     * @param companyId
+     * @return
+     */
     public boolean batchSave(List<MarkerDto> markers, Long companyId) {
         if (CollectionUtils.isEmpty(markers) || companyId == null) {
             return false;
@@ -216,25 +203,22 @@
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
             marker.setMarkerId(markerDto.getMarkerId());
-//            marker.setMarkerName(markerDto.getMarkerName());
-//            if (!markerDto.getLineId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//                marker.setBelongLine(feature);
-//            }
-//            if (!markerDto.getFeatureId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//                marker.setBelongFeature(feature);
-//            }
+            marker.setRoad(markerDto.getRoad());
+            marker.setLayStyle(markerDto.getLayStyle());
+            marker.setBelowType(markerDto.getBelowType());
+            marker.setBelowDepth(markerDto.getBelowDepth());
+            marker.setBelowMaterial(markerDto.getBelowMaterial());
+            marker.setBelowDiameter(markerDto.getBelowDiameter());
+            marker.setConstructTime(markerDto.getConstructTime());
+            marker.setMarkerObjectId(markerDto.getMarkerObjectId());
+            marker.setRecordType(markerDto.getRecordType());
+            marker.setMarkerType(markerDto.getMarkerType());
             marker.setMarkerObjectType(markerDto.getMarkerObjectType());
             marker.setDepth(markerDto.getDepth());
             marker.setMarkerDepth(markerDto.getMarkerDepth());
-//            marker.setMileage(markerDto.getMileage());
-//            marker.setMileage2(markerDto.getMileage2());
             marker.setCreator(markerDto.getCreator());
             marker.setLatitude(markerDto.getLatitude());
             marker.setLongitude(markerDto.getLongitude());
-            marker.setOwnerComp(markerDto.getOwnerComp());
-//            marker.setMarkerObjectName(markerDto.getMarkerObjectName());
             marker.setMemo(markerDto.getMemo());
             marker.setOwnerComp(markerDto.getOwnerComp());
             marker.setPipeDiameter(markerDto.getPipeDiameter());
@@ -292,40 +276,18 @@
      * @return
      */
     public List<MarkerDto> getMarkerDtosByCondition(MarkerDto markerDto, Company company) {
-//        List<Feature> features = null;
-//        if (markerDto.getFeatureId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//            features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//        }
-//        List<Feature> lines = null;
-//        if (markerDto.getLineId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//            lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//        }
+
         Criteria criteria1 = this.getSession().createCriteria(Marker.class);
         criteria1.add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("companyId", company.getId()));
-
-//        if (StringUtils.isNotBlank(markerDto.getMarkerName())) {
-//            criteria1.add(Restrictions.like("markerName", markerDto.getMarkerName(), MatchMode.ANYWHERE));
-//        }
         if (StringUtils.isNotBlank(markerDto.getMemo())) {
             criteria1.add(Restrictions.like("memo", markerDto.getMemo(), MatchMode.ANYWHERE));
         }
-//        if (StringUtils.isNotBlank(markerDto.getMileage())) {
-//            criteria1.add(Restrictions.like("mileage", markerDto.getMileage(), MatchMode.ANYWHERE));
-//        }
-//        if (StringUtils.isNotBlank(markerDto.getMileage2())) {
-//            criteria1.add(Restrictions.like("mileage2", markerDto.getMileage2(), MatchMode.ANYWHERE));
-//        }
+        if (StringUtils.isNotBlank(markerDto.getRoad())) {
+            criteria1.add(Restrictions.like("road", markerDto.getRoad(), MatchMode.ANYWHERE));
+        }
         if (StringUtils.isNotBlank(markerDto.getCreator())) {
             criteria1.add(Restrictions.like("creator", markerDto.getCreator(), MatchMode.ANYWHERE));
         }
-//        if (CollectionUtils.isNotEmpty(features)) {
-//            criteria1.add(Restrictions.in("belongFeature", features));
-//        }
-//        if (CollectionUtils.isNotEmpty(lines)) {
-//            criteria1.add(Restrictions.in("belongLine", lines));
-//        }
         if (StringUtils.isNotBlank(markerDto.getsDate())) {
             try {
                 criteria1.add(Restrictions.ge("createTime", DateUtils.sdf1.parse(markerDto.getsDate())));
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index f14d848..659fa3e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -95,12 +95,8 @@
         if (null != id) {
             markerDto = markerManager.getMarkerById(id);
         }
-        User currentUser = (User) session.getAttribute(StringUtils.SYS_USER);
-//        List<FeatureDto> featuresDtos = featureManager.getFeaturesByUser(1, currentUser);
-//        List<FeatureDto> linesDtos = featureManager.getFeaturesByUser(2, currentUser);
+
         model.addAttribute("model", markerDto);
-//        model.addAttribute("features", featuresDtos);
-//        model.addAttribute("lines", linesDtos);
         return "marker/marker-info-edit-new";
     }
 
@@ -113,22 +109,17 @@
             return map;
         }
         if (markerDto.getId() == null) {//新增
-            /*User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-            marker.setValid(1);
-            marker.setCompanyId(user.getCompany().getId());
-            markerManager.saveMarker(marker);
-            map.put("success", true);
-            map.put("message", "新增成功");*/
+//            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+//            marker.setValid(1);
+//            marker.setCompanyId(user.getCompany().getId());
+//            markerManager.saveMarker(marker);
+//            map.put("success", true);
+//            map.put("message", "新增成功");
         } else {
             try {
                 Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {
-//                    marker0.setMarkerName(markerDto.getMarkerName());
-//                    marker0.setBelongFeature(featureManager.getFeatureById(markerDto.getFeatureId()));
-//                    marker0.setBelongLine(featureManager.getFeatureById(markerDto.getLineId()));
+                if (null != marker0) {//编辑marker,下面要增加页面展示项
                     marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-//                    marker0.setMileage(markerDto.getMileage());
-//                    marker0.setMileage2(markerDto.getMileage2());
                     markerManager.saveMarker(marker0);
                 }
                 map.put("success", true);
@@ -262,7 +253,7 @@
         return map;
     }
 
-    @RequestMapping("getMarkerIdList")
+    @RequestMapping("getMarkerListByCondition")
     @ResponseBody
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -294,19 +285,6 @@
         } else {
             markerDtos = markerManager.getAllPoint(user);
         }
-
-//        TableModel tableModel = new TableModel();
-//        tableModel.setName("marker info");
-//        tableModel.addHeaders("id", "markerName", "markerId", "markerType", "height", "longitude", "latitude",
-//                "depth", "markerObjectId", "markerObjectType", "markerObjectName", "ownerComp", "designComp", "workComp", "memo");
-//        tableModel.setData(markerDtos);
-//        response.setCharacterEncoding("UTF-8");
-//        try {
-//            exportor.export(request, response, tableModel);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-
         TableModel tableModel = new TableModel();
         tableModel.setName("marker info");
         tableModel.addHeaders("id", "markerId", "markerName", "featureId", "lineId", "depth", "mileage",

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 8b9af79..08a290e 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -344,22 +344,6 @@
         result.setConstructTime(doNullChange(marker.getConstructTime()));
         result.setRecordType(marker.getRecordType());
         result.setRoad(doNullChange(marker.getRoad()));
-//        result.setMileage(doNullChange(marker.getMileage()));
-//        result.setMileage2(doNullChange(marker.getMileage2()));
-//
-//        result.setMarkerObjectName(doNullChange(marker.getMarkerObjectName()));
-//        result.setMarkerName(doNullChange(marker.getMarkerName()));
-//        result.setDesignComp(doNullChange(marker.getDesignComp()));
-//        result.setWorkComp(doNullChange(marker.getWorkComp()));
-//        if(null!=marker.getBelongFeature()){
-//            result.setFeatureName(marker.getBelongFeature().getFeatureName());
-//            result.setFeatureId(marker.getBelongFeature().getId());
-//        }
-//        if(null!=marker.getBelongLine()){
-//            result.setLineName(marker.getBelongLine().getFeatureName());
-//            result.setLineId(marker.getBelongLine().getId());
-//        }
-
         return result;
     }
 
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 db7b925..c9c15de 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -70,27 +70,13 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-//            if (markerDto1.getFeatureId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getFeatureId());
-//                features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//            }
-//
-//            if (markerDto1.getLineId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getLineId());
-//                lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMarkerName())) {
-//                criteria1.add(Restrictions.like("markerName", markerDto1.getMarkerName(), MatchMode.ANYWHERE));
-//            }
+
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage())) {
-//                criteria1.add(Restrictions.like("mileage", markerDto1.getMileage(), MatchMode.ANYWHERE));
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage2())) {
-//                criteria1.add(Restrictions.like("mileage2", markerDto1.getMileage2(), MatchMode.ANYWHERE));
-//            }
+            if (StringUtils.isNotBlank(markerDto1.getRoad())) {
+                criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }
@@ -112,12 +98,7 @@
                     e.printStackTrace();
                 }
             }
-            if (CollectionUtils.isNotEmpty(features)) {
-                criteria1.add(Restrictions.in("belongFeature", features));
-            }
-            if (CollectionUtils.isNotEmpty(lines)) {
-                criteria1.add(Restrictions.in("belongLine", lines));
-            }
+
         }
         criteria1.add(Restrictions.eq("companyId",companyId));
         criteria1.add(Restrictions.eq("isValid", 1));
@@ -209,6 +190,12 @@
         }
     }
 
+    /**
+     * 新增标识器 8-9
+     * @param markers
+     * @param companyId
+     * @return
+     */
     public boolean batchSave(List<MarkerDto> markers, Long companyId) {
         if (CollectionUtils.isEmpty(markers) || companyId == null) {
             return false;
@@ -216,25 +203,22 @@
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
             marker.setMarkerId(markerDto.getMarkerId());
-//            marker.setMarkerName(markerDto.getMarkerName());
-//            if (!markerDto.getLineId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//                marker.setBelongLine(feature);
-//            }
-//            if (!markerDto.getFeatureId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//                marker.setBelongFeature(feature);
-//            }
+            marker.setRoad(markerDto.getRoad());
+            marker.setLayStyle(markerDto.getLayStyle());
+            marker.setBelowType(markerDto.getBelowType());
+            marker.setBelowDepth(markerDto.getBelowDepth());
+            marker.setBelowMaterial(markerDto.getBelowMaterial());
+            marker.setBelowDiameter(markerDto.getBelowDiameter());
+            marker.setConstructTime(markerDto.getConstructTime());
+            marker.setMarkerObjectId(markerDto.getMarkerObjectId());
+            marker.setRecordType(markerDto.getRecordType());
+            marker.setMarkerType(markerDto.getMarkerType());
             marker.setMarkerObjectType(markerDto.getMarkerObjectType());
             marker.setDepth(markerDto.getDepth());
             marker.setMarkerDepth(markerDto.getMarkerDepth());
-//            marker.setMileage(markerDto.getMileage());
-//            marker.setMileage2(markerDto.getMileage2());
             marker.setCreator(markerDto.getCreator());
             marker.setLatitude(markerDto.getLatitude());
             marker.setLongitude(markerDto.getLongitude());
-            marker.setOwnerComp(markerDto.getOwnerComp());
-//            marker.setMarkerObjectName(markerDto.getMarkerObjectName());
             marker.setMemo(markerDto.getMemo());
             marker.setOwnerComp(markerDto.getOwnerComp());
             marker.setPipeDiameter(markerDto.getPipeDiameter());
@@ -292,40 +276,18 @@
      * @return
      */
     public List<MarkerDto> getMarkerDtosByCondition(MarkerDto markerDto, Company company) {
-//        List<Feature> features = null;
-//        if (markerDto.getFeatureId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//            features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//        }
-//        List<Feature> lines = null;
-//        if (markerDto.getLineId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//            lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//        }
+
         Criteria criteria1 = this.getSession().createCriteria(Marker.class);
         criteria1.add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("companyId", company.getId()));
-
-//        if (StringUtils.isNotBlank(markerDto.getMarkerName())) {
-//            criteria1.add(Restrictions.like("markerName", markerDto.getMarkerName(), MatchMode.ANYWHERE));
-//        }
         if (StringUtils.isNotBlank(markerDto.getMemo())) {
             criteria1.add(Restrictions.like("memo", markerDto.getMemo(), MatchMode.ANYWHERE));
         }
-//        if (StringUtils.isNotBlank(markerDto.getMileage())) {
-//            criteria1.add(Restrictions.like("mileage", markerDto.getMileage(), MatchMode.ANYWHERE));
-//        }
-//        if (StringUtils.isNotBlank(markerDto.getMileage2())) {
-//            criteria1.add(Restrictions.like("mileage2", markerDto.getMileage2(), MatchMode.ANYWHERE));
-//        }
+        if (StringUtils.isNotBlank(markerDto.getRoad())) {
+            criteria1.add(Restrictions.like("road", markerDto.getRoad(), MatchMode.ANYWHERE));
+        }
         if (StringUtils.isNotBlank(markerDto.getCreator())) {
             criteria1.add(Restrictions.like("creator", markerDto.getCreator(), MatchMode.ANYWHERE));
         }
-//        if (CollectionUtils.isNotEmpty(features)) {
-//            criteria1.add(Restrictions.in("belongFeature", features));
-//        }
-//        if (CollectionUtils.isNotEmpty(lines)) {
-//            criteria1.add(Restrictions.in("belongLine", lines));
-//        }
         if (StringUtils.isNotBlank(markerDto.getsDate())) {
             try {
                 criteria1.add(Restrictions.ge("createTime", DateUtils.sdf1.parse(markerDto.getsDate())));
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index f14d848..659fa3e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -95,12 +95,8 @@
         if (null != id) {
             markerDto = markerManager.getMarkerById(id);
         }
-        User currentUser = (User) session.getAttribute(StringUtils.SYS_USER);
-//        List<FeatureDto> featuresDtos = featureManager.getFeaturesByUser(1, currentUser);
-//        List<FeatureDto> linesDtos = featureManager.getFeaturesByUser(2, currentUser);
+
         model.addAttribute("model", markerDto);
-//        model.addAttribute("features", featuresDtos);
-//        model.addAttribute("lines", linesDtos);
         return "marker/marker-info-edit-new";
     }
 
@@ -113,22 +109,17 @@
             return map;
         }
         if (markerDto.getId() == null) {//新增
-            /*User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-            marker.setValid(1);
-            marker.setCompanyId(user.getCompany().getId());
-            markerManager.saveMarker(marker);
-            map.put("success", true);
-            map.put("message", "新增成功");*/
+//            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+//            marker.setValid(1);
+//            marker.setCompanyId(user.getCompany().getId());
+//            markerManager.saveMarker(marker);
+//            map.put("success", true);
+//            map.put("message", "新增成功");
         } else {
             try {
                 Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {
-//                    marker0.setMarkerName(markerDto.getMarkerName());
-//                    marker0.setBelongFeature(featureManager.getFeatureById(markerDto.getFeatureId()));
-//                    marker0.setBelongLine(featureManager.getFeatureById(markerDto.getLineId()));
+                if (null != marker0) {//编辑marker,下面要增加页面展示项
                     marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-//                    marker0.setMileage(markerDto.getMileage());
-//                    marker0.setMileage2(markerDto.getMileage2());
                     markerManager.saveMarker(marker0);
                 }
                 map.put("success", true);
@@ -262,7 +253,7 @@
         return map;
     }
 
-    @RequestMapping("getMarkerIdList")
+    @RequestMapping("getMarkerListByCondition")
     @ResponseBody
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -294,19 +285,6 @@
         } else {
             markerDtos = markerManager.getAllPoint(user);
         }
-
-//        TableModel tableModel = new TableModel();
-//        tableModel.setName("marker info");
-//        tableModel.addHeaders("id", "markerName", "markerId", "markerType", "height", "longitude", "latitude",
-//                "depth", "markerObjectId", "markerObjectType", "markerObjectName", "ownerComp", "designComp", "workComp", "memo");
-//        tableModel.setData(markerDtos);
-//        response.setCharacterEncoding("UTF-8");
-//        try {
-//            exportor.export(request, response, tableModel);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-
         TableModel tableModel = new TableModel();
         tableModel.setName("marker info");
         tableModel.addHeaders("id", "markerId", "markerName", "featureId", "lineId", "depth", "mileage",
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 5dc2788..bdabfe0 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -76,40 +76,40 @@
                         <div class="row-fluid">
                             <div class="span12">
 
+                                <%--<div class="span2">--%>
+                                    <%--<div class="controls">--%>
+                                        <%--<select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"--%>
+                                                <%--id="select_area">--%>
+                                            <%--<option value=""></option>--%>
+                                        <%--</select>--%>
+                                    <%--</div>--%>
+                                <%--</div>--%>
+
+                                <%--<div class="span2">--%>
+                                    <%--<div class="controls">--%>
+                                        <%--<select class="span12 select2_area" data-placeholder="所属线路" tabindex="2"--%>
+                                                <%--id="select_line">--%>
+                                            <%--<option value=""></option>--%>
+                                        <%--</select>--%>
+                                    <%--</div>--%>
+                                <%--</div>--%>
+
                                 <div class="span2">
-                                    <div class="controls">
-                                        <select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"
-                                                id="select_area">
-                                            <option value=""></option>
-                                        </select>
-                                    </div>
+                                    <input class="span12" type="text" id="roadCondition" class="m-wrap"
+                                           placeholder="所属道路">
                                 </div>
 
                                 <div class="span2">
-                                    <div class="controls">
-                                        <select class="span12 select2_area" data-placeholder="所属线路" tabindex="2"
-                                                id="select_line">
-                                            <option value=""></option>
-                                        </select>
-                                    </div>
+                                    <input class="span12" type="text" id="memoCondition" class="m-wrap" placeholder="备注">
                                 </div>
 
-                                <div class="span2">
-                                    <input class="span12" type="text" id="markerName" class="m-wrap"
-                                           placeholder="标识器名称">
-                                </div>
+                                <%--<div class="span1">--%>
+                                    <%--<input class="span12" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">--%>
+                                <%--</div>--%>
 
-                                <div class="span2">
-                                    <input class="span12" type="text" id="memo" class="m-wrap" placeholder="备注">
-                                </div>
-
-                                <div class="span1">
-                                    <input class="span12" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">
-                                </div>
-
-                                <div class="span1">
-                                    <input class="span12" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">
-                                </div>
+                                <%--<div class="span1">--%>
+                                    <%--<input class="span12" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">--%>
+                                <%--</div>--%>
 
                                 <div class="span2">
                                     <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询
@@ -118,24 +118,6 @@
 
                             </div>
                         </div>
-                        <%--<div class="row-fluid">--%>
-                        <%--<div class="span12">--%>
-
-                        <%--<div class="span3">--%>
-                        <%--<input type="text" id="markerName" class="m-wrap" placeholder="标识器名称">--%>
-                        <%--</div>--%>
-
-
-                        <%--<div class="span3">--%>
-                        <%--<input type="text" id="memo" class="m-wrap" placeholder="备注">--%>
-                        <%--</div>--%>
-                        <%--<div class="span3">--%>
-                        <%--<button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>--%>
-                        <%--</div>--%>
-
-                        <%--</div>--%>
-
-                        <%--</div>--%>
 
 
                     </form>
@@ -167,195 +149,252 @@
 <!--添加标识对话框-->
 <div id="addModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
-    <div class="modal-header">
+<div class="modal-header">
 
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
 
-        <h3>添加标识</h3>
-
-    </div>
-
-    <div class="modal-body">
-
-        <div class="portlet-body form">
-            <!-- BEGIN FORM-->
-            <form action="#" class="horizontal-form">
-                <!--TODO LIST：标识器录入菜单-->
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">所属区域</label>
-
-                            <div class="controls">
-                                <select data-placeholder="区域选择" data-with-diselect="1" class="" id="addselAra">
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">所属线路</label>
-
-                            <div class="controls">
-                                <select data-placeholder="所属线路" data-with-diselect="1" class="" id="addselLine">
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器编号</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addEmsID"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器名称</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="markerName1"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识类型</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addObjType"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">权属单位</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="company"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">安装人员</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="creator"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">管线埋设深度</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addDepth"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">里程1</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone3"/> 千米
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">&nbsp;&nbsp;</label>
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone31"/> 米
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">里程2</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone4"/> 千米
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">&nbsp;&nbsp;</label>
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone41"/> 米
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器埋深</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="markerDepth"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6">
-                        <div class="control-group">
-                            <label class="control-label">备注</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addMemo"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </form>
-            <!-- END FORM-->
-        </div>
-
-
-    </div>
-
-    <div class="modal-footer">
-
-        <button type="button" class="btn yellow" id="localize">定位</button>
-
-        <button type="button" class="btn green" id="resetEms">重置</button>
-
-    </div>
+    <h3>添加标识</h3>
 
 </div>
 
+<div class="modal-body">
+
+<div class="portlet-body form">
+<!-- BEGIN FORM-->
+<form action="#" class="horizontal-form">
+<!--TODO LIST：标识器录入菜单-->
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识对象类别</label>
+
+            <div class="controls">
+                <select data-placeholder="选择标识对象类别" data-with-diselect="1" class="" id="selectObjectType">
+                    <option value="1" selected>管线</option>
+                    <option value="2">管线附属物</option>
+                    <option value="3">管线特征点</option>
+                    <option value="4">交叉穿越点</option>
+                </select>
+            </div>
+        </div>
+    </div>
+    <%--</div>--%>
+    <%--<div class="row-fluid">--%>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeTypeLabel">管线种类</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerObjectType"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid up-pipe">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeDiameterLabel">管线直径</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeDiameter"/>毫米
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeMaterialLabel">管线材质</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeMaterial"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid below hidden">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管种类</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeType"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeDepth"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid below hidden">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管直径</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeDiameter"/>毫米
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管材料</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+
+    <%--</div>--%>
+
+    <%--<div class="row-fluid">--%>
+    <div class="span6">
+        <div class="control-group">
+            <label class="control-label" id="pipeDepthLabel">管线埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeDepth"/>
+            </div>
+        </div>
+    </div>
+        <div class="span6 pipeOnly">
+            <div class="control-group">
+                <label class="control-label">埋设方式</label>
+
+                <div class="controls">
+                    <input type="text" class="m-wrap" id="layStyle"/>
+                </div>
+            </div>
+        </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">所属道路</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="road"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">建设年代</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="constructTime"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">所属单位</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="ownerComp"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标示对象ID</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerObjectId"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识器ID</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerId"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标示器类型</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerType"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识器埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerDepth"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">安装人员</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="creator"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span12">
+        <div class="control-group">
+            <label class="control-label">备注</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="memo"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+</form>
+<!-- END FORM-->
+</div>
+
+
+</div>
+
+<div class="modal-footer">
+
+    <button type="button" class="btn yellow" id="localize">定位</button>
+
+    <button type="button" class="btn green" id="resetEms">重置</button>
+
+</div>
+
+</div>
 <!--上传对话框-->
 <div id="uploadModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 

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 8b9af79..08a290e 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -344,22 +344,6 @@
         result.setConstructTime(doNullChange(marker.getConstructTime()));
         result.setRecordType(marker.getRecordType());
         result.setRoad(doNullChange(marker.getRoad()));
-//        result.setMileage(doNullChange(marker.getMileage()));
-//        result.setMileage2(doNullChange(marker.getMileage2()));
-//
-//        result.setMarkerObjectName(doNullChange(marker.getMarkerObjectName()));
-//        result.setMarkerName(doNullChange(marker.getMarkerName()));
-//        result.setDesignComp(doNullChange(marker.getDesignComp()));
-//        result.setWorkComp(doNullChange(marker.getWorkComp()));
-//        if(null!=marker.getBelongFeature()){
-//            result.setFeatureName(marker.getBelongFeature().getFeatureName());
-//            result.setFeatureId(marker.getBelongFeature().getId());
-//        }
-//        if(null!=marker.getBelongLine()){
-//            result.setLineName(marker.getBelongLine().getFeatureName());
-//            result.setLineId(marker.getBelongLine().getId());
-//        }
-
         return result;
     }
 
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 db7b925..c9c15de 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -70,27 +70,13 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-//            if (markerDto1.getFeatureId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getFeatureId());
-//                features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//            }
-//
-//            if (markerDto1.getLineId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getLineId());
-//                lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMarkerName())) {
-//                criteria1.add(Restrictions.like("markerName", markerDto1.getMarkerName(), MatchMode.ANYWHERE));
-//            }
+
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage())) {
-//                criteria1.add(Restrictions.like("mileage", markerDto1.getMileage(), MatchMode.ANYWHERE));
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage2())) {
-//                criteria1.add(Restrictions.like("mileage2", markerDto1.getMileage2(), MatchMode.ANYWHERE));
-//            }
+            if (StringUtils.isNotBlank(markerDto1.getRoad())) {
+                criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }
@@ -112,12 +98,7 @@
                     e.printStackTrace();
                 }
             }
-            if (CollectionUtils.isNotEmpty(features)) {
-                criteria1.add(Restrictions.in("belongFeature", features));
-            }
-            if (CollectionUtils.isNotEmpty(lines)) {
-                criteria1.add(Restrictions.in("belongLine", lines));
-            }
+
         }
         criteria1.add(Restrictions.eq("companyId",companyId));
         criteria1.add(Restrictions.eq("isValid", 1));
@@ -209,6 +190,12 @@
         }
     }
 
+    /**
+     * 新增标识器 8-9
+     * @param markers
+     * @param companyId
+     * @return
+     */
     public boolean batchSave(List<MarkerDto> markers, Long companyId) {
         if (CollectionUtils.isEmpty(markers) || companyId == null) {
             return false;
@@ -216,25 +203,22 @@
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
             marker.setMarkerId(markerDto.getMarkerId());
-//            marker.setMarkerName(markerDto.getMarkerName());
-//            if (!markerDto.getLineId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//                marker.setBelongLine(feature);
-//            }
-//            if (!markerDto.getFeatureId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//                marker.setBelongFeature(feature);
-//            }
+            marker.setRoad(markerDto.getRoad());
+            marker.setLayStyle(markerDto.getLayStyle());
+            marker.setBelowType(markerDto.getBelowType());
+            marker.setBelowDepth(markerDto.getBelowDepth());
+            marker.setBelowMaterial(markerDto.getBelowMaterial());
+            marker.setBelowDiameter(markerDto.getBelowDiameter());
+            marker.setConstructTime(markerDto.getConstructTime());
+            marker.setMarkerObjectId(markerDto.getMarkerObjectId());
+            marker.setRecordType(markerDto.getRecordType());
+            marker.setMarkerType(markerDto.getMarkerType());
             marker.setMarkerObjectType(markerDto.getMarkerObjectType());
             marker.setDepth(markerDto.getDepth());
             marker.setMarkerDepth(markerDto.getMarkerDepth());
-//            marker.setMileage(markerDto.getMileage());
-//            marker.setMileage2(markerDto.getMileage2());
             marker.setCreator(markerDto.getCreator());
             marker.setLatitude(markerDto.getLatitude());
             marker.setLongitude(markerDto.getLongitude());
-            marker.setOwnerComp(markerDto.getOwnerComp());
-//            marker.setMarkerObjectName(markerDto.getMarkerObjectName());
             marker.setMemo(markerDto.getMemo());
             marker.setOwnerComp(markerDto.getOwnerComp());
             marker.setPipeDiameter(markerDto.getPipeDiameter());
@@ -292,40 +276,18 @@
      * @return
      */
     public List<MarkerDto> getMarkerDtosByCondition(MarkerDto markerDto, Company company) {
-//        List<Feature> features = null;
-//        if (markerDto.getFeatureId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//            features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//        }
-//        List<Feature> lines = null;
-//        if (markerDto.getLineId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//            lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//        }
+
         Criteria criteria1 = this.getSession().createCriteria(Marker.class);
         criteria1.add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("companyId", company.getId()));
-
-//        if (StringUtils.isNotBlank(markerDto.getMarkerName())) {
-//            criteria1.add(Restrictions.like("markerName", markerDto.getMarkerName(), MatchMode.ANYWHERE));
-//        }
         if (StringUtils.isNotBlank(markerDto.getMemo())) {
             criteria1.add(Restrictions.like("memo", markerDto.getMemo(), MatchMode.ANYWHERE));
         }
-//        if (StringUtils.isNotBlank(markerDto.getMileage())) {
-//            criteria1.add(Restrictions.like("mileage", markerDto.getMileage(), MatchMode.ANYWHERE));
-//        }
-//        if (StringUtils.isNotBlank(markerDto.getMileage2())) {
-//            criteria1.add(Restrictions.like("mileage2", markerDto.getMileage2(), MatchMode.ANYWHERE));
-//        }
+        if (StringUtils.isNotBlank(markerDto.getRoad())) {
+            criteria1.add(Restrictions.like("road", markerDto.getRoad(), MatchMode.ANYWHERE));
+        }
         if (StringUtils.isNotBlank(markerDto.getCreator())) {
             criteria1.add(Restrictions.like("creator", markerDto.getCreator(), MatchMode.ANYWHERE));
         }
-//        if (CollectionUtils.isNotEmpty(features)) {
-//            criteria1.add(Restrictions.in("belongFeature", features));
-//        }
-//        if (CollectionUtils.isNotEmpty(lines)) {
-//            criteria1.add(Restrictions.in("belongLine", lines));
-//        }
         if (StringUtils.isNotBlank(markerDto.getsDate())) {
             try {
                 criteria1.add(Restrictions.ge("createTime", DateUtils.sdf1.parse(markerDto.getsDate())));
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index f14d848..659fa3e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -95,12 +95,8 @@
         if (null != id) {
             markerDto = markerManager.getMarkerById(id);
         }
-        User currentUser = (User) session.getAttribute(StringUtils.SYS_USER);
-//        List<FeatureDto> featuresDtos = featureManager.getFeaturesByUser(1, currentUser);
-//        List<FeatureDto> linesDtos = featureManager.getFeaturesByUser(2, currentUser);
+
         model.addAttribute("model", markerDto);
-//        model.addAttribute("features", featuresDtos);
-//        model.addAttribute("lines", linesDtos);
         return "marker/marker-info-edit-new";
     }
 
@@ -113,22 +109,17 @@
             return map;
         }
         if (markerDto.getId() == null) {//新增
-            /*User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-            marker.setValid(1);
-            marker.setCompanyId(user.getCompany().getId());
-            markerManager.saveMarker(marker);
-            map.put("success", true);
-            map.put("message", "新增成功");*/
+//            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+//            marker.setValid(1);
+//            marker.setCompanyId(user.getCompany().getId());
+//            markerManager.saveMarker(marker);
+//            map.put("success", true);
+//            map.put("message", "新增成功");
         } else {
             try {
                 Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {
-//                    marker0.setMarkerName(markerDto.getMarkerName());
-//                    marker0.setBelongFeature(featureManager.getFeatureById(markerDto.getFeatureId()));
-//                    marker0.setBelongLine(featureManager.getFeatureById(markerDto.getLineId()));
+                if (null != marker0) {//编辑marker,下面要增加页面展示项
                     marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-//                    marker0.setMileage(markerDto.getMileage());
-//                    marker0.setMileage2(markerDto.getMileage2());
                     markerManager.saveMarker(marker0);
                 }
                 map.put("success", true);
@@ -262,7 +253,7 @@
         return map;
     }
 
-    @RequestMapping("getMarkerIdList")
+    @RequestMapping("getMarkerListByCondition")
     @ResponseBody
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -294,19 +285,6 @@
         } else {
             markerDtos = markerManager.getAllPoint(user);
         }
-
-//        TableModel tableModel = new TableModel();
-//        tableModel.setName("marker info");
-//        tableModel.addHeaders("id", "markerName", "markerId", "markerType", "height", "longitude", "latitude",
-//                "depth", "markerObjectId", "markerObjectType", "markerObjectName", "ownerComp", "designComp", "workComp", "memo");
-//        tableModel.setData(markerDtos);
-//        response.setCharacterEncoding("UTF-8");
-//        try {
-//            exportor.export(request, response, tableModel);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-
         TableModel tableModel = new TableModel();
         tableModel.setName("marker info");
         tableModel.addHeaders("id", "markerId", "markerName", "featureId", "lineId", "depth", "mileage",
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 5dc2788..bdabfe0 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -76,40 +76,40 @@
                         <div class="row-fluid">
                             <div class="span12">
 
+                                <%--<div class="span2">--%>
+                                    <%--<div class="controls">--%>
+                                        <%--<select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"--%>
+                                                <%--id="select_area">--%>
+                                            <%--<option value=""></option>--%>
+                                        <%--</select>--%>
+                                    <%--</div>--%>
+                                <%--</div>--%>
+
+                                <%--<div class="span2">--%>
+                                    <%--<div class="controls">--%>
+                                        <%--<select class="span12 select2_area" data-placeholder="所属线路" tabindex="2"--%>
+                                                <%--id="select_line">--%>
+                                            <%--<option value=""></option>--%>
+                                        <%--</select>--%>
+                                    <%--</div>--%>
+                                <%--</div>--%>
+
                                 <div class="span2">
-                                    <div class="controls">
-                                        <select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"
-                                                id="select_area">
-                                            <option value=""></option>
-                                        </select>
-                                    </div>
+                                    <input class="span12" type="text" id="roadCondition" class="m-wrap"
+                                           placeholder="所属道路">
                                 </div>
 
                                 <div class="span2">
-                                    <div class="controls">
-                                        <select class="span12 select2_area" data-placeholder="所属线路" tabindex="2"
-                                                id="select_line">
-                                            <option value=""></option>
-                                        </select>
-                                    </div>
+                                    <input class="span12" type="text" id="memoCondition" class="m-wrap" placeholder="备注">
                                 </div>
 
-                                <div class="span2">
-                                    <input class="span12" type="text" id="markerName" class="m-wrap"
-                                           placeholder="标识器名称">
-                                </div>
+                                <%--<div class="span1">--%>
+                                    <%--<input class="span12" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">--%>
+                                <%--</div>--%>
 
-                                <div class="span2">
-                                    <input class="span12" type="text" id="memo" class="m-wrap" placeholder="备注">
-                                </div>
-
-                                <div class="span1">
-                                    <input class="span12" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">
-                                </div>
-
-                                <div class="span1">
-                                    <input class="span12" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">
-                                </div>
+                                <%--<div class="span1">--%>
+                                    <%--<input class="span12" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">--%>
+                                <%--</div>--%>
 
                                 <div class="span2">
                                     <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询
@@ -118,24 +118,6 @@
 
                             </div>
                         </div>
-                        <%--<div class="row-fluid">--%>
-                        <%--<div class="span12">--%>
-
-                        <%--<div class="span3">--%>
-                        <%--<input type="text" id="markerName" class="m-wrap" placeholder="标识器名称">--%>
-                        <%--</div>--%>
-
-
-                        <%--<div class="span3">--%>
-                        <%--<input type="text" id="memo" class="m-wrap" placeholder="备注">--%>
-                        <%--</div>--%>
-                        <%--<div class="span3">--%>
-                        <%--<button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>--%>
-                        <%--</div>--%>
-
-                        <%--</div>--%>
-
-                        <%--</div>--%>
 
 
                     </form>
@@ -167,195 +149,252 @@
 <!--添加标识对话框-->
 <div id="addModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
-    <div class="modal-header">
+<div class="modal-header">
 
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
 
-        <h3>添加标识</h3>
-
-    </div>
-
-    <div class="modal-body">
-
-        <div class="portlet-body form">
-            <!-- BEGIN FORM-->
-            <form action="#" class="horizontal-form">
-                <!--TODO LIST：标识器录入菜单-->
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">所属区域</label>
-
-                            <div class="controls">
-                                <select data-placeholder="区域选择" data-with-diselect="1" class="" id="addselAra">
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">所属线路</label>
-
-                            <div class="controls">
-                                <select data-placeholder="所属线路" data-with-diselect="1" class="" id="addselLine">
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器编号</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addEmsID"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器名称</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="markerName1"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识类型</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addObjType"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">权属单位</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="company"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">安装人员</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="creator"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">管线埋设深度</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addDepth"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">里程1</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone3"/> 千米
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">&nbsp;&nbsp;</label>
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone31"/> 米
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">里程2</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone4"/> 千米
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">&nbsp;&nbsp;</label>
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone41"/> 米
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器埋深</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="markerDepth"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6">
-                        <div class="control-group">
-                            <label class="control-label">备注</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addMemo"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </form>
-            <!-- END FORM-->
-        </div>
-
-
-    </div>
-
-    <div class="modal-footer">
-
-        <button type="button" class="btn yellow" id="localize">定位</button>
-
-        <button type="button" class="btn green" id="resetEms">重置</button>
-
-    </div>
+    <h3>添加标识</h3>
 
 </div>
 
+<div class="modal-body">
+
+<div class="portlet-body form">
+<!-- BEGIN FORM-->
+<form action="#" class="horizontal-form">
+<!--TODO LIST：标识器录入菜单-->
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识对象类别</label>
+
+            <div class="controls">
+                <select data-placeholder="选择标识对象类别" data-with-diselect="1" class="" id="selectObjectType">
+                    <option value="1" selected>管线</option>
+                    <option value="2">管线附属物</option>
+                    <option value="3">管线特征点</option>
+                    <option value="4">交叉穿越点</option>
+                </select>
+            </div>
+        </div>
+    </div>
+    <%--</div>--%>
+    <%--<div class="row-fluid">--%>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeTypeLabel">管线种类</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerObjectType"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid up-pipe">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeDiameterLabel">管线直径</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeDiameter"/>毫米
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeMaterialLabel">管线材质</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeMaterial"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid below hidden">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管种类</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeType"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeDepth"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid below hidden">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管直径</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeDiameter"/>毫米
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管材料</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+
+    <%--</div>--%>
+
+    <%--<div class="row-fluid">--%>
+    <div class="span6">
+        <div class="control-group">
+            <label class="control-label" id="pipeDepthLabel">管线埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeDepth"/>
+            </div>
+        </div>
+    </div>
+        <div class="span6 pipeOnly">
+            <div class="control-group">
+                <label class="control-label">埋设方式</label>
+
+                <div class="controls">
+                    <input type="text" class="m-wrap" id="layStyle"/>
+                </div>
+            </div>
+        </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">所属道路</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="road"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">建设年代</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="constructTime"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">所属单位</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="ownerComp"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标示对象ID</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerObjectId"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识器ID</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerId"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标示器类型</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerType"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识器埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerDepth"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">安装人员</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="creator"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span12">
+        <div class="control-group">
+            <label class="control-label">备注</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="memo"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+</form>
+<!-- END FORM-->
+</div>
+
+
+</div>
+
+<div class="modal-footer">
+
+    <button type="button" class="btn yellow" id="localize">定位</button>
+
+    <button type="button" class="btn green" id="resetEms">重置</button>
+
+</div>
+
+</div>
 <!--上传对话框-->
 <div id="uploadModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
diff --git a/src/main/webapp/s/app/ems/EMSBean.js b/src/main/webapp/s/app/ems/EMSBean.js
index 7a3ab73..9503c5c 100644
--- a/src/main/webapp/s/app/ems/EMSBean.js
+++ b/src/main/webapp/s/app/ems/EMSBean.js
@@ -1,26 +1,28 @@
+EMSBean = function (markerObjectType,pipeMaterial,pipeDiameter, layStyle, depth, belowType, belowDepth, belowDiameter, belowMaterial, road,
+                    constructTime, ownerComp, markerObjectId, markerId, markerType, markerDepth, creator, createTime, memo, lat, long, recordType,id) {
 
-EMSBean = function(markerId,markerName,lat,long, depth,ownerComp,createTime,
-                   markerObjectType,markerObjectName,featureId,lineId,
-                   creator,mileStone1,mileStone2,memo,id,featureName,lineName,markerDepth) {
-
+    this.markerObjectType = markerObjectType;
+    this.pipeMaterial = pipeMaterial;
+    this.pipeDiameter = pipeDiameter;
+    this.layStyle = layStyle;
+    this.depth = depth;
+    this.belowType = belowType;
+    this.belowDepth = belowDepth;
+    this.belowDiameter = belowDiameter
+    this.belowMaterial = belowMaterial;
+    this.road = road;
+    this.constructTime = constructTime;
+    this.ownerComp = ownerComp;
+    this.markerObjectId = markerObjectId;
     this.markerId = markerId;
-    this.markerName = markerName;
+    this.markerType = markerType;
+    this.markerDepth = markerDepth;
+    this.creator = creator;
+    this.createTime = createTime;
+    this.memo = memo;
     this.latitude = lat;
     this.longitude = long;
-    this.depth = depth;
-    this.ownerComp = ownerComp;
-    this.createTime = createTime;
-    this.markerObjectType = markerObjectType;
-    this.markerObjectName = markerObjectName;
-    this.id=id;
-    this.featureId = featureId;
-    this.lineId=lineId;
-    this.creator=creator;
-    this.mileage=mileStone1;
-    this.mileage2=mileStone2;
-    this.memo = memo;
-    this.featureName= featureName;
-    this.lineName=lineName;
-    this.markerDepth = markerDepth;
+    this.recordType = recordType;
+    this.id = id;
 
 };

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 8b9af79..08a290e 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -344,22 +344,6 @@
         result.setConstructTime(doNullChange(marker.getConstructTime()));
         result.setRecordType(marker.getRecordType());
         result.setRoad(doNullChange(marker.getRoad()));
-//        result.setMileage(doNullChange(marker.getMileage()));
-//        result.setMileage2(doNullChange(marker.getMileage2()));
-//
-//        result.setMarkerObjectName(doNullChange(marker.getMarkerObjectName()));
-//        result.setMarkerName(doNullChange(marker.getMarkerName()));
-//        result.setDesignComp(doNullChange(marker.getDesignComp()));
-//        result.setWorkComp(doNullChange(marker.getWorkComp()));
-//        if(null!=marker.getBelongFeature()){
-//            result.setFeatureName(marker.getBelongFeature().getFeatureName());
-//            result.setFeatureId(marker.getBelongFeature().getId());
-//        }
-//        if(null!=marker.getBelongLine()){
-//            result.setLineName(marker.getBelongLine().getFeatureName());
-//            result.setLineId(marker.getBelongLine().getId());
-//        }
-
         return result;
     }
 
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 db7b925..c9c15de 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -70,27 +70,13 @@
         if (null != markerDto) {
             MarkerDto markerDto1 = new Gson().fromJson(markerDto, MarkerDto.class);
 
-//            if (markerDto1.getFeatureId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getFeatureId());
-//                features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//            }
-//
-//            if (markerDto1.getLineId() != null) {
-//                Feature feature = featureManager.getFeatureById(markerDto1.getLineId());
-//                lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMarkerName())) {
-//                criteria1.add(Restrictions.like("markerName", markerDto1.getMarkerName(), MatchMode.ANYWHERE));
-//            }
+
             if (StringUtils.isNotBlank(markerDto1.getMemo())) {
                 criteria1.add(Restrictions.like("memo", markerDto1.getMemo(), MatchMode.ANYWHERE));
             }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage())) {
-//                criteria1.add(Restrictions.like("mileage", markerDto1.getMileage(), MatchMode.ANYWHERE));
-//            }
-//            if (StringUtils.isNotBlank(markerDto1.getMileage2())) {
-//                criteria1.add(Restrictions.like("mileage2", markerDto1.getMileage2(), MatchMode.ANYWHERE));
-//            }
+            if (StringUtils.isNotBlank(markerDto1.getRoad())) {
+                criteria1.add(Restrictions.like("road", markerDto1.getRoad(), MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(markerDto1.getCreator())) {
                 criteria1.add(Restrictions.like("creator", markerDto1.getCreator(), MatchMode.ANYWHERE));
             }
@@ -112,12 +98,7 @@
                     e.printStackTrace();
                 }
             }
-            if (CollectionUtils.isNotEmpty(features)) {
-                criteria1.add(Restrictions.in("belongFeature", features));
-            }
-            if (CollectionUtils.isNotEmpty(lines)) {
-                criteria1.add(Restrictions.in("belongLine", lines));
-            }
+
         }
         criteria1.add(Restrictions.eq("companyId",companyId));
         criteria1.add(Restrictions.eq("isValid", 1));
@@ -209,6 +190,12 @@
         }
     }
 
+    /**
+     * 新增标识器 8-9
+     * @param markers
+     * @param companyId
+     * @return
+     */
     public boolean batchSave(List<MarkerDto> markers, Long companyId) {
         if (CollectionUtils.isEmpty(markers) || companyId == null) {
             return false;
@@ -216,25 +203,22 @@
         for (MarkerDto markerDto : markers) {
             Marker marker = new Marker();
             marker.setMarkerId(markerDto.getMarkerId());
-//            marker.setMarkerName(markerDto.getMarkerName());
-//            if (!markerDto.getLineId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//                marker.setBelongLine(feature);
-//            }
-//            if (!markerDto.getFeatureId().equals(-1L)) {
-//                Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//                marker.setBelongFeature(feature);
-//            }
+            marker.setRoad(markerDto.getRoad());
+            marker.setLayStyle(markerDto.getLayStyle());
+            marker.setBelowType(markerDto.getBelowType());
+            marker.setBelowDepth(markerDto.getBelowDepth());
+            marker.setBelowMaterial(markerDto.getBelowMaterial());
+            marker.setBelowDiameter(markerDto.getBelowDiameter());
+            marker.setConstructTime(markerDto.getConstructTime());
+            marker.setMarkerObjectId(markerDto.getMarkerObjectId());
+            marker.setRecordType(markerDto.getRecordType());
+            marker.setMarkerType(markerDto.getMarkerType());
             marker.setMarkerObjectType(markerDto.getMarkerObjectType());
             marker.setDepth(markerDto.getDepth());
             marker.setMarkerDepth(markerDto.getMarkerDepth());
-//            marker.setMileage(markerDto.getMileage());
-//            marker.setMileage2(markerDto.getMileage2());
             marker.setCreator(markerDto.getCreator());
             marker.setLatitude(markerDto.getLatitude());
             marker.setLongitude(markerDto.getLongitude());
-            marker.setOwnerComp(markerDto.getOwnerComp());
-//            marker.setMarkerObjectName(markerDto.getMarkerObjectName());
             marker.setMemo(markerDto.getMemo());
             marker.setOwnerComp(markerDto.getOwnerComp());
             marker.setPipeDiameter(markerDto.getPipeDiameter());
@@ -292,40 +276,18 @@
      * @return
      */
     public List<MarkerDto> getMarkerDtosByCondition(MarkerDto markerDto, Company company) {
-//        List<Feature> features = null;
-//        if (markerDto.getFeatureId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getFeatureId());
-//            features = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.AREA.getIndex(), feature);
-//        }
-//        List<Feature> lines = null;
-//        if (markerDto.getLineId() != null) {
-//            Feature feature = featureManager.getFeatureById(markerDto.getLineId());
-//            lines = featureManager.getLeafByParentId(CommonEnum.FEATURE_TYPE.LINE.getIndex(), feature);
-//        }
+
         Criteria criteria1 = this.getSession().createCriteria(Marker.class);
         criteria1.add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("companyId", company.getId()));
-
-//        if (StringUtils.isNotBlank(markerDto.getMarkerName())) {
-//            criteria1.add(Restrictions.like("markerName", markerDto.getMarkerName(), MatchMode.ANYWHERE));
-//        }
         if (StringUtils.isNotBlank(markerDto.getMemo())) {
             criteria1.add(Restrictions.like("memo", markerDto.getMemo(), MatchMode.ANYWHERE));
         }
-//        if (StringUtils.isNotBlank(markerDto.getMileage())) {
-//            criteria1.add(Restrictions.like("mileage", markerDto.getMileage(), MatchMode.ANYWHERE));
-//        }
-//        if (StringUtils.isNotBlank(markerDto.getMileage2())) {
-//            criteria1.add(Restrictions.like("mileage2", markerDto.getMileage2(), MatchMode.ANYWHERE));
-//        }
+        if (StringUtils.isNotBlank(markerDto.getRoad())) {
+            criteria1.add(Restrictions.like("road", markerDto.getRoad(), MatchMode.ANYWHERE));
+        }
         if (StringUtils.isNotBlank(markerDto.getCreator())) {
             criteria1.add(Restrictions.like("creator", markerDto.getCreator(), MatchMode.ANYWHERE));
         }
-//        if (CollectionUtils.isNotEmpty(features)) {
-//            criteria1.add(Restrictions.in("belongFeature", features));
-//        }
-//        if (CollectionUtils.isNotEmpty(lines)) {
-//            criteria1.add(Restrictions.in("belongLine", lines));
-//        }
         if (StringUtils.isNotBlank(markerDto.getsDate())) {
             try {
                 criteria1.add(Restrictions.ge("createTime", DateUtils.sdf1.parse(markerDto.getsDate())));
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index f14d848..659fa3e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -95,12 +95,8 @@
         if (null != id) {
             markerDto = markerManager.getMarkerById(id);
         }
-        User currentUser = (User) session.getAttribute(StringUtils.SYS_USER);
-//        List<FeatureDto> featuresDtos = featureManager.getFeaturesByUser(1, currentUser);
-//        List<FeatureDto> linesDtos = featureManager.getFeaturesByUser(2, currentUser);
+
         model.addAttribute("model", markerDto);
-//        model.addAttribute("features", featuresDtos);
-//        model.addAttribute("lines", linesDtos);
         return "marker/marker-info-edit-new";
     }
 
@@ -113,22 +109,17 @@
             return map;
         }
         if (markerDto.getId() == null) {//新增
-            /*User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-            marker.setValid(1);
-            marker.setCompanyId(user.getCompany().getId());
-            markerManager.saveMarker(marker);
-            map.put("success", true);
-            map.put("message", "新增成功");*/
+//            User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+//            marker.setValid(1);
+//            marker.setCompanyId(user.getCompany().getId());
+//            markerManager.saveMarker(marker);
+//            map.put("success", true);
+//            map.put("message", "新增成功");
         } else {
             try {
                 Marker marker0 = markerManager.get(markerDto.getId());
-                if (null != marker0) {
-//                    marker0.setMarkerName(markerDto.getMarkerName());
-//                    marker0.setBelongFeature(featureManager.getFeatureById(markerDto.getFeatureId()));
-//                    marker0.setBelongLine(featureManager.getFeatureById(markerDto.getLineId()));
+                if (null != marker0) {//编辑marker,下面要增加页面展示项
                     marker0.setMarkerObjectType(markerDto.getMarkerObjectType());
-//                    marker0.setMileage(markerDto.getMileage());
-//                    marker0.setMileage2(markerDto.getMileage2());
                     markerManager.saveMarker(marker0);
                 }
                 map.put("success", true);
@@ -262,7 +253,7 @@
         return map;
     }
 
-    @RequestMapping("getMarkerIdList")
+    @RequestMapping("getMarkerListByCondition")
     @ResponseBody
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -294,19 +285,6 @@
         } else {
             markerDtos = markerManager.getAllPoint(user);
         }
-
-//        TableModel tableModel = new TableModel();
-//        tableModel.setName("marker info");
-//        tableModel.addHeaders("id", "markerName", "markerId", "markerType", "height", "longitude", "latitude",
-//                "depth", "markerObjectId", "markerObjectType", "markerObjectName", "ownerComp", "designComp", "workComp", "memo");
-//        tableModel.setData(markerDtos);
-//        response.setCharacterEncoding("UTF-8");
-//        try {
-//            exportor.export(request, response, tableModel);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-
         TableModel tableModel = new TableModel();
         tableModel.setName("marker info");
         tableModel.addHeaders("id", "markerId", "markerName", "featureId", "lineId", "depth", "mileage",
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 5dc2788..bdabfe0 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -76,40 +76,40 @@
                         <div class="row-fluid">
                             <div class="span12">
 
+                                <%--<div class="span2">--%>
+                                    <%--<div class="controls">--%>
+                                        <%--<select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"--%>
+                                                <%--id="select_area">--%>
+                                            <%--<option value=""></option>--%>
+                                        <%--</select>--%>
+                                    <%--</div>--%>
+                                <%--</div>--%>
+
+                                <%--<div class="span2">--%>
+                                    <%--<div class="controls">--%>
+                                        <%--<select class="span12 select2_area" data-placeholder="所属线路" tabindex="2"--%>
+                                                <%--id="select_line">--%>
+                                            <%--<option value=""></option>--%>
+                                        <%--</select>--%>
+                                    <%--</div>--%>
+                                <%--</div>--%>
+
                                 <div class="span2">
-                                    <div class="controls">
-                                        <select class="span12 select2_area" data-placeholder="所属区域" tabindex="1"
-                                                id="select_area">
-                                            <option value=""></option>
-                                        </select>
-                                    </div>
+                                    <input class="span12" type="text" id="roadCondition" class="m-wrap"
+                                           placeholder="所属道路">
                                 </div>
 
                                 <div class="span2">
-                                    <div class="controls">
-                                        <select class="span12 select2_area" data-placeholder="所属线路" tabindex="2"
-                                                id="select_line">
-                                            <option value=""></option>
-                                        </select>
-                                    </div>
+                                    <input class="span12" type="text" id="memoCondition" class="m-wrap" placeholder="备注">
                                 </div>
 
-                                <div class="span2">
-                                    <input class="span12" type="text" id="markerName" class="m-wrap"
-                                           placeholder="标识器名称">
-                                </div>
+                                <%--<div class="span1">--%>
+                                    <%--<input class="span12" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">--%>
+                                <%--</div>--%>
 
-                                <div class="span2">
-                                    <input class="span12" type="text" id="memo" class="m-wrap" placeholder="备注">
-                                </div>
-
-                                <div class="span1">
-                                    <input class="span12" type="text" id="mileStone1" class="m-wrap" placeholder="里程1">
-                                </div>
-
-                                <div class="span1">
-                                    <input class="span12" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">
-                                </div>
+                                <%--<div class="span1">--%>
+                                    <%--<input class="span12" type="text" id="mileStone2" class="m-wrap" placeholder="里程2">--%>
+                                <%--</div>--%>
 
                                 <div class="span2">
                                     <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询
@@ -118,24 +118,6 @@
 
                             </div>
                         </div>
-                        <%--<div class="row-fluid">--%>
-                        <%--<div class="span12">--%>
-
-                        <%--<div class="span3">--%>
-                        <%--<input type="text" id="markerName" class="m-wrap" placeholder="标识器名称">--%>
-                        <%--</div>--%>
-
-
-                        <%--<div class="span3">--%>
-                        <%--<input type="text" id="memo" class="m-wrap" placeholder="备注">--%>
-                        <%--</div>--%>
-                        <%--<div class="span3">--%>
-                        <%--<button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>--%>
-                        <%--</div>--%>
-
-                        <%--</div>--%>
-
-                        <%--</div>--%>
 
 
                     </form>
@@ -167,195 +149,252 @@
 <!--添加标识对话框-->
 <div id="addModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
-    <div class="modal-header">
+<div class="modal-header">
 
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
 
-        <h3>添加标识</h3>
-
-    </div>
-
-    <div class="modal-body">
-
-        <div class="portlet-body form">
-            <!-- BEGIN FORM-->
-            <form action="#" class="horizontal-form">
-                <!--TODO LIST：标识器录入菜单-->
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">所属区域</label>
-
-                            <div class="controls">
-                                <select data-placeholder="区域选择" data-with-diselect="1" class="" id="addselAra">
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">所属线路</label>
-
-                            <div class="controls">
-                                <select data-placeholder="所属线路" data-with-diselect="1" class="" id="addselLine">
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器编号</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addEmsID"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器名称</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="markerName1"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识类型</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addObjType"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">权属单位</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="company"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">安装人员</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="creator"/>
-                            </div>
-                        </div>
-                    </div>
-                <%--</div>--%>
-
-                <%--<div class="row-fluid">--%>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">管线埋设深度</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addDepth"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">里程1</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone3"/> 千米
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">&nbsp;&nbsp;</label>
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone31"/> 米
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">里程2</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone4"/> 千米
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">&nbsp;&nbsp;</label>
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="mileStone41"/> 米
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row-fluid">
-                    <div class="span6 ">
-                        <div class="control-group">
-                            <label class="control-label">标识器埋深</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="markerDepth"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="span6">
-                        <div class="control-group">
-                            <label class="control-label">备注</label>
-
-                            <div class="controls">
-                                <input type="text" class="m-wrap" id="addMemo"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </form>
-            <!-- END FORM-->
-        </div>
-
-
-    </div>
-
-    <div class="modal-footer">
-
-        <button type="button" class="btn yellow" id="localize">定位</button>
-
-        <button type="button" class="btn green" id="resetEms">重置</button>
-
-    </div>
+    <h3>添加标识</h3>
 
 </div>
 
+<div class="modal-body">
+
+<div class="portlet-body form">
+<!-- BEGIN FORM-->
+<form action="#" class="horizontal-form">
+<!--TODO LIST：标识器录入菜单-->
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识对象类别</label>
+
+            <div class="controls">
+                <select data-placeholder="选择标识对象类别" data-with-diselect="1" class="" id="selectObjectType">
+                    <option value="1" selected>管线</option>
+                    <option value="2">管线附属物</option>
+                    <option value="3">管线特征点</option>
+                    <option value="4">交叉穿越点</option>
+                </select>
+            </div>
+        </div>
+    </div>
+    <%--</div>--%>
+    <%--<div class="row-fluid">--%>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeTypeLabel">管线种类</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerObjectType"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid up-pipe">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeDiameterLabel">管线直径</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeDiameter"/>毫米
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label" id="pipeMaterialLabel">管线材质</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeMaterial"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid below hidden">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管种类</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeType"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeDepth"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid below hidden">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管直径</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeDiameter"/>毫米
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">下层管材料</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+
+    <%--</div>--%>
+
+    <%--<div class="row-fluid">--%>
+    <div class="span6">
+        <div class="control-group">
+            <label class="control-label" id="pipeDepthLabel">管线埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="pipeDepth"/>
+            </div>
+        </div>
+    </div>
+        <div class="span6 pipeOnly">
+            <div class="control-group">
+                <label class="control-label">埋设方式</label>
+
+                <div class="controls">
+                    <input type="text" class="m-wrap" id="layStyle"/>
+                </div>
+            </div>
+        </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">所属道路</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="road"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">建设年代</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="constructTime"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">所属单位</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="ownerComp"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标示对象ID</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerObjectId"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识器ID</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerId"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标示器类型</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerType"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">标识器埋深</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="markerDepth"/>
+            </div>
+        </div>
+    </div>
+    <div class="span6 ">
+        <div class="control-group">
+            <label class="control-label">安装人员</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="creator"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span12">
+        <div class="control-group">
+            <label class="control-label">备注</label>
+
+            <div class="controls">
+                <input type="text" class="m-wrap" id="memo"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+</form>
+<!-- END FORM-->
+</div>
+
+
+</div>
+
+<div class="modal-footer">
+
+    <button type="button" class="btn yellow" id="localize">定位</button>
+
+    <button type="button" class="btn green" id="resetEms">重置</button>
+
+</div>
+
+</div>
 <!--上传对话框-->
 <div id="uploadModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
diff --git a/src/main/webapp/s/app/ems/EMSBean.js b/src/main/webapp/s/app/ems/EMSBean.js
index 7a3ab73..9503c5c 100644
--- a/src/main/webapp/s/app/ems/EMSBean.js
+++ b/src/main/webapp/s/app/ems/EMSBean.js
@@ -1,26 +1,28 @@
+EMSBean = function (markerObjectType,pipeMaterial,pipeDiameter, layStyle, depth, belowType, belowDepth, belowDiameter, belowMaterial, road,
+                    constructTime, ownerComp, markerObjectId, markerId, markerType, markerDepth, creator, createTime, memo, lat, long, recordType,id) {
 
-EMSBean = function(markerId,markerName,lat,long, depth,ownerComp,createTime,
-                   markerObjectType,markerObjectName,featureId,lineId,
-                   creator,mileStone1,mileStone2,memo,id,featureName,lineName,markerDepth) {
-
+    this.markerObjectType = markerObjectType;
+    this.pipeMaterial = pipeMaterial;
+    this.pipeDiameter = pipeDiameter;
+    this.layStyle = layStyle;
+    this.depth = depth;
+    this.belowType = belowType;
+    this.belowDepth = belowDepth;
+    this.belowDiameter = belowDiameter
+    this.belowMaterial = belowMaterial;
+    this.road = road;
+    this.constructTime = constructTime;
+    this.ownerComp = ownerComp;
+    this.markerObjectId = markerObjectId;
     this.markerId = markerId;
-    this.markerName = markerName;
+    this.markerType = markerType;
+    this.markerDepth = markerDepth;
+    this.creator = creator;
+    this.createTime = createTime;
+    this.memo = memo;
     this.latitude = lat;
     this.longitude = long;
-    this.depth = depth;
-    this.ownerComp = ownerComp;
-    this.createTime = createTime;
-    this.markerObjectType = markerObjectType;
-    this.markerObjectName = markerObjectName;
-    this.id=id;
-    this.featureId = featureId;
-    this.lineId=lineId;
-    this.creator=creator;
-    this.mileage=mileStone1;
-    this.mileage2=mileStone2;
-    this.memo = memo;
-    this.featureName= featureName;
-    this.lineName=lineName;
-    this.markerDepth = markerDepth;
+    this.recordType = recordType;
+    this.id = id;
 
 };
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index e211123..864217b 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -10,8 +10,7 @@
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
     var points = [];
-    var  vectorMarkers = [];
-
+    var vectorMarkers = [];
 
 
     return {
@@ -36,7 +35,7 @@
                 try {
                     for (var j = 0; j < window.markerData.length; j++) {
                         var emsBean = window.markerData[j];
-                        var bdPoint = gpsBdUtils.gcj2bd(emsBean.latitude,emsBean.longitude);
+                        var bdPoint = gpsBdUtils.gcj2bd(emsBean.latitude, emsBean.longitude);
                         var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude);
 //                        var point = new BMap.Point(emsBean.longitude, emsBean.latitude);
                         if (type == "Circle") {
@@ -98,7 +97,7 @@
                 var emsBean = readyToUploadPoints[i].Tag;
                 var lng = readyToUploadPoints[i].point.lng;
                 var lat = readyToUploadPoints[i].point.lat;
-                var gpsPoint = gpsBdUtils.bd2gcj(lat,lng);
+                var gpsPoint = gpsBdUtils.bd2gcj(lat, lng);
                 emsBean.longitude = gpsPoint.longitude;
                 emsBean.latitude = gpsPoint.latitude;
                 if (!emsBean.depth) {
@@ -162,8 +161,8 @@
             var menu = new BMap.ContextMenu();
             var txtMenuItem = [
                 {
-                    text:'删除',
-                    callback:function(e){
+                    text: '删除',
+                    callback: function (e) {
 
                         //判断右键位置是否在覆盖物内，如果在就展示菜单，如果不在就不展示
                         for (var i = 0; i < drawOverlays.length; i++) {
@@ -172,27 +171,25 @@
                             if (type == "Circle") {
                                 if (BMapLib.GeoUtils.isPointInCircle(e, layer)) {
                                     map.removeOverlay(drawOverlays[i]);
-                                    drawOverlays.splice(i,1);
+                                    drawOverlays.splice(i, 1);
                                 }
                             } else {
-                                if (BMapLib.GeoUtils.isPointInPolygon(e, layer)||BMapLib.GeoUtils.isPointInRect(e, layer)) {
+                                if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)) {
                                     map.removeOverlay(drawOverlays[i]);
-                                    drawOverlays.splice(i,1);
+                                    drawOverlays.splice(i, 1);
                                 }
                             }
                         }
                     }
                 }
             ];
-            for(var i=0; i < txtMenuItem.length; i++){
-                menu.addItem(new BMap.MenuItem(txtMenuItem[i].text,txtMenuItem[i].callback,100));
+            for (var i = 0; i < txtMenuItem.length; i++) {
+                menu.addItem(new BMap.MenuItem(txtMenuItem[i].text, txtMenuItem[i].callback, 100));
             }
             map.addContextMenu(menu);
 
 
-
-
-            var myFun = function(result){//根据城市名进行定位
+            var myFun = function (result) {//根据城市名进行定位
                 var cityName = result.name;
                 map.setCenter(cityName);
             }
@@ -215,36 +212,36 @@
             //创建标识器删除按钮
             var addImage = $('#context').val() + "/images/ems/emsAdd.png";
             var offset0 = new BMap.Size(10, 100);
-            var emsAddControl = new EmsControl(map, addImage, Ems.emsAddCallBack, offset0,"新增标识器");
+            var emsAddControl = new EmsControl(map, addImage, Ems.emsAddCallBack, offset0, "新增标识器");
             map.addControl(emsAddControl);
 
             //删除标识器
             var delImage = $('#context').val() + "/images/ems/emsDel.png";
             var offset1 = new BMap.Size(10, 170);
-            var emsDelControl = new EmsControl(map, delImage, Ems.emsDelCallBack, offset1,"删除标识器");
+            var emsDelControl = new EmsControl(map, delImage, Ems.emsDelCallBack, offset1, "删除标识器");
             map.addControl(emsDelControl);
 
-            //删除标识器
+            //保存标识器
             var saveImage = $('#context').val() + "/images/ems/emsSave.png";
             var offset_save = new BMap.Size(10, 240);
-            var emsSaveControl = new EmsControl(map, saveImage, Ems.emsSaveCallBack, offset_save,"保存标识器");
+            var emsSaveControl = new EmsControl(map, saveImage, Ems.emsSaveCallBack, offset_save, "保存标识器");
             map.addControl(emsSaveControl);
 
-            //批量导出标识器数据,弹出对应的对话框
+            //批量导入标识器数据,弹出对应的对话框
             var uploadImage = $('#context').val() + "/images/ems/emsUpload.png";
             var offset2 = new BMap.Size(10, 310);
-            var emsUploadControl = new EmsControl(map, uploadImage, Ems.emsUploadCallBack, offset2,"批量导入");
+            var emsUploadControl = new EmsControl(map, uploadImage, Ems.emsUploadCallBack, offset2, "批量导入");
             map.addControl(emsUploadControl);
 
             //批量导出标识器数据,弹出对应的对话框
             var exportImage = $('#context').val() + "/images/ems/emsExport.png";
             var offset3 = new BMap.Size(10, 380);
-            var emsExportControl = new EmsControl(map, exportImage, Ems.emsExportCallBack, offset3,"导出Excel");
+            var emsExportControl = new EmsControl(map, exportImage, Ems.emsExportCallBack, offset3, "导出Excel");
             map.addControl(emsExportControl);
 
             var clearImage = $('#context').val() + "/images/ems/clear.png";
             var offset4 = new BMap.Size(10, 450);
-            var emsClearControl = new EmsControl(map, clearImage, Ems.clearOverlays, offset4,"清空");
+            var emsClearControl = new EmsControl(map, clearImage, Ems.clearOverlays, offset4, "清空");
             map.addControl(emsClearControl);
 
             var offset5 = new BMap.Size(10, 10);
@@ -287,7 +284,6 @@
             drawingManager.addEventListener('overlaycomplete', overlaycomplete);
 
 
-
 //加载完毕请求标识点信息
             map.addEventListener("tilesloaded", function () {
                 if (window.markerData.length == 0) {
@@ -303,10 +299,10 @@
                                 window.markerData = [];//清空原来的数据
                                 for (var t = 0; t < r.data.length; t++) {
                                     var markerDto = r.data[t];
-                                    var markerDep = markerDto.markerDepth==null?"--":markerDto.markerDepth;
-                                    var emsBean = new EMSBean(markerDto.markerId, markerDto.markerName, markerDto.latitude, markerDto.longitude,
-                                        markerDto.depth, markerDto.ownerComp, markerDto.createTime, markerDto.markerObjectType,
-                                        markerDto.markerObjectName, null, null, null, markerDto.mileage, markerDto.mileage2, markerDto.memo, markerDto.id,markerDto.featureName,markerDto.lineName,markerDep);
+                                    var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle,
+                                        markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter,
+                                        markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType,
+                                        markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id);
                                     window.markerData[t] = emsBean;
 
                                 }
@@ -327,24 +323,27 @@
         },
 
         initForm: function () {
+            $("#selectObjectType").chosen();
 
-            $('#select_area').select2({
-                placeholder: "片区选择",
-                allowClear: true
-            });
             $("#resetEms").live("click", function (e) {
-                $("#addEmsID").val("");
-                $("#markerName1").val("");
-                $("#addObjType").val("");
-                $("#company").val("");
-                $("#creator").val("");
-                $("#addDepth").val("");
-                $("#mileStone3").val("");
-                $("#mileStone31").val("");
-                $("#mileStone4").val("");
-                $("#mileStone41").val("");
+                $("#markerObjectType").val("");
+                $("#pipeDiameter").val("");
+                $("#pipeMaterial").val("");
+                $("#belowPipeType").val("");
+                $("#belowPipeDepth").val("");
+                $("#belowPipeDiameter").val("");
+                $("#belowPipeMaterial").val("");
+                $("#pipeDepth").val("");
+                $("#layStyle").val("");
+                $("#road").val("");
+                $("#constructTime").val("");
+                $("#ownerComp").val("");
+                $("#markerObjectId").val("");
+                $("#markerId").val("");
+                $("#markerType").val("");
                 $("#markerDepth").val("");
-                $("#addMemo").val("");
+                $("#creator").val("");
+                $("#memo").val("");
 
             });
 
@@ -355,25 +354,29 @@
                     map.removeEventListener("click", showInfo);
                     var lng = e.point.lng;
                     var lat = e.point.lat;
-                    var gpsPoint = gpsBdUtils.bd2gcj(lat,lng);
+                    var gpsPoint = gpsBdUtils.bd2gcj(lat, lng);
                     //TODO LIST:获取填写表单的信息 所属区域也需要保存的
-                    var araId = $("#addselAra").val();
-                    var lineId = $("#addselLine").val();
-                    var emsId = $("#addEmsID").val();
-                    var markerName = $("#markerName1").val();
-                    var company = $("#company").val();
-                    var markObjType = $("#addObjType").val();
+                    var selectObjectType = $("#selectObjectType").val();//判断是哪个类别
+                    var markerObjectType = $("#markerObjectType").val();
+                    var pipeDiameter = $("#pipeDiameter").val();
+                    var pipeMaterial = $("#pipeMaterial").val();
+                    var belowPipeType = $("#belowPipeType").val();
+                    var belowPipeDepth = $("#belowPipeDepth").val();
+                    var belowPipeDiameter = $("#belowPipeDiameter").val();
+                    var belowPipeMaterial = $("#belowPipeMaterial").val();
+                    var pipeDepth = $("#pipeDepth").val();
+                    var layStyle = $("#layStyle").val();
+                    var road = $("#road").val();
+                    var constructTime = $("#constructTime").val();
+                    var ownerComp = $("#ownerComp").val();
+                    var markerObjectId = $("#markerObjectId").val();
+                    var markerId = $("#markerId").val();
+                    var markerType = $("#markerType").val();
+                    var markerDepth = $("#markerDepth").val();
                     var creator = $("#creator").val();
-                    var addDepth = $("#addDepth").val();
-                    var mileStone1 = $("#mileStone3").val()+"Km+"+ $("#mileStone31").val()+"m";
-                    var mileStone2 = $("#mileStone4").val()+"Km+"+ $("#mileStone41").val()+"m";
-                    var memo = $("#addMemo").val();
-                    var markerDepth = $("#markerDepth").val();//新增标识器埋深
-
-                    var emsBean = new EMSBean(emsId, markerName, gpsPoint.latitude, gpsPoint.longitude, addDepth, company,
-                        null, markObjType, null, araId, lineId, creator, mileStone1, mileStone2, memo,null,null,null,markerDepth);
-//                    var emsBean = new EMSBean(emsId, markerName, lat, lng, addDepth, company,
-//                        null, markObjType, null, araId, lineId, creator, mileStone1, mileStone2, memo);
+                    var memo = $("#memo").val();
+                    var emsBean = new EMSBean(markerObjectType, pipeMaterial, pipeDiameter, layStyle, pipeDepth, belowPipeType, belowPipeDepth, belowPipeDiameter, belowPipeMaterial,
+                        road, constructTime, ownerComp, markerObjectId, markerId, markerType, markerDepth, creator, null, memo, lat, lng, selectObjectType);
                     var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
 
                     marker.addEventListener("click", attribute);
@@ -383,17 +386,43 @@
                     readyToUploadMarkers.push(marker);
                     readyToUploadPoints.push(marker);
                     function attribute() {
-//                        var p = marker.getPosition();
                         var emsBean2 = marker.Tag;
                         var searchInfoWindow = null;
-                        var msg ="编&emsp;&emsp;号:" + emsBean2.markerId + "<br/>" +
-                            "对象类型:" + emsBean2.markerObjectType + "<br/>" +
-                            "管线埋深:" + emsBean2.depth + "<br/>" +
-                            "标识器埋深:" + emsBean2.markerDepth + "<br/>" +
+                        var msg = "";
+                        var height = 0;
+                        if (selectObjectType == 1) {
+                            msg = msg + "管线种类:" + emsBean2.markerObjectType + "<br/>" +
+                                "管线直径:" + emsBean2.pipeDiameter + "<br/>" +
+                                "管线材质:" + emsBean2.pipeMaterial + "<br/>" +
+                                "埋设方式:" + emsBean2.layStyle + "<br/>" +
+                                "管线埋深:" + emsBean2.depth + "<br/>";
+                            height = 100;
+                        } else if (selectObjectType == 2) {
+                            msg = msg + "附属物名称:" + emsBean2.markerObjectType + "<br/>" +
+                                "井深:" + emsBean2.depth + "<br/>";
+                            height = 40;
+                        } else if (selectObjectType == 3) {
+                            msg = msg + "管点特征:" + emsBean2.markerObjectType + "<br/>" +
+                                "特征点埋深:" + emsBean2.depth + "<br/>";
+                            height = 40;
+                        } else {
+                            msg = msg + "上层管种类:" + emsBean2.markerObjectType + "<br/>" +
+                                "上层管直径:" + emsBean2.pipeDiameter + "<br/>" +
+                                "上层管材料:" + emsBean2.pipeMaterial + "<br/>" +
+                                "上层管埋深:" + emsBean2.depth + "<br/>" +
+                                "下层管种类:" + emsBean2.belowType + "<br/>" +
+                                "下层管直径:" + emsBean2.belowDiameter + "<br/>" +
+                                "下层管材料:" + emsBean2.belowMaterial + "<br/>" +
+                                "下层管埋深:" + emsBean2.belowDepth + "<br/>";
+                            height = 160;
+                        }
+                        height = height + 145;
+                        var msg = msg + "所属道路:" + emsBean2.road + "<br/>" +
+                            "建设年代:" + emsBean2.constructTime + "<br/>" +
                             "权属单位:" + emsBean2.ownerComp + "<br/>" +
-                            "安装时间:" + emsBean2.createTime + "<br/>" +
-                            "里程1:" + emsBean2.mileage + "<br/>" +
-                            "里程2:" + emsBean2.mileage2 + "<br/>" +
+                            "标识器ID:" + emsBean2.markerId + "<br/>" +
+                            "标识器类型:" + emsBean2.markerType + "<br/>" +
+                            "标识器埋深:" + emsBean2.markerDepth + "<br/>" +
                             "备注:" + emsBean2.memo + "<br/>";
                         var imgUrl = $('#context').val() + "/images/ems.jpg";
                         var content = '<div style="margin:0;line-height:20px;padding:2px;">' +
@@ -403,7 +432,7 @@
                         searchInfoWindow = new BMapLib.SearchInfoWindow(map, content, {
                             title: emsBean.markerName,      //标题
                             width: 290,             //宽度
-                            height: 185,              //高度
+                            height: height,              //高度
                             panel: "panel",         //检索结果面板
                             enableAutoPan: true    //自动平移
                         });
@@ -418,21 +447,17 @@
 
             $("#searchMarker").live("click", function (e) {
                 var Marker = {};
-                if(vectorMarkers.length!=0){
-                    for(var i = 0;i<vectorMarkers.length;i++)
-                    map.removeOverlay(vectorMarkers[i]);
+                if (vectorMarkers.length != 0) {
+                    for (var i = 0; i < vectorMarkers.length; i++)
+                        map.removeOverlay(vectorMarkers[i]);
                 }
                 vectorMarkers = [];
-                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.memo = $("#memo").val();
+                Marker.road = $("#roadCondition").val();
+                Marker.memo = $("#memoCondition").val();
                 //请求后台的id列表，然后遍历marker列表，修改marker的颜色
                 $.ajax({
                     type: "POST",
-                    url: $('#context').val() + "/marker/getMarkerIdList.do",
+                    url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
 //                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
@@ -448,8 +473,8 @@
                                     return;
                                 }
                                 for (var a in r.data) {//遍历列表，添加marker
-                                    var bdpoint = gpsBdUtils.gcj2bd(r.data[a].latitude,r.data[a].longitude);
-                                    var point = new BMap.Point(bdpoint.longitude,bdpoint.latitude);
+                                    var bdpoint = gpsBdUtils.gcj2bd(r.data[a].latitude, r.data[a].longitude);
+                                    var point = new BMap.Point(bdpoint.longitude, bdpoint.latitude);
 //                                    var point = new BMap.Point(r.data[a].longitude, r.data[a].latitude);
 //                                    var marker = new BMap.Marker(point);  // 创建标注
                                     var vectorMarker = new BMap.Marker(new BMap.Point(point.lng, point.lat), {
@@ -476,6 +501,39 @@
                 });
 
             });
+//控制不同种类对象的标签信息显示
+            $("#selectObjectType").live("change", function (e) {
+                var type = $("#selectObjectType").val();
+                if (type == 1) {//管线
+                    $("#pipeTypeLabel").text("管线种类");
+                    $(".up-pipe").show();
+                    $("#pipeDiameterLabel").text("管线直径");
+                    $("#pipeMaterialLabel").text("管线材质");
+                    $(".below").addClass("hidden");
+                    $("#pipeDepthLabel").text("管线埋深");
+                    $(".pipeOnly").show();
+                } else if (type == 2) {//管线附属物
+                    $("#pipeTypeLabel").text("附属物名称");
+                    $(".up-pipe").hide();
+                    $(".below").addClass("hidden");
+                    $("#pipeDepthLabel").text("井深");
+                    $(".pipeOnly").hide();
+                } else if (type == 3) {//管线特征点
+                    $("#pipeTypeLabel").text("管点特征");
+                    $(".up-pipe").hide();
+                    $(".below").addClass("hidden");
+                    $("#pipeDepthLabel").text("特征点埋深");
+                    $(".pipeOnly").hide();
+                } else {//交叉穿越点
+                    $("#pipeTypeLabel").text("上层管种类");
+                    $(".up-pipe").show();
+                    $("#pipeDiameterLabel").text("上层管直径");
+                    $("#pipeMaterialLabel").text("上层管材料");
+                    $(".below").removeClass("hidden");
+                    $("#pipeDepthLabel").text("上层管埋深");
+                    $(".pipeOnly").hide();
+                }
+            });
 
 
         },
@@ -512,22 +570,20 @@
         },
 
         initSelect: function () {
-            Ems.initAreasArray(1, "select_area");
-            Ems.initAreasArray(2, "select_line");
+            $("#selectObjectType").chosen();
+//            Ems.initAreasArray(1, "select_area");
+//            Ems.initAreasArray(2, "select_line");
         },
         initAddMarkerSelect: function () {
-            Ems.initAreasArray(1, "addselAra");
-            Ems.initAreasArray(2, "addselLine");
+//            Ems.initAreasArray(1, "addselAra");
+//            Ems.initAreasArray(2, "addselLine");
         },
 
         addMarker: function (data) {
             if (document.createElement('canvas').getContext) {  // 判断当前浏览器是否支持绘制海量点
                 var points = [];  // 添加海量点数据
                 for (var i = 0; i < data.length; i++) {
-//                    var point = new BMap.Point(data[i].longitude, data[i].latitude);
-//                    point.Tag = data[i];
-//                    points.push(point);
-                    var bdPoint = gpsBdUtils.gcj2bd(data[i].latitude,data[i].longitude);
+                    var bdPoint = gpsBdUtils.gcj2bd(data[i].latitude, data[i].longitude);
                     var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude);
                     point.Tag = data[i];
                     points.push(point);
@@ -543,16 +599,52 @@
                 pointCollection.addEventListener('click', function (e) {
                     var emsBean = e.point.Tag;
                     var searchInfoWindow = null;
-                    var msg = "编&emsp;&emsp;号:" + emsBean.markerId + "<br/>" +
-                        "所属区域:" + emsBean.featureName + "<br/>" +
-                        "所属线路:" + emsBean.lineName + "<br/>" +
-                        "对象类型:" + emsBean.markerObjectType + "<br/>" +
-                        "管线埋深:" + emsBean.depth + "<br/>" +
-                        "标识器埋深:" + emsBean.markerDepth + "<br/>" +
+//                    var msg = "编&emsp;&emsp;号:" + emsBean.markerId + "<br/>" +
+//                        "所属区域:" + emsBean.featureName + "<br/>" +
+//                        "所属线路:" + emsBean.lineName + "<br/>" +
+//                        "对象类型:" + emsBean.markerObjectType + "<br/>" +
+//                        "管线埋深:" + emsBean.depth + "<br/>" +
+//                        "标识器埋深:" + emsBean.markerDepth + "<br/>" +
+//                        "权属单位:" + emsBean.ownerComp + "<br/>" +
+//                        "安装时间:" + emsBean.createTime + "<br/>" +
+//                        "里程1:" + emsBean.mileage + "<br/>" +
+//                        "里程2:" + emsBean.mileage2 + "<br/>" +
+//                        "备注:" + emsBean.memo + "<br/>";
+                    var msg = "";
+                    var height = 0;
+                    if (emsBean.recordType == 1) {
+                        msg = msg + "管线种类:" + emsBean.markerObjectType + "<br/>" +
+                            "管线直径:" + emsBean.pipeDiameter + "<br/>" +
+                            "管线材质:" + emsBean.pipeMaterial + "<br/>" +
+                            "埋设方式:" + emsBean.layStyle + "<br/>" +
+                            "管线埋深:" + emsBean.depth + "<br/>";
+                        height = 100;
+                    } else if (emsBean.recordType == 2) {
+                        msg = msg + "附属物名称:" + emsBean.markerObjectType + "<br/>" +
+                            "井深:" + emsBean.depth + "<br/>";
+                        height = 40;
+                    } else if (emsBean.recordType == 3) {
+                        msg = msg + "管点特征:" + emsBean.markerObjectType + "<br/>" +
+                            "特征点埋深:" + emsBean.depth + "<br/>";
+                        height = 40;
+                    } else {
+                        msg = msg + "上层管种类:" + emsBean.markerObjectType + "<br/>" +
+                            "上层管直径:" + emsBean.pipeDiameter + "<br/>" +
+                            "上层管材料:" + emsBean.pipeMaterial + "<br/>" +
+                            "上层管埋深:" + emsBean.depth + "<br/>" +
+                            "下层管种类:" + emsBean.belowType + "<br/>" +
+                            "下层管直径:" + emsBean.belowDiameter + "<br/>" +
+                            "下层管材料:" + emsBean.belowMaterial + "<br/>" +
+                            "下层管埋深:" + emsBean.belowDepth + "<br/>";
+                        height = 160;
+                    }
+                    height = height + 145;
+                    var msg = msg + "所属道路:" + emsBean.road + "<br/>" +
+                        "建设年代:" + emsBean.constructTime + "<br/>" +
                         "权属单位:" + emsBean.ownerComp + "<br/>" +
-                        "安装时间:" + emsBean.createTime + "<br/>" +
-                        "里程1:" + emsBean.mileage + "<br/>" +
-                        "里程2:" + emsBean.mileage2 + "<br/>" +
+                        "标识器ID:" + emsBean.markerId + "<br/>" +
+                        "标识器类型:" + emsBean.markerType + "<br/>" +
+                        "标识器埋深:" + emsBean.markerDepth + "<br/>" +
                         "备注:" + emsBean.memo + "<br/>";
                     var imgUrl = $('#context').val() + "/images/ems.jpg";
                     var content = '<div style="margin:0;line-height:20px;padding:2px;">' +
@@ -562,7 +654,7 @@
                     searchInfoWindow = new BMapLib.SearchInfoWindow(map, content, {
                         title: emsBean.markerName,      //标题
                         width: 290,             //宽度
-                        height: 225,              //高度
+                        height: height,              //高度
                         panel: "panel",         //检索结果面板
                         enableAutoPan: true    //自动平移
                     });