diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 200ad87..b75be7c 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -9,7 +9,6 @@
     var readyToUploadPoints = new Array();
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
-    var points = [];
     var vectorMarkers = [];
 
 
@@ -75,9 +74,6 @@
                         if (r.success) {//请求成功
                             window.markerData = [];
                             location.href = $('#context').val() + "/content/ems/ems.jsp";
-//                            Ems.initMap();
-//                            map.clearOverlays();
-//                            map.setViewport(pointArray);
                         }
                     },
                     error: function (d) {//请求出错
@@ -463,7 +459,6 @@
                     type: "POST",
                     url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
-//                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
                     success: function (r) {
                         if (r.data) {
@@ -478,8 +473,6 @@
                                 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 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), {
                                         // 指定Marker的icon属性为Symbol
                                         icon: new BMap.Symbol(BMap_Symbol_SHAPE_POINT, {
@@ -507,6 +500,7 @@
 //控制不同种类对象的标签信息显示
             $("#selectObjectType").die().live("change", function (e) {
                 var type = $("#selectObjectType").val();
+                OptionItemProcess.initPipeTypeList(type);
                 if (type == 1) {//管线
                     $("#pipeTypeLabel").text("管线种类");
                     $(".up-pipe").show();
@@ -538,7 +532,11 @@
                 }
             });
 
-
+            OptionItemProcess.initPipeTypeList($("#selectObjectType").val());
+            OptionItemProcess.initBelowPipeTypeList();
+            OptionItemProcess.initAreaList();
+            OptionItemProcess.initLayStyleList();
+            OptionItemProcess.initMaterialList();
         },
 
         initSelect: function () {

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 200ad87..b75be7c 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -9,7 +9,6 @@
     var readyToUploadPoints = new Array();
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
-    var points = [];
     var vectorMarkers = [];
 
 
@@ -75,9 +74,6 @@
                         if (r.success) {//请求成功
                             window.markerData = [];
                             location.href = $('#context').val() + "/content/ems/ems.jsp";
-//                            Ems.initMap();
-//                            map.clearOverlays();
-//                            map.setViewport(pointArray);
                         }
                     },
                     error: function (d) {//请求出错
@@ -463,7 +459,6 @@
                     type: "POST",
                     url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
-//                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
                     success: function (r) {
                         if (r.data) {
@@ -478,8 +473,6 @@
                                 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 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), {
                                         // 指定Marker的icon属性为Symbol
                                         icon: new BMap.Symbol(BMap_Symbol_SHAPE_POINT, {
@@ -507,6 +500,7 @@
 //控制不同种类对象的标签信息显示
             $("#selectObjectType").die().live("change", function (e) {
                 var type = $("#selectObjectType").val();
+                OptionItemProcess.initPipeTypeList(type);
                 if (type == 1) {//管线
                     $("#pipeTypeLabel").text("管线种类");
                     $(".up-pipe").show();
@@ -538,7 +532,11 @@
                 }
             });
 
-
+            OptionItemProcess.initPipeTypeList($("#selectObjectType").val());
+            OptionItemProcess.initBelowPipeTypeList();
+            OptionItemProcess.initAreaList();
+            OptionItemProcess.initLayStyleList();
+            OptionItemProcess.initMaterialList();
         },
 
         initSelect: function () {
diff --git a/src/main/webapp/s/app/util/optionitemprocess.js b/src/main/webapp/s/app/util/optionitemprocess.js
new file mode 100644
index 0000000..f47920f
--- /dev/null
+++ b/src/main/webapp/s/app/util/optionitemprocess.js
@@ -0,0 +1,86 @@
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+var OptionItemProcess = new function(){
+
+    return{
+        GetListByType:function(arr,type){
+            var result = [];
+            for(var item in arr){
+                if(item.type&&item.type==type){
+                    result.push(item.name);
+                }
+            }
+            return result;
+        },
+        GetDataFromDb:function(){
+            $.ajax({
+                type: "get",
+                url: $('#context').val() + "/optionItems/allItems.do",
+                dataType: "json",
+                cache: true,
+                async:false,
+                success: function (r) {
+                    if (r.success) {//请求成功
+                       for(var i=0;i< r.data.length;i++){
+                           var optionItems = r.data[i];
+                           if(!window.optionItemList) window.optionItemList = new Array();
+                           if(!window.optionItemList[optionItems.type+""]){
+                               window.optionItemList[optionItems.type+""] = new Array();//是一个二维数组，type为下标
+                           }
+                           window.optionItemList[optionItems.type+""].push(optionItems.name);
+                       }
+
+                    }
+                },
+                error: function (d) {//请求出错
+                    alert("请求出错");
+                }
+            });
+        },
+
+        GetOptionStrByArr:function(arr){
+            var result = "";
+            for(var s in arr){
+                result+="<option value='"+arr[s]+"'>";
+            }
+            return result;
+        },
+        initPipeTypeList:function(type) {
+            if(type>4) return;//该字段的type定义不大于3
+            if(type==4) type=1;
+            var arr = window.optionItemList[type+""];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#pipeTypeList").children().remove();
+            $("#pipeTypeList").append(optionStr);
+        },
+        initBelowPipeTypeList:function(){
+            var arr = window.optionItemList["1"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeTypeList").children().remove();
+            $("#belowPipeTypeList").append(optionStr);
+        },
+        initMaterialList:function(){
+            var arr = window.optionItemList["MaterialType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeMaterialList").children().remove();
+            $("#belowPipeMaterialList").append(optionStr);
+            $("#pipeMaterialList").children().remove();
+            $("#pipeMaterialList").append(optionStr);
+        },
+        initLayStyleList:function(){
+            var arr = window.optionItemList["layStyleType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#layStyleList").children().remove();
+            $("#layStyleList").append(optionStr);
+        },
+        initAreaList:function(){
+        var arr = window.optionItemList["areaItem"];
+        var optionStr = this.GetOptionStrByArr(arr);
+        $("#areaList").children().remove();
+        $("#areaList").append(optionStr);
+        }
+
+
+    }
+}
\ No newline at end of file

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 200ad87..b75be7c 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -9,7 +9,6 @@
     var readyToUploadPoints = new Array();
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
-    var points = [];
     var vectorMarkers = [];
 
 
@@ -75,9 +74,6 @@
                         if (r.success) {//请求成功
                             window.markerData = [];
                             location.href = $('#context').val() + "/content/ems/ems.jsp";
-//                            Ems.initMap();
-//                            map.clearOverlays();
-//                            map.setViewport(pointArray);
                         }
                     },
                     error: function (d) {//请求出错
@@ -463,7 +459,6 @@
                     type: "POST",
                     url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
-//                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
                     success: function (r) {
                         if (r.data) {
@@ -478,8 +473,6 @@
                                 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 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), {
                                         // 指定Marker的icon属性为Symbol
                                         icon: new BMap.Symbol(BMap_Symbol_SHAPE_POINT, {
@@ -507,6 +500,7 @@
 //控制不同种类对象的标签信息显示
             $("#selectObjectType").die().live("change", function (e) {
                 var type = $("#selectObjectType").val();
+                OptionItemProcess.initPipeTypeList(type);
                 if (type == 1) {//管线
                     $("#pipeTypeLabel").text("管线种类");
                     $(".up-pipe").show();
@@ -538,7 +532,11 @@
                 }
             });
 
-
+            OptionItemProcess.initPipeTypeList($("#selectObjectType").val());
+            OptionItemProcess.initBelowPipeTypeList();
+            OptionItemProcess.initAreaList();
+            OptionItemProcess.initLayStyleList();
+            OptionItemProcess.initMaterialList();
         },
 
         initSelect: function () {
diff --git a/src/main/webapp/s/app/util/optionitemprocess.js b/src/main/webapp/s/app/util/optionitemprocess.js
new file mode 100644
index 0000000..f47920f
--- /dev/null
+++ b/src/main/webapp/s/app/util/optionitemprocess.js
@@ -0,0 +1,86 @@
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+var OptionItemProcess = new function(){
+
+    return{
+        GetListByType:function(arr,type){
+            var result = [];
+            for(var item in arr){
+                if(item.type&&item.type==type){
+                    result.push(item.name);
+                }
+            }
+            return result;
+        },
+        GetDataFromDb:function(){
+            $.ajax({
+                type: "get",
+                url: $('#context').val() + "/optionItems/allItems.do",
+                dataType: "json",
+                cache: true,
+                async:false,
+                success: function (r) {
+                    if (r.success) {//请求成功
+                       for(var i=0;i< r.data.length;i++){
+                           var optionItems = r.data[i];
+                           if(!window.optionItemList) window.optionItemList = new Array();
+                           if(!window.optionItemList[optionItems.type+""]){
+                               window.optionItemList[optionItems.type+""] = new Array();//是一个二维数组，type为下标
+                           }
+                           window.optionItemList[optionItems.type+""].push(optionItems.name);
+                       }
+
+                    }
+                },
+                error: function (d) {//请求出错
+                    alert("请求出错");
+                }
+            });
+        },
+
+        GetOptionStrByArr:function(arr){
+            var result = "";
+            for(var s in arr){
+                result+="<option value='"+arr[s]+"'>";
+            }
+            return result;
+        },
+        initPipeTypeList:function(type) {
+            if(type>4) return;//该字段的type定义不大于3
+            if(type==4) type=1;
+            var arr = window.optionItemList[type+""];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#pipeTypeList").children().remove();
+            $("#pipeTypeList").append(optionStr);
+        },
+        initBelowPipeTypeList:function(){
+            var arr = window.optionItemList["1"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeTypeList").children().remove();
+            $("#belowPipeTypeList").append(optionStr);
+        },
+        initMaterialList:function(){
+            var arr = window.optionItemList["MaterialType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeMaterialList").children().remove();
+            $("#belowPipeMaterialList").append(optionStr);
+            $("#pipeMaterialList").children().remove();
+            $("#pipeMaterialList").append(optionStr);
+        },
+        initLayStyleList:function(){
+            var arr = window.optionItemList["layStyleType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#layStyleList").children().remove();
+            $("#layStyleList").append(optionStr);
+        },
+        initAreaList:function(){
+        var arr = window.optionItemList["areaItem"];
+        var optionStr = this.GetOptionStrByArr(arr);
+        $("#areaList").children().remove();
+        $("#areaList").append(optionStr);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/com/casic/accessControl/maker/MainTest.java b/src/test/com/casic/accessControl/maker/MainTest.java
index 0b25814..61115ff 100644
--- a/src/test/com/casic/accessControl/maker/MainTest.java
+++ b/src/test/com/casic/accessControl/maker/MainTest.java
@@ -14,18 +14,18 @@
  */
 public class MainTest {
     public static void main(String [] args){
-        MarkerUtil markerDto = new MarkerUtil();
-        markerDto.setRecordType(1);
-        markerDto.setMarkerObjectType("供热管线");
-        markerDto.setDepth("1.2m");
-        markerDto.setCompanyId(4L);
-        markerDto.setConstructTime("1990-04-02");
-        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
-        markerDtoList.add(markerDto);
-        Gson gson = new Gson();
-        String markers = gson.toJson(markerDtoList);
-        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
-        System.out.println(s);
+//        MarkerUtil markerDto = new MarkerUtil();
+//        markerDto.setRecordType(1);
+//        markerDto.setMarkerObjectType("供热管线");
+//        markerDto.setDepth("1.2m");
+//        markerDto.setCompanyId(4L);
+//        markerDto.setConstructTime("1990-04-02");
+//        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
+//        markerDtoList.add(markerDto);
+//        Gson gson = new Gson();
+//        String markers = gson.toJson(markerDtoList);
+//        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
+//        System.out.println(s);
 
     }
 }

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 200ad87..b75be7c 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -9,7 +9,6 @@
     var readyToUploadPoints = new Array();
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
-    var points = [];
     var vectorMarkers = [];
 
 
@@ -75,9 +74,6 @@
                         if (r.success) {//请求成功
                             window.markerData = [];
                             location.href = $('#context').val() + "/content/ems/ems.jsp";
-//                            Ems.initMap();
-//                            map.clearOverlays();
-//                            map.setViewport(pointArray);
                         }
                     },
                     error: function (d) {//请求出错
@@ -463,7 +459,6 @@
                     type: "POST",
                     url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
-//                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
                     success: function (r) {
                         if (r.data) {
@@ -478,8 +473,6 @@
                                 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 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), {
                                         // 指定Marker的icon属性为Symbol
                                         icon: new BMap.Symbol(BMap_Symbol_SHAPE_POINT, {
@@ -507,6 +500,7 @@
 //控制不同种类对象的标签信息显示
             $("#selectObjectType").die().live("change", function (e) {
                 var type = $("#selectObjectType").val();
+                OptionItemProcess.initPipeTypeList(type);
                 if (type == 1) {//管线
                     $("#pipeTypeLabel").text("管线种类");
                     $(".up-pipe").show();
@@ -538,7 +532,11 @@
                 }
             });
 
-
+            OptionItemProcess.initPipeTypeList($("#selectObjectType").val());
+            OptionItemProcess.initBelowPipeTypeList();
+            OptionItemProcess.initAreaList();
+            OptionItemProcess.initLayStyleList();
+            OptionItemProcess.initMaterialList();
         },
 
         initSelect: function () {
diff --git a/src/main/webapp/s/app/util/optionitemprocess.js b/src/main/webapp/s/app/util/optionitemprocess.js
new file mode 100644
index 0000000..f47920f
--- /dev/null
+++ b/src/main/webapp/s/app/util/optionitemprocess.js
@@ -0,0 +1,86 @@
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+var OptionItemProcess = new function(){
+
+    return{
+        GetListByType:function(arr,type){
+            var result = [];
+            for(var item in arr){
+                if(item.type&&item.type==type){
+                    result.push(item.name);
+                }
+            }
+            return result;
+        },
+        GetDataFromDb:function(){
+            $.ajax({
+                type: "get",
+                url: $('#context').val() + "/optionItems/allItems.do",
+                dataType: "json",
+                cache: true,
+                async:false,
+                success: function (r) {
+                    if (r.success) {//请求成功
+                       for(var i=0;i< r.data.length;i++){
+                           var optionItems = r.data[i];
+                           if(!window.optionItemList) window.optionItemList = new Array();
+                           if(!window.optionItemList[optionItems.type+""]){
+                               window.optionItemList[optionItems.type+""] = new Array();//是一个二维数组，type为下标
+                           }
+                           window.optionItemList[optionItems.type+""].push(optionItems.name);
+                       }
+
+                    }
+                },
+                error: function (d) {//请求出错
+                    alert("请求出错");
+                }
+            });
+        },
+
+        GetOptionStrByArr:function(arr){
+            var result = "";
+            for(var s in arr){
+                result+="<option value='"+arr[s]+"'>";
+            }
+            return result;
+        },
+        initPipeTypeList:function(type) {
+            if(type>4) return;//该字段的type定义不大于3
+            if(type==4) type=1;
+            var arr = window.optionItemList[type+""];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#pipeTypeList").children().remove();
+            $("#pipeTypeList").append(optionStr);
+        },
+        initBelowPipeTypeList:function(){
+            var arr = window.optionItemList["1"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeTypeList").children().remove();
+            $("#belowPipeTypeList").append(optionStr);
+        },
+        initMaterialList:function(){
+            var arr = window.optionItemList["MaterialType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeMaterialList").children().remove();
+            $("#belowPipeMaterialList").append(optionStr);
+            $("#pipeMaterialList").children().remove();
+            $("#pipeMaterialList").append(optionStr);
+        },
+        initLayStyleList:function(){
+            var arr = window.optionItemList["layStyleType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#layStyleList").children().remove();
+            $("#layStyleList").append(optionStr);
+        },
+        initAreaList:function(){
+        var arr = window.optionItemList["areaItem"];
+        var optionStr = this.GetOptionStrByArr(arr);
+        $("#areaList").children().remove();
+        $("#areaList").append(optionStr);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/com/casic/accessControl/maker/MainTest.java b/src/test/com/casic/accessControl/maker/MainTest.java
index 0b25814..61115ff 100644
--- a/src/test/com/casic/accessControl/maker/MainTest.java
+++ b/src/test/com/casic/accessControl/maker/MainTest.java
@@ -14,18 +14,18 @@
  */
 public class MainTest {
     public static void main(String [] args){
-        MarkerUtil markerDto = new MarkerUtil();
-        markerDto.setRecordType(1);
-        markerDto.setMarkerObjectType("供热管线");
-        markerDto.setDepth("1.2m");
-        markerDto.setCompanyId(4L);
-        markerDto.setConstructTime("1990-04-02");
-        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
-        markerDtoList.add(markerDto);
-        Gson gson = new Gson();
-        String markers = gson.toJson(markerDtoList);
-        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
-        System.out.println(s);
+//        MarkerUtil markerDto = new MarkerUtil();
+//        markerDto.setRecordType(1);
+//        markerDto.setMarkerObjectType("供热管线");
+//        markerDto.setDepth("1.2m");
+//        markerDto.setCompanyId(4L);
+//        markerDto.setConstructTime("1990-04-02");
+//        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
+//        markerDtoList.add(markerDto);
+//        Gson gson = new Gson();
+//        String markers = gson.toJson(markerDtoList);
+//        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
+//        System.out.println(s);
 
     }
 }
diff --git a/src/test/com/casic/accessControl/temp/Father.java b/src/test/com/casic/accessControl/temp/Father.java
deleted file mode 100644
index a37a492..0000000
--- a/src/test/com/casic/accessControl/temp/Father.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public class Father {
-
-    //测试回调函数
-    public void delay(ISon son){
-        System.out.println("this is the father printing");
-         son.delay();
-        System.out.println("son has printed");
-
-    }
-
-//    public static void main(String [] args){
-//
-//       Father father = new Father();
-//       Son son = new Son();
-//        father.delay(son);
-//    }
-//每个单元，前后左右均访问，如果访问遇到0，则表示空地，遇到1则变为2,
-
-    /**
-     *
-     * @param number
-     * @param row
-     * @param column
-     * @return
-     */
-    public static int visited(int[][]number, int row,int column){
-        int count =0;
-        if(row<number.length&&column<number[0].length&&number[row][column]==1){
-            //四个方向分别访问
-            //向上
-            number[row][column]=2;//修改自身，表示已经访问过
-           int upCount = visited(number,row-1,column);
-            //向下
-            int downCount = visited(number,row+1,column);
-            //向左
-            int leftCount = visited(number,row,column-1);
-            //向右
-            int rightCount = visited(number,row,column+1);
-            count = 1+upCount+downCount+leftCount+rightCount;
-        }
-        return count;
-    }
-
-//    public static void main(String [] args){
-//        int max = 0;
-//        int a[][] ={{0,0,0,0},{0,1,1,0},{0,0,1,0}, {0,0,0,0}};
-//        for(int i = 0;i<a.length;i++){
-//            for(int j=0;j<a[0].length;j++){
-//                int result = visited(a,i,j);
-//                max = result > max ? result:max;
-//            }
-//        }
-//        System.out.println("最大面积为："+ max);
-//
-//    }
-public static void main(String[] args) {
-    int[][] grid = new int[][] {
-            {0,0,0,0},
-            {0,1,0,0},
-            {0,0,1,0},
-            {0,0,0,0},
-    };
-    System.out.println(bigHouse(grid));
-}
-
-    private static int[] par = new int[11111];
-    private static int[] ran = new int[11111];
-    private static int ans=1,k,cnt=0;
-    private static void union(int i, int j) {
-        i=find(i);
-        j=find(j);
-        if(i==j)
-            return;
-        if(i>j) {
-            par[i]=j;
-            //ran[j]+=ran[i];
-            ran[j]++;
-            if(ans<ran[j]) {
-                ans=ran[j];
-                k=j;
-            }
-        }
-        else {
-            par[j]=i;
-            //ran[i]+=ran[j];
-            ran[i]++;
-            if(ans<ran[i]) {
-                ans=ran[i];
-                k=i;
-            }
-        }
-
-    }
-    private static int find(int i) {
-        int r=i;
-        while(r!=par[r])
-            r=par[r];
-        return r;
-    }
-    public static int bigHouse(int[][] grid) {
-        int n=grid.length;
-        int m=grid[0].length;
-
-        for(int i=0;i<n*m;i++) {
-            par[i]=i;ran[i]=1;
-        }
-        int flag=0;
-        for(int i=0;i<n;i++) {
-            for(int j=0;j<m;j++) {
-                if(grid[i][j]==1) {
-                    //union right
-                    flag=1;
-                    if(j<m-1 && grid[i][j+1]==1)
-                        union(i*m+j,i*m+j+1);
-                    //union left
-                    if(j>0 && grid[i][j-1]==1)
-                        union(i*m+j,i*m+j-1);
-                    //union up
-                    if(i>0 && grid[i-1][j]==1)
-                        union(i*m+j, (i-1)*m+j);
-                    //union down
-                    if(i<n-1 && grid[i+1][j]==1)
-                        union(i*m+j, (i+1)*m+j);
-                }
-            }
-        }
-        if(flag==0)
-            return 0;
-        return ans;
-    }
-}

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 200ad87..b75be7c 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -9,7 +9,6 @@
     var readyToUploadPoints = new Array();
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
-    var points = [];
     var vectorMarkers = [];
 
 
@@ -75,9 +74,6 @@
                         if (r.success) {//请求成功
                             window.markerData = [];
                             location.href = $('#context').val() + "/content/ems/ems.jsp";
-//                            Ems.initMap();
-//                            map.clearOverlays();
-//                            map.setViewport(pointArray);
                         }
                     },
                     error: function (d) {//请求出错
@@ -463,7 +459,6 @@
                     type: "POST",
                     url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
-//                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
                     success: function (r) {
                         if (r.data) {
@@ -478,8 +473,6 @@
                                 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 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), {
                                         // 指定Marker的icon属性为Symbol
                                         icon: new BMap.Symbol(BMap_Symbol_SHAPE_POINT, {
@@ -507,6 +500,7 @@
 //控制不同种类对象的标签信息显示
             $("#selectObjectType").die().live("change", function (e) {
                 var type = $("#selectObjectType").val();
+                OptionItemProcess.initPipeTypeList(type);
                 if (type == 1) {//管线
                     $("#pipeTypeLabel").text("管线种类");
                     $(".up-pipe").show();
@@ -538,7 +532,11 @@
                 }
             });
 
-
+            OptionItemProcess.initPipeTypeList($("#selectObjectType").val());
+            OptionItemProcess.initBelowPipeTypeList();
+            OptionItemProcess.initAreaList();
+            OptionItemProcess.initLayStyleList();
+            OptionItemProcess.initMaterialList();
         },
 
         initSelect: function () {
diff --git a/src/main/webapp/s/app/util/optionitemprocess.js b/src/main/webapp/s/app/util/optionitemprocess.js
new file mode 100644
index 0000000..f47920f
--- /dev/null
+++ b/src/main/webapp/s/app/util/optionitemprocess.js
@@ -0,0 +1,86 @@
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+var OptionItemProcess = new function(){
+
+    return{
+        GetListByType:function(arr,type){
+            var result = [];
+            for(var item in arr){
+                if(item.type&&item.type==type){
+                    result.push(item.name);
+                }
+            }
+            return result;
+        },
+        GetDataFromDb:function(){
+            $.ajax({
+                type: "get",
+                url: $('#context').val() + "/optionItems/allItems.do",
+                dataType: "json",
+                cache: true,
+                async:false,
+                success: function (r) {
+                    if (r.success) {//请求成功
+                       for(var i=0;i< r.data.length;i++){
+                           var optionItems = r.data[i];
+                           if(!window.optionItemList) window.optionItemList = new Array();
+                           if(!window.optionItemList[optionItems.type+""]){
+                               window.optionItemList[optionItems.type+""] = new Array();//是一个二维数组，type为下标
+                           }
+                           window.optionItemList[optionItems.type+""].push(optionItems.name);
+                       }
+
+                    }
+                },
+                error: function (d) {//请求出错
+                    alert("请求出错");
+                }
+            });
+        },
+
+        GetOptionStrByArr:function(arr){
+            var result = "";
+            for(var s in arr){
+                result+="<option value='"+arr[s]+"'>";
+            }
+            return result;
+        },
+        initPipeTypeList:function(type) {
+            if(type>4) return;//该字段的type定义不大于3
+            if(type==4) type=1;
+            var arr = window.optionItemList[type+""];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#pipeTypeList").children().remove();
+            $("#pipeTypeList").append(optionStr);
+        },
+        initBelowPipeTypeList:function(){
+            var arr = window.optionItemList["1"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeTypeList").children().remove();
+            $("#belowPipeTypeList").append(optionStr);
+        },
+        initMaterialList:function(){
+            var arr = window.optionItemList["MaterialType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeMaterialList").children().remove();
+            $("#belowPipeMaterialList").append(optionStr);
+            $("#pipeMaterialList").children().remove();
+            $("#pipeMaterialList").append(optionStr);
+        },
+        initLayStyleList:function(){
+            var arr = window.optionItemList["layStyleType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#layStyleList").children().remove();
+            $("#layStyleList").append(optionStr);
+        },
+        initAreaList:function(){
+        var arr = window.optionItemList["areaItem"];
+        var optionStr = this.GetOptionStrByArr(arr);
+        $("#areaList").children().remove();
+        $("#areaList").append(optionStr);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/com/casic/accessControl/maker/MainTest.java b/src/test/com/casic/accessControl/maker/MainTest.java
index 0b25814..61115ff 100644
--- a/src/test/com/casic/accessControl/maker/MainTest.java
+++ b/src/test/com/casic/accessControl/maker/MainTest.java
@@ -14,18 +14,18 @@
  */
 public class MainTest {
     public static void main(String [] args){
-        MarkerUtil markerDto = new MarkerUtil();
-        markerDto.setRecordType(1);
-        markerDto.setMarkerObjectType("供热管线");
-        markerDto.setDepth("1.2m");
-        markerDto.setCompanyId(4L);
-        markerDto.setConstructTime("1990-04-02");
-        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
-        markerDtoList.add(markerDto);
-        Gson gson = new Gson();
-        String markers = gson.toJson(markerDtoList);
-        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
-        System.out.println(s);
+//        MarkerUtil markerDto = new MarkerUtil();
+//        markerDto.setRecordType(1);
+//        markerDto.setMarkerObjectType("供热管线");
+//        markerDto.setDepth("1.2m");
+//        markerDto.setCompanyId(4L);
+//        markerDto.setConstructTime("1990-04-02");
+//        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
+//        markerDtoList.add(markerDto);
+//        Gson gson = new Gson();
+//        String markers = gson.toJson(markerDtoList);
+//        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
+//        System.out.println(s);
 
     }
 }
diff --git a/src/test/com/casic/accessControl/temp/Father.java b/src/test/com/casic/accessControl/temp/Father.java
deleted file mode 100644
index a37a492..0000000
--- a/src/test/com/casic/accessControl/temp/Father.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public class Father {
-
-    //测试回调函数
-    public void delay(ISon son){
-        System.out.println("this is the father printing");
-         son.delay();
-        System.out.println("son has printed");
-
-    }
-
-//    public static void main(String [] args){
-//
-//       Father father = new Father();
-//       Son son = new Son();
-//        father.delay(son);
-//    }
-//每个单元，前后左右均访问，如果访问遇到0，则表示空地，遇到1则变为2,
-
-    /**
-     *
-     * @param number
-     * @param row
-     * @param column
-     * @return
-     */
-    public static int visited(int[][]number, int row,int column){
-        int count =0;
-        if(row<number.length&&column<number[0].length&&number[row][column]==1){
-            //四个方向分别访问
-            //向上
-            number[row][column]=2;//修改自身，表示已经访问过
-           int upCount = visited(number,row-1,column);
-            //向下
-            int downCount = visited(number,row+1,column);
-            //向左
-            int leftCount = visited(number,row,column-1);
-            //向右
-            int rightCount = visited(number,row,column+1);
-            count = 1+upCount+downCount+leftCount+rightCount;
-        }
-        return count;
-    }
-
-//    public static void main(String [] args){
-//        int max = 0;
-//        int a[][] ={{0,0,0,0},{0,1,1,0},{0,0,1,0}, {0,0,0,0}};
-//        for(int i = 0;i<a.length;i++){
-//            for(int j=0;j<a[0].length;j++){
-//                int result = visited(a,i,j);
-//                max = result > max ? result:max;
-//            }
-//        }
-//        System.out.println("最大面积为："+ max);
-//
-//    }
-public static void main(String[] args) {
-    int[][] grid = new int[][] {
-            {0,0,0,0},
-            {0,1,0,0},
-            {0,0,1,0},
-            {0,0,0,0},
-    };
-    System.out.println(bigHouse(grid));
-}
-
-    private static int[] par = new int[11111];
-    private static int[] ran = new int[11111];
-    private static int ans=1,k,cnt=0;
-    private static void union(int i, int j) {
-        i=find(i);
-        j=find(j);
-        if(i==j)
-            return;
-        if(i>j) {
-            par[i]=j;
-            //ran[j]+=ran[i];
-            ran[j]++;
-            if(ans<ran[j]) {
-                ans=ran[j];
-                k=j;
-            }
-        }
-        else {
-            par[j]=i;
-            //ran[i]+=ran[j];
-            ran[i]++;
-            if(ans<ran[i]) {
-                ans=ran[i];
-                k=i;
-            }
-        }
-
-    }
-    private static int find(int i) {
-        int r=i;
-        while(r!=par[r])
-            r=par[r];
-        return r;
-    }
-    public static int bigHouse(int[][] grid) {
-        int n=grid.length;
-        int m=grid[0].length;
-
-        for(int i=0;i<n*m;i++) {
-            par[i]=i;ran[i]=1;
-        }
-        int flag=0;
-        for(int i=0;i<n;i++) {
-            for(int j=0;j<m;j++) {
-                if(grid[i][j]==1) {
-                    //union right
-                    flag=1;
-                    if(j<m-1 && grid[i][j+1]==1)
-                        union(i*m+j,i*m+j+1);
-                    //union left
-                    if(j>0 && grid[i][j-1]==1)
-                        union(i*m+j,i*m+j-1);
-                    //union up
-                    if(i>0 && grid[i-1][j]==1)
-                        union(i*m+j, (i-1)*m+j);
-                    //union down
-                    if(i<n-1 && grid[i+1][j]==1)
-                        union(i*m+j, (i+1)*m+j);
-                }
-            }
-        }
-        if(flag==0)
-            return 0;
-        return ans;
-    }
-}
diff --git a/src/test/com/casic/accessControl/temp/ISon.java b/src/test/com/casic/accessControl/temp/ISon.java
deleted file mode 100644
index 71f1dcd..0000000
--- a/src/test/com/casic/accessControl/temp/ISon.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public interface ISon {
-
-    public void delay();
-}

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 200ad87..b75be7c 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -9,7 +9,6 @@
     var readyToUploadPoints = new Array();
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
-    var points = [];
     var vectorMarkers = [];
 
 
@@ -75,9 +74,6 @@
                         if (r.success) {//请求成功
                             window.markerData = [];
                             location.href = $('#context').val() + "/content/ems/ems.jsp";
-//                            Ems.initMap();
-//                            map.clearOverlays();
-//                            map.setViewport(pointArray);
                         }
                     },
                     error: function (d) {//请求出错
@@ -463,7 +459,6 @@
                     type: "POST",
                     url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
-//                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
                     success: function (r) {
                         if (r.data) {
@@ -478,8 +473,6 @@
                                 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 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), {
                                         // 指定Marker的icon属性为Symbol
                                         icon: new BMap.Symbol(BMap_Symbol_SHAPE_POINT, {
@@ -507,6 +500,7 @@
 //控制不同种类对象的标签信息显示
             $("#selectObjectType").die().live("change", function (e) {
                 var type = $("#selectObjectType").val();
+                OptionItemProcess.initPipeTypeList(type);
                 if (type == 1) {//管线
                     $("#pipeTypeLabel").text("管线种类");
                     $(".up-pipe").show();
@@ -538,7 +532,11 @@
                 }
             });
 
-
+            OptionItemProcess.initPipeTypeList($("#selectObjectType").val());
+            OptionItemProcess.initBelowPipeTypeList();
+            OptionItemProcess.initAreaList();
+            OptionItemProcess.initLayStyleList();
+            OptionItemProcess.initMaterialList();
         },
 
         initSelect: function () {
diff --git a/src/main/webapp/s/app/util/optionitemprocess.js b/src/main/webapp/s/app/util/optionitemprocess.js
new file mode 100644
index 0000000..f47920f
--- /dev/null
+++ b/src/main/webapp/s/app/util/optionitemprocess.js
@@ -0,0 +1,86 @@
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+var OptionItemProcess = new function(){
+
+    return{
+        GetListByType:function(arr,type){
+            var result = [];
+            for(var item in arr){
+                if(item.type&&item.type==type){
+                    result.push(item.name);
+                }
+            }
+            return result;
+        },
+        GetDataFromDb:function(){
+            $.ajax({
+                type: "get",
+                url: $('#context').val() + "/optionItems/allItems.do",
+                dataType: "json",
+                cache: true,
+                async:false,
+                success: function (r) {
+                    if (r.success) {//请求成功
+                       for(var i=0;i< r.data.length;i++){
+                           var optionItems = r.data[i];
+                           if(!window.optionItemList) window.optionItemList = new Array();
+                           if(!window.optionItemList[optionItems.type+""]){
+                               window.optionItemList[optionItems.type+""] = new Array();//是一个二维数组，type为下标
+                           }
+                           window.optionItemList[optionItems.type+""].push(optionItems.name);
+                       }
+
+                    }
+                },
+                error: function (d) {//请求出错
+                    alert("请求出错");
+                }
+            });
+        },
+
+        GetOptionStrByArr:function(arr){
+            var result = "";
+            for(var s in arr){
+                result+="<option value='"+arr[s]+"'>";
+            }
+            return result;
+        },
+        initPipeTypeList:function(type) {
+            if(type>4) return;//该字段的type定义不大于3
+            if(type==4) type=1;
+            var arr = window.optionItemList[type+""];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#pipeTypeList").children().remove();
+            $("#pipeTypeList").append(optionStr);
+        },
+        initBelowPipeTypeList:function(){
+            var arr = window.optionItemList["1"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeTypeList").children().remove();
+            $("#belowPipeTypeList").append(optionStr);
+        },
+        initMaterialList:function(){
+            var arr = window.optionItemList["MaterialType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeMaterialList").children().remove();
+            $("#belowPipeMaterialList").append(optionStr);
+            $("#pipeMaterialList").children().remove();
+            $("#pipeMaterialList").append(optionStr);
+        },
+        initLayStyleList:function(){
+            var arr = window.optionItemList["layStyleType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#layStyleList").children().remove();
+            $("#layStyleList").append(optionStr);
+        },
+        initAreaList:function(){
+        var arr = window.optionItemList["areaItem"];
+        var optionStr = this.GetOptionStrByArr(arr);
+        $("#areaList").children().remove();
+        $("#areaList").append(optionStr);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/com/casic/accessControl/maker/MainTest.java b/src/test/com/casic/accessControl/maker/MainTest.java
index 0b25814..61115ff 100644
--- a/src/test/com/casic/accessControl/maker/MainTest.java
+++ b/src/test/com/casic/accessControl/maker/MainTest.java
@@ -14,18 +14,18 @@
  */
 public class MainTest {
     public static void main(String [] args){
-        MarkerUtil markerDto = new MarkerUtil();
-        markerDto.setRecordType(1);
-        markerDto.setMarkerObjectType("供热管线");
-        markerDto.setDepth("1.2m");
-        markerDto.setCompanyId(4L);
-        markerDto.setConstructTime("1990-04-02");
-        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
-        markerDtoList.add(markerDto);
-        Gson gson = new Gson();
-        String markers = gson.toJson(markerDtoList);
-        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
-        System.out.println(s);
+//        MarkerUtil markerDto = new MarkerUtil();
+//        markerDto.setRecordType(1);
+//        markerDto.setMarkerObjectType("供热管线");
+//        markerDto.setDepth("1.2m");
+//        markerDto.setCompanyId(4L);
+//        markerDto.setConstructTime("1990-04-02");
+//        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
+//        markerDtoList.add(markerDto);
+//        Gson gson = new Gson();
+//        String markers = gson.toJson(markerDtoList);
+//        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
+//        System.out.println(s);
 
     }
 }
diff --git a/src/test/com/casic/accessControl/temp/Father.java b/src/test/com/casic/accessControl/temp/Father.java
deleted file mode 100644
index a37a492..0000000
--- a/src/test/com/casic/accessControl/temp/Father.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public class Father {
-
-    //测试回调函数
-    public void delay(ISon son){
-        System.out.println("this is the father printing");
-         son.delay();
-        System.out.println("son has printed");
-
-    }
-
-//    public static void main(String [] args){
-//
-//       Father father = new Father();
-//       Son son = new Son();
-//        father.delay(son);
-//    }
-//每个单元，前后左右均访问，如果访问遇到0，则表示空地，遇到1则变为2,
-
-    /**
-     *
-     * @param number
-     * @param row
-     * @param column
-     * @return
-     */
-    public static int visited(int[][]number, int row,int column){
-        int count =0;
-        if(row<number.length&&column<number[0].length&&number[row][column]==1){
-            //四个方向分别访问
-            //向上
-            number[row][column]=2;//修改自身，表示已经访问过
-           int upCount = visited(number,row-1,column);
-            //向下
-            int downCount = visited(number,row+1,column);
-            //向左
-            int leftCount = visited(number,row,column-1);
-            //向右
-            int rightCount = visited(number,row,column+1);
-            count = 1+upCount+downCount+leftCount+rightCount;
-        }
-        return count;
-    }
-
-//    public static void main(String [] args){
-//        int max = 0;
-//        int a[][] ={{0,0,0,0},{0,1,1,0},{0,0,1,0}, {0,0,0,0}};
-//        for(int i = 0;i<a.length;i++){
-//            for(int j=0;j<a[0].length;j++){
-//                int result = visited(a,i,j);
-//                max = result > max ? result:max;
-//            }
-//        }
-//        System.out.println("最大面积为："+ max);
-//
-//    }
-public static void main(String[] args) {
-    int[][] grid = new int[][] {
-            {0,0,0,0},
-            {0,1,0,0},
-            {0,0,1,0},
-            {0,0,0,0},
-    };
-    System.out.println(bigHouse(grid));
-}
-
-    private static int[] par = new int[11111];
-    private static int[] ran = new int[11111];
-    private static int ans=1,k,cnt=0;
-    private static void union(int i, int j) {
-        i=find(i);
-        j=find(j);
-        if(i==j)
-            return;
-        if(i>j) {
-            par[i]=j;
-            //ran[j]+=ran[i];
-            ran[j]++;
-            if(ans<ran[j]) {
-                ans=ran[j];
-                k=j;
-            }
-        }
-        else {
-            par[j]=i;
-            //ran[i]+=ran[j];
-            ran[i]++;
-            if(ans<ran[i]) {
-                ans=ran[i];
-                k=i;
-            }
-        }
-
-    }
-    private static int find(int i) {
-        int r=i;
-        while(r!=par[r])
-            r=par[r];
-        return r;
-    }
-    public static int bigHouse(int[][] grid) {
-        int n=grid.length;
-        int m=grid[0].length;
-
-        for(int i=0;i<n*m;i++) {
-            par[i]=i;ran[i]=1;
-        }
-        int flag=0;
-        for(int i=0;i<n;i++) {
-            for(int j=0;j<m;j++) {
-                if(grid[i][j]==1) {
-                    //union right
-                    flag=1;
-                    if(j<m-1 && grid[i][j+1]==1)
-                        union(i*m+j,i*m+j+1);
-                    //union left
-                    if(j>0 && grid[i][j-1]==1)
-                        union(i*m+j,i*m+j-1);
-                    //union up
-                    if(i>0 && grid[i-1][j]==1)
-                        union(i*m+j, (i-1)*m+j);
-                    //union down
-                    if(i<n-1 && grid[i+1][j]==1)
-                        union(i*m+j, (i+1)*m+j);
-                }
-            }
-        }
-        if(flag==0)
-            return 0;
-        return ans;
-    }
-}
diff --git a/src/test/com/casic/accessControl/temp/ISon.java b/src/test/com/casic/accessControl/temp/ISon.java
deleted file mode 100644
index 71f1dcd..0000000
--- a/src/test/com/casic/accessControl/temp/ISon.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public interface ISon {
-
-    public void delay();
-}
diff --git a/src/test/com/casic/accessControl/temp/Son.java b/src/test/com/casic/accessControl/temp/Son.java
deleted file mode 100644
index 73b3f87..0000000
--- a/src/test/com/casic/accessControl/temp/Son.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public class Son implements ISon{
-    public  void delay(){
-        try {
-            Thread.sleep(10*1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        System.out.println("this is the son printing");
-    }
-
-    public static void main(String [] args){
-
-//        Father father = new Father();
-//        Son son = new Son();
-//        father.delay(son);
-//        System.out.println("the end……");
-        for(int i=0;i<0;i++){
-            System.out.println("执行");
-        }
-        System.out.println("完毕");
-    }
-}

diff --git a/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
new file mode 100644
index 0000000..bee3cd9
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/domain/OptionItem.java
@@ -0,0 +1,54 @@
+package com.casic.accessControl.marker.domain;
+
+import javax.persistence.*;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Entity
+@Table(name = "optionitem")
+public class OptionItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "type")
+    private String type;
+    @Column(name ="cid")
+    private Long cid;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
new file mode 100644
index 0000000..99368ff
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/dto/OptionItemDto.java
@@ -0,0 +1,64 @@
+package com.casic.accessControl.marker.dto;
+
+import com.casic.accessControl.marker.domain.OptionItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+public class OptionItemDto {
+    private Long id;
+    private String name;
+    private String type;
+    private Long cid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    public static OptionItemDto convert2OptionItemDto(OptionItem optionItem){
+        OptionItemDto optionItemDto = new OptionItemDto();
+        optionItemDto.setId(optionItem.getId());
+        optionItemDto.setName(optionItem.getName());
+        optionItemDto.setType(optionItem.getType());
+        optionItemDto.setCid(optionItem.getCid());
+        return optionItemDto;
+    }
+    public static List<OptionItemDto> convert2OptionItemDtoList(List<OptionItem> optionItemList){
+        List<OptionItemDto> optionItemDtos = new ArrayList<OptionItemDto>();
+        for(OptionItem optionItem:optionItemList){
+            optionItemDtos.add(convert2OptionItemDto(optionItem));
+        }
+        return optionItemDtos;
+    }
+}
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 11d0b1f..74efbbc 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -57,6 +57,8 @@
     private Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private CsvExportor exportor;
+    @Resource
+    private OptionItemManager optionItemManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, Long companyId) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -219,6 +221,16 @@
             marker.setIsValid(1);
             marker.setCompanyId(companyId);
             this.saveMarker(marker);
+            //插入下拉列表的值
+            int type = markerDto.getRecordType();
+            if(type==4) type =1;
+            optionItemManager.saveIfNotExists(companyId,markerDto.getMarkerObjectType(), type+"");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getArea(),"areaItem");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getPipeMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowMaterial(),"MaterialType");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getBelowType(),"1");
+            optionItemManager.saveIfNotExists(companyId,markerDto.getLayStyle(),"layStyleType");
+
         }
         return true;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
new file mode 100644
index 0000000..cb9faa3
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/manager/OptionItemManager.java
@@ -0,0 +1,46 @@
+package com.casic.accessControl.marker.manager;
+
+import com.casic.accessControl.core.hibernate.HibernateEntityDao;
+import com.casic.accessControl.core.util.StringUtils;
+import com.casic.accessControl.marker.domain.OptionItem;
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Service
+public class OptionItemManager extends HibernateEntityDao<OptionItem> {
+
+    public List<OptionItemDto> getItemsList(Long companyId){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        List<OptionItem> optionItemList = criteria.list();
+        return OptionItemDto.convert2OptionItemDtoList(optionItemList);
+    }
+
+    public boolean isExistItem(Long companyId,String itemName,String type){
+        Criteria criteria = this.getSession().createCriteria(OptionItem.class);
+        criteria.add(Restrictions.or(Restrictions.eq("cid",0L),Restrictions.eq("cid",companyId)));
+        criteria.add(Restrictions.eq("name",itemName)).add(Restrictions.eq("type",type));
+        List<OptionItem> optionItemList = criteria.list();
+        if(optionItemList.size()>0) return true;
+        return false;
+    }
+//如果不存在就插入，以后优化为批量的
+    public void saveIfNotExists(Long companyId,String itemName,String type){
+        if(StringUtils.isBlank(itemName)) return;
+        if(!isExistItem(companyId,itemName,type)){
+            OptionItem item = new OptionItem();
+            item.setType(type);
+            item.setName(itemName);
+            item.setCid(companyId);
+            save(item);
+        }
+    }
+}
diff --git a/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
new file mode 100644
index 0000000..230ae9e
--- /dev/null
+++ b/src/main/java/com/casic/accessControl/marker/web/OptionItemController.java
@@ -0,0 +1,36 @@
+package com.casic.accessControl.marker.web;
+
+import com.casic.accessControl.marker.dto.OptionItemDto;
+import com.casic.accessControl.marker.manager.OptionItemManager;
+import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+@Controller
+@RequestMapping("optionItems")
+public class OptionItemController {
+    @Resource
+    private OptionItemManager optionItemManager;
+
+    @RequestMapping("allItems")
+    public @ResponseBody Map<String, Object> getAllItems( HttpSession session) {
+        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
+        Long companyId = user.getCompany().getId();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<OptionItemDto> list = optionItemManager.getItemsList(companyId);
+        result.put("data", list);
+        result.put("success", true);
+        return result;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b659f37..1a5b882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 3f4a2a8..5bb1a7e 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -64,6 +64,7 @@
                 <value>com.casic.accessControl.task.domain.TaskDetail</value>
                 <value>com.casic.accessControl.task.domain.Position</value>
                 <value>com.casic.accessControl.event.domain.Event</value>
+                <value>com.casic.accessControl.marker.domain.OptionItem</value>
             </list>
         </property>
     </bean>
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 18f1d40..c867c83 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -185,7 +185,9 @@
             <label class="control-label" id="pipeTypeLabel">管线种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="markerObjectType"/>
+                <input type="text" class="m-wrap" id="markerObjectType" list="pipeTypeList"/>
+                <datalist id="pipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -207,7 +209,9 @@
             <label class="control-label" id="pipeMaterialLabel">管线材质</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="pipeMaterial"/>
+                <input type="text" class="m-wrap" id="pipeMaterial" list="pipeMaterialList"/>
+                <datalist id="pipeMaterialList"><!--提示框-->
+                </datalist>
             </div>
         </div>
     </div>
@@ -219,7 +223,9 @@
             <label class="control-label">下层管种类</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeType"/>
+                <input type="text" class="m-wrap" id="belowPipeType" list="belowPipeTypeList"/>
+                <datalist id="belowPipeTypeList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -251,7 +257,9 @@
             <label class="control-label">下层管材料</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="belowPipeMaterial"/>
+                <input type="text" class="m-wrap" id="belowPipeMaterial" list="belowPipeMaterialList"/>
+                <datalist id="belowPipeMaterialList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -276,7 +284,9 @@
                 <label class="control-label">埋设方式</label>
 
                 <div class="controls">
-                    <input type="text" class="m-wrap" id="layStyle"/>
+                    <input type="text" class="m-wrap" id="layStyle" list="layStyleList"/>
+                    <datalist id="layStyleList">
+                    </datalist>
                 </div>
             </div>
         </div>
@@ -288,7 +298,9 @@
             <label class="control-label">所属区域</label>
 
             <div class="controls">
-                <input type="text" class="m-wrap" id="area"/>
+                <input type="text" class="m-wrap" id="area" list="areaList"/>
+                <datalist id="areaList">
+                </datalist>
             </div>
         </div>
     </div>
@@ -501,6 +513,7 @@
 <script src="${ctx}/s/app/ems/EmsEditControl.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/ems-marker-opt.js" type="text/javascript"></script>
 <script src="${ctx}/s/app/ems/gps-bd-Utils.js" type="text/javascript"></script>
+<script src="${ctx}/s/app/util/optionitemprocess.js" type="text/javascript"></script>
 
 <script>
 
@@ -508,10 +521,12 @@
 
         App.init(); // initlayout and core plugins
         $('.hidden-phone').trigger("click");
+        OptionItemProcess.GetDataFromDb();
         Ems.initMap();
         Ems.initForm();
         Ems.initSelect();
-        EmsMarkerOpt.init();//导出Excel，和陈涛交互字段待定，暂时未做
+        EmsMarkerOpt.init();
+
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 200ad87..b75be7c 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -9,7 +9,6 @@
     var readyToUploadPoints = new Array();
     var drawOverlays = new Array();
     var readyToUploadMarkers = new Array();
-    var points = [];
     var vectorMarkers = [];
 
 
@@ -75,9 +74,6 @@
                         if (r.success) {//请求成功
                             window.markerData = [];
                             location.href = $('#context').val() + "/content/ems/ems.jsp";
-//                            Ems.initMap();
-//                            map.clearOverlays();
-//                            map.setViewport(pointArray);
                         }
                     },
                     error: function (d) {//请求出错
@@ -463,7 +459,6 @@
                     type: "POST",
                     url: $('#context').val() + "/marker/getMarkerListByCondition.do",
                     data: {"strMarkerDto": JSON.stringify(Marker)},
-//                    data: {"parentId": featureId, "markerName": markerName},
                     dataType: "json",
                     success: function (r) {
                         if (r.data) {
@@ -478,8 +473,6 @@
                                 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 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), {
                                         // 指定Marker的icon属性为Symbol
                                         icon: new BMap.Symbol(BMap_Symbol_SHAPE_POINT, {
@@ -507,6 +500,7 @@
 //控制不同种类对象的标签信息显示
             $("#selectObjectType").die().live("change", function (e) {
                 var type = $("#selectObjectType").val();
+                OptionItemProcess.initPipeTypeList(type);
                 if (type == 1) {//管线
                     $("#pipeTypeLabel").text("管线种类");
                     $(".up-pipe").show();
@@ -538,7 +532,11 @@
                 }
             });
 
-
+            OptionItemProcess.initPipeTypeList($("#selectObjectType").val());
+            OptionItemProcess.initBelowPipeTypeList();
+            OptionItemProcess.initAreaList();
+            OptionItemProcess.initLayStyleList();
+            OptionItemProcess.initMaterialList();
         },
 
         initSelect: function () {
diff --git a/src/main/webapp/s/app/util/optionitemprocess.js b/src/main/webapp/s/app/util/optionitemprocess.js
new file mode 100644
index 0000000..f47920f
--- /dev/null
+++ b/src/main/webapp/s/app/util/optionitemprocess.js
@@ -0,0 +1,86 @@
+/**
+ * Created by lenovo on 2016/12/6.
+ */
+var OptionItemProcess = new function(){
+
+    return{
+        GetListByType:function(arr,type){
+            var result = [];
+            for(var item in arr){
+                if(item.type&&item.type==type){
+                    result.push(item.name);
+                }
+            }
+            return result;
+        },
+        GetDataFromDb:function(){
+            $.ajax({
+                type: "get",
+                url: $('#context').val() + "/optionItems/allItems.do",
+                dataType: "json",
+                cache: true,
+                async:false,
+                success: function (r) {
+                    if (r.success) {//请求成功
+                       for(var i=0;i< r.data.length;i++){
+                           var optionItems = r.data[i];
+                           if(!window.optionItemList) window.optionItemList = new Array();
+                           if(!window.optionItemList[optionItems.type+""]){
+                               window.optionItemList[optionItems.type+""] = new Array();//是一个二维数组，type为下标
+                           }
+                           window.optionItemList[optionItems.type+""].push(optionItems.name);
+                       }
+
+                    }
+                },
+                error: function (d) {//请求出错
+                    alert("请求出错");
+                }
+            });
+        },
+
+        GetOptionStrByArr:function(arr){
+            var result = "";
+            for(var s in arr){
+                result+="<option value='"+arr[s]+"'>";
+            }
+            return result;
+        },
+        initPipeTypeList:function(type) {
+            if(type>4) return;//该字段的type定义不大于3
+            if(type==4) type=1;
+            var arr = window.optionItemList[type+""];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#pipeTypeList").children().remove();
+            $("#pipeTypeList").append(optionStr);
+        },
+        initBelowPipeTypeList:function(){
+            var arr = window.optionItemList["1"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeTypeList").children().remove();
+            $("#belowPipeTypeList").append(optionStr);
+        },
+        initMaterialList:function(){
+            var arr = window.optionItemList["MaterialType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#belowPipeMaterialList").children().remove();
+            $("#belowPipeMaterialList").append(optionStr);
+            $("#pipeMaterialList").children().remove();
+            $("#pipeMaterialList").append(optionStr);
+        },
+        initLayStyleList:function(){
+            var arr = window.optionItemList["layStyleType"];
+            var optionStr = this.GetOptionStrByArr(arr);
+            $("#layStyleList").children().remove();
+            $("#layStyleList").append(optionStr);
+        },
+        initAreaList:function(){
+        var arr = window.optionItemList["areaItem"];
+        var optionStr = this.GetOptionStrByArr(arr);
+        $("#areaList").children().remove();
+        $("#areaList").append(optionStr);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/com/casic/accessControl/maker/MainTest.java b/src/test/com/casic/accessControl/maker/MainTest.java
index 0b25814..61115ff 100644
--- a/src/test/com/casic/accessControl/maker/MainTest.java
+++ b/src/test/com/casic/accessControl/maker/MainTest.java
@@ -14,18 +14,18 @@
  */
 public class MainTest {
     public static void main(String [] args){
-        MarkerUtil markerDto = new MarkerUtil();
-        markerDto.setRecordType(1);
-        markerDto.setMarkerObjectType("供热管线");
-        markerDto.setDepth("1.2m");
-        markerDto.setCompanyId(4L);
-        markerDto.setConstructTime("1990-04-02");
-        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
-        markerDtoList.add(markerDto);
-        Gson gson = new Gson();
-        String markers = gson.toJson(markerDtoList);
-        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
-        System.out.println(s);
+//        MarkerUtil markerDto = new MarkerUtil();
+//        markerDto.setRecordType(1);
+//        markerDto.setMarkerObjectType("供热管线");
+//        markerDto.setDepth("1.2m");
+//        markerDto.setCompanyId(4L);
+//        markerDto.setConstructTime("1990-04-02");
+//        List<MarkerUtil> markerDtoList = new ArrayList<MarkerUtil>();
+//        markerDtoList.add(markerDto);
+//        Gson gson = new Gson();
+//        String markers = gson.toJson(markerDtoList);
+//        String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/marker/batchSave-na.do", "markers=" + markers);
+//        System.out.println(s);
 
     }
 }
diff --git a/src/test/com/casic/accessControl/temp/Father.java b/src/test/com/casic/accessControl/temp/Father.java
deleted file mode 100644
index a37a492..0000000
--- a/src/test/com/casic/accessControl/temp/Father.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public class Father {
-
-    //测试回调函数
-    public void delay(ISon son){
-        System.out.println("this is the father printing");
-         son.delay();
-        System.out.println("son has printed");
-
-    }
-
-//    public static void main(String [] args){
-//
-//       Father father = new Father();
-//       Son son = new Son();
-//        father.delay(son);
-//    }
-//每个单元，前后左右均访问，如果访问遇到0，则表示空地，遇到1则变为2,
-
-    /**
-     *
-     * @param number
-     * @param row
-     * @param column
-     * @return
-     */
-    public static int visited(int[][]number, int row,int column){
-        int count =0;
-        if(row<number.length&&column<number[0].length&&number[row][column]==1){
-            //四个方向分别访问
-            //向上
-            number[row][column]=2;//修改自身，表示已经访问过
-           int upCount = visited(number,row-1,column);
-            //向下
-            int downCount = visited(number,row+1,column);
-            //向左
-            int leftCount = visited(number,row,column-1);
-            //向右
-            int rightCount = visited(number,row,column+1);
-            count = 1+upCount+downCount+leftCount+rightCount;
-        }
-        return count;
-    }
-
-//    public static void main(String [] args){
-//        int max = 0;
-//        int a[][] ={{0,0,0,0},{0,1,1,0},{0,0,1,0}, {0,0,0,0}};
-//        for(int i = 0;i<a.length;i++){
-//            for(int j=0;j<a[0].length;j++){
-//                int result = visited(a,i,j);
-//                max = result > max ? result:max;
-//            }
-//        }
-//        System.out.println("最大面积为："+ max);
-//
-//    }
-public static void main(String[] args) {
-    int[][] grid = new int[][] {
-            {0,0,0,0},
-            {0,1,0,0},
-            {0,0,1,0},
-            {0,0,0,0},
-    };
-    System.out.println(bigHouse(grid));
-}
-
-    private static int[] par = new int[11111];
-    private static int[] ran = new int[11111];
-    private static int ans=1,k,cnt=0;
-    private static void union(int i, int j) {
-        i=find(i);
-        j=find(j);
-        if(i==j)
-            return;
-        if(i>j) {
-            par[i]=j;
-            //ran[j]+=ran[i];
-            ran[j]++;
-            if(ans<ran[j]) {
-                ans=ran[j];
-                k=j;
-            }
-        }
-        else {
-            par[j]=i;
-            //ran[i]+=ran[j];
-            ran[i]++;
-            if(ans<ran[i]) {
-                ans=ran[i];
-                k=i;
-            }
-        }
-
-    }
-    private static int find(int i) {
-        int r=i;
-        while(r!=par[r])
-            r=par[r];
-        return r;
-    }
-    public static int bigHouse(int[][] grid) {
-        int n=grid.length;
-        int m=grid[0].length;
-
-        for(int i=0;i<n*m;i++) {
-            par[i]=i;ran[i]=1;
-        }
-        int flag=0;
-        for(int i=0;i<n;i++) {
-            for(int j=0;j<m;j++) {
-                if(grid[i][j]==1) {
-                    //union right
-                    flag=1;
-                    if(j<m-1 && grid[i][j+1]==1)
-                        union(i*m+j,i*m+j+1);
-                    //union left
-                    if(j>0 && grid[i][j-1]==1)
-                        union(i*m+j,i*m+j-1);
-                    //union up
-                    if(i>0 && grid[i-1][j]==1)
-                        union(i*m+j, (i-1)*m+j);
-                    //union down
-                    if(i<n-1 && grid[i+1][j]==1)
-                        union(i*m+j, (i+1)*m+j);
-                }
-            }
-        }
-        if(flag==0)
-            return 0;
-        return ans;
-    }
-}
diff --git a/src/test/com/casic/accessControl/temp/ISon.java b/src/test/com/casic/accessControl/temp/ISon.java
deleted file mode 100644
index 71f1dcd..0000000
--- a/src/test/com/casic/accessControl/temp/ISon.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public interface ISon {
-
-    public void delay();
-}
diff --git a/src/test/com/casic/accessControl/temp/Son.java b/src/test/com/casic/accessControl/temp/Son.java
deleted file mode 100644
index 73b3f87..0000000
--- a/src/test/com/casic/accessControl/temp/Son.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.accessControl.temp;
-
-/**
- * Created by lenovo on 2016/9/23.
- */
-public class Son implements ISon{
-    public  void delay(){
-        try {
-            Thread.sleep(10*1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        System.out.println("this is the son printing");
-    }
-
-    public static void main(String [] args){
-
-//        Father father = new Father();
-//        Son son = new Son();
-//        father.delay(son);
-//        System.out.println("the end……");
-        for(int i=0;i<0;i++){
-            System.out.println("执行");
-        }
-        System.out.println("完毕");
-    }
-}
diff --git a/src/test/com/casic/accessControl/versionTest/Version.java b/src/test/com/casic/accessControl/versionTest/Version.java
deleted file mode 100644
index f4f6e98..0000000
--- a/src/test/com/casic/accessControl/versionTest/Version.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.casic.accessControl.versionTest;
-
-import java.io.File;
-import java.util.Date;
-
-/**
- * Created by lenovo on 2016/10/18.
- */
-public class Version {
-
-        public static void main(String [] args) {
-
-            String filePath = "src/com/lzw/demo/StackTest/lzwCode.java"; //指定文件路径
-            File file = new File(filePath); //创建文件对象
-            System.out.println("文件名称：" + file.getName());
-            System.out.println("文件是否存在：" + file.exists());
-            System.out.println("文件的相对路径：" + file.getPath());
-            System.out.println("文件的绝对路径：" + file.getAbsolutePath());
-            System.out.println("文件可以读取：" + file.canRead());
-            System.out.println("文件可以写入：" + file.canWrite());
-            System.out.println("文件上级路径：" + file.getParent());
-            System.out.println("文件大小：" + file.length() + "B");
-            System.out.println("文件最后修改时间：" + new Date(file.lastModified()));
-            System.out.println("是否是文件类型：" + file.isFile());
-            System.out.println("是否是文件夹类型：" + file.isDirectory());
-        }
-}