diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index 6c56a11..2b97fdc 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -5,6 +5,9 @@
 import com.casic.accessControl.event.dto.EventDto;
 import com.casic.accessControl.task.dto.TaskDto;
 import com.casic.accessControl.util.DateUtils;
+import org.apache.xmlbeans.impl.xb.xsdschema.RestrictionDocument;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -30,6 +33,9 @@
      */
     public List<EventDto> getEventsByTaskId(Long taskId) {
        List<Event> events = this.findBy("taskId",taskId);
+//        Criteria criteria = this.createCriteria(Event.class);
+//        criteria.add(Restrictions.eq("taskId",taskId));
+//        List<Event> events = criteria.list();
         List<EventDto> eventDtos = EventDto.convert2EventDtoList(events);
         return eventDtos;
     }

diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index 6c56a11..2b97fdc 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -5,6 +5,9 @@
 import com.casic.accessControl.event.dto.EventDto;
 import com.casic.accessControl.task.dto.TaskDto;
 import com.casic.accessControl.util.DateUtils;
+import org.apache.xmlbeans.impl.xb.xsdschema.RestrictionDocument;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -30,6 +33,9 @@
      */
     public List<EventDto> getEventsByTaskId(Long taskId) {
        List<Event> events = this.findBy("taskId",taskId);
+//        Criteria criteria = this.createCriteria(Event.class);
+//        criteria.add(Restrictions.eq("taskId",taskId));
+//        List<Event> events = criteria.list();
         List<EventDto> eventDtos = EventDto.convert2EventDtoList(events);
         return eventDtos;
     }
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 765f043..5a50e2a 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -47,7 +47,7 @@
             <props>
                 <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
-                <prop key="hibernate.show_sql">false</prop>
+                <prop key="hibernate.show_sql">true</prop>
                 <prop key="hibernate.format_sql">true</prop>
             </props>
         </property>
@@ -62,6 +62,7 @@
                 <value>com.casic.accessControl.task.domain.Task</value>
                 <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.location.domain.Location</value>-->
 
             </list>

diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index 6c56a11..2b97fdc 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -5,6 +5,9 @@
 import com.casic.accessControl.event.dto.EventDto;
 import com.casic.accessControl.task.dto.TaskDto;
 import com.casic.accessControl.util.DateUtils;
+import org.apache.xmlbeans.impl.xb.xsdschema.RestrictionDocument;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -30,6 +33,9 @@
      */
     public List<EventDto> getEventsByTaskId(Long taskId) {
        List<Event> events = this.findBy("taskId",taskId);
+//        Criteria criteria = this.createCriteria(Event.class);
+//        criteria.add(Restrictions.eq("taskId",taskId));
+//        List<Event> events = criteria.list();
         List<EventDto> eventDtos = EventDto.convert2EventDtoList(events);
         return eventDtos;
     }
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 765f043..5a50e2a 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -47,7 +47,7 @@
             <props>
                 <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
-                <prop key="hibernate.show_sql">false</prop>
+                <prop key="hibernate.show_sql">true</prop>
                 <prop key="hibernate.format_sql">true</prop>
             </props>
         </property>
@@ -62,6 +62,7 @@
                 <value>com.casic.accessControl.task.domain.Task</value>
                 <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.location.domain.Location</value>-->
 
             </list>
diff --git a/src/main/webapp/content/task/task.jsp b/src/main/webapp/content/task/task.jsp
index 87330c7..629b0f7 100644
--- a/src/main/webapp/content/task/task.jsp
+++ b/src/main/webapp/content/task/task.jsp
@@ -132,14 +132,14 @@
 </div>
 
 
-<!--添加标识对话框-->
-<div id="addTaskModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
+<!--事件展示对话框-->
+<div id="eventModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
     <div class="modal-header">
 
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
 
-        <h3>新建工单</h3>
+        <h3>事件详情</h3>
 
     </div>
 
@@ -150,63 +150,21 @@
             <form action="#" class="form-horizontal">
                 <%--隐藏字段--%>
                 <!--隐藏主键-->
-                <div class="control-group hidden">
-                    <label class="control-label">主键ID</label>
+                <div class="hidden">
                     <div class="controls">
-                        <%--<s:if test="model != null">--%>
-                        <input type="text" name="id" value="" id="taskId"/>
-                        <%--</s:if>--%>
-                        <span class="help-inline"></span>
+                        <input type="text" name="id" value="" id="eventId"/>
                     </div>
                 </div>
-
-
-                <div class="control-group">
-                    <label class="control-label" id="testtext">所属区域<span class="required">*</span></label>
-                    <div class="controls">
-                        <select data-placeholder="区域选择" class="" data-with-diselect="1" id="addSelAra">
-                        </select>
-                    </div>
-                </div>
-
-                    <div class="control-group">
-                        <label class="control-label">所属线路<span class="required">*</span></label>
-                        <div class="controls">
-                            <select data-placeholder="线路选择" class="" data-with-diselect="1" id="addSelLine">
-                            </select>
+                    <div>
+                        <%--<label class="control-label">事件描述</label>--%>
+                        <div>
+                            <div id="eventDescription" align="left"></div>
                         </div>
                     </div>
-
-
-                <div class="control-group">
-
-                    <label class="control-label">巡检人员<span class="required">*</span></label>
-
-                    <div class="controls">
-
-                        <select class="" data-placeholder="选择巡检人员" data-with-diselect="1" tabindex="1"
-                                name="patrolerId" id="selectPatroler">
-
-                            <%--<option value=""></option>--%>
-
-                        </select>
-
+                    <div>
+                      <p id="eventImg" ></p>
+                       <p id="eventPagination" class="pagination"></p>
                     </div>
-
-                </div>
-
-                <div class="control-group">
-
-                    <label class="control-label">工单描述<span class="required">*</span></label>
-
-                    <div class="controls">
-
-                        <textarea class="large m-wrap" rows="5"  name="description" id="description"></textarea>
-
-                    </div>
-
-                </div>
-
             </form>
             <!-- END FORM-->
         </div>
@@ -215,9 +173,9 @@
 
     <div class="modal-footer">
 
-        <button type="button" data-dismiss="modal" class="btn">关闭</button>
+        <%--<button type="button" data-dismiss="modal" class="btn">关闭</button>--%>
 
-        <button type="button" class="btn green" id="saveTask">确定</button>
+        <%--<button type="button" class="btn green" id="saveTask">确定</button>--%>
 
     </div>
 
@@ -294,7 +252,95 @@
 
 </div>
 <!-- END CONTAINER -->
+<div id="addTaskModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
+    <div class="modal-header">
+
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+        <h3>新建工单</h3>
+
+    </div>
+
+    <div class="modal-body">
+
+        <div class="portlet-body form">
+            <!-- BEGIN FORM-->
+            <form action="#" class="form-horizontal">
+                <%--隐藏字段--%>
+                <!--隐藏主键-->
+                <div class="control-group hidden">
+                    <label class="control-label">主键ID</label>
+                    <div class="controls">
+                        <%--<s:if test="model != null">--%>
+                        <input type="text" name="id" value="" id="taskId"/>
+                        <%--</s:if>--%>
+                        <span class="help-inline"></span>
+                    </div>
+                </div>
+
+
+                <div class="control-group">
+                    <label class="control-label" id="testtext">所属区域<span class="required">*</span></label>
+                    <div class="controls">
+                        <select data-placeholder="区域选择" class="" data-with-diselect="1" id="addSelAra">
+                        </select>
+                    </div>
+                </div>
+
+                <div class="control-group">
+                    <label class="control-label">所属线路<span class="required">*</span></label>
+                    <div class="controls">
+                        <select data-placeholder="线路选择" class="" data-with-diselect="1" id="addSelLine">
+                        </select>
+                    </div>
+                </div>
+
+
+                <div class="control-group">
+
+                    <label class="control-label">巡检人员<span class="required">*</span></label>
+
+                    <div class="controls">
+
+                        <select class="" data-placeholder="选择巡检人员" data-with-diselect="1" tabindex="1"
+                                name="patrolerId" id="selectPatroler">
+
+                            <%--<option value=""></option>--%>
+
+                        </select>
+
+                    </div>
+
+                </div>
+
+                <div class="control-group">
+
+                    <label class="control-label">工单描述<span class="required">*</span></label>
+
+                    <div class="controls">
+
+                        <textarea class="large m-wrap" rows="5"  name="description" id="description"></textarea>
+
+                    </div>
+
+                </div>
+
+            </form>
+            <!-- END FORM-->
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+
+        <button type="button" data-dismiss="modal" class="btn">关闭</button>
+
+        <button type="button" class="btn green" id="saveTask">确定</button>
+
+    </div>
+
+</div>
 
 <!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->
 <!-- BEGIN CORE PLUGINS -->
@@ -302,6 +348,7 @@
 <script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>
+
 <!--[if lt IE 9]>
 <![endif]-->
 <!-- END CORE PLUGINS -->
@@ -315,6 +362,9 @@
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
 <script type="text/javascript" src="${ctx}/s/list/list.min.js"></script>
 <script type="text/javascript" src="${ctx}/s/list/list.pagination.min.js"></script>
+<script src="${ctx}/s/media/js/jquery.bootpag.min.js" type="text/javascript"></script>
+<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.gritter.js"></script>--%>
+<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.pulsate.min.js"></script>--%>
 <!-- END PAGE LEVEL SCRIPTS -->
 <script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/json2.js" type="text/javascript"></script>
@@ -336,6 +386,9 @@
         Task.initSelect();
 
     })
+
+    function enlargeImage(){
+    }
 </script>
 
 <!-- END JAVASCRIPTS -->

diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index 6c56a11..2b97fdc 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -5,6 +5,9 @@
 import com.casic.accessControl.event.dto.EventDto;
 import com.casic.accessControl.task.dto.TaskDto;
 import com.casic.accessControl.util.DateUtils;
+import org.apache.xmlbeans.impl.xb.xsdschema.RestrictionDocument;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -30,6 +33,9 @@
      */
     public List<EventDto> getEventsByTaskId(Long taskId) {
        List<Event> events = this.findBy("taskId",taskId);
+//        Criteria criteria = this.createCriteria(Event.class);
+//        criteria.add(Restrictions.eq("taskId",taskId));
+//        List<Event> events = criteria.list();
         List<EventDto> eventDtos = EventDto.convert2EventDtoList(events);
         return eventDtos;
     }
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 765f043..5a50e2a 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -47,7 +47,7 @@
             <props>
                 <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
-                <prop key="hibernate.show_sql">false</prop>
+                <prop key="hibernate.show_sql">true</prop>
                 <prop key="hibernate.format_sql">true</prop>
             </props>
         </property>
@@ -62,6 +62,7 @@
                 <value>com.casic.accessControl.task.domain.Task</value>
                 <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.location.domain.Location</value>-->
 
             </list>
diff --git a/src/main/webapp/content/task/task.jsp b/src/main/webapp/content/task/task.jsp
index 87330c7..629b0f7 100644
--- a/src/main/webapp/content/task/task.jsp
+++ b/src/main/webapp/content/task/task.jsp
@@ -132,14 +132,14 @@
 </div>
 
 
-<!--添加标识对话框-->
-<div id="addTaskModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
+<!--事件展示对话框-->
+<div id="eventModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
     <div class="modal-header">
 
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
 
-        <h3>新建工单</h3>
+        <h3>事件详情</h3>
 
     </div>
 
@@ -150,63 +150,21 @@
             <form action="#" class="form-horizontal">
                 <%--隐藏字段--%>
                 <!--隐藏主键-->
-                <div class="control-group hidden">
-                    <label class="control-label">主键ID</label>
+                <div class="hidden">
                     <div class="controls">
-                        <%--<s:if test="model != null">--%>
-                        <input type="text" name="id" value="" id="taskId"/>
-                        <%--</s:if>--%>
-                        <span class="help-inline"></span>
+                        <input type="text" name="id" value="" id="eventId"/>
                     </div>
                 </div>
-
-
-                <div class="control-group">
-                    <label class="control-label" id="testtext">所属区域<span class="required">*</span></label>
-                    <div class="controls">
-                        <select data-placeholder="区域选择" class="" data-with-diselect="1" id="addSelAra">
-                        </select>
-                    </div>
-                </div>
-
-                    <div class="control-group">
-                        <label class="control-label">所属线路<span class="required">*</span></label>
-                        <div class="controls">
-                            <select data-placeholder="线路选择" class="" data-with-diselect="1" id="addSelLine">
-                            </select>
+                    <div>
+                        <%--<label class="control-label">事件描述</label>--%>
+                        <div>
+                            <div id="eventDescription" align="left"></div>
                         </div>
                     </div>
-
-
-                <div class="control-group">
-
-                    <label class="control-label">巡检人员<span class="required">*</span></label>
-
-                    <div class="controls">
-
-                        <select class="" data-placeholder="选择巡检人员" data-with-diselect="1" tabindex="1"
-                                name="patrolerId" id="selectPatroler">
-
-                            <%--<option value=""></option>--%>
-
-                        </select>
-
+                    <div>
+                      <p id="eventImg" ></p>
+                       <p id="eventPagination" class="pagination"></p>
                     </div>
-
-                </div>
-
-                <div class="control-group">
-
-                    <label class="control-label">工单描述<span class="required">*</span></label>
-
-                    <div class="controls">
-
-                        <textarea class="large m-wrap" rows="5"  name="description" id="description"></textarea>
-
-                    </div>
-
-                </div>
-
             </form>
             <!-- END FORM-->
         </div>
@@ -215,9 +173,9 @@
 
     <div class="modal-footer">
 
-        <button type="button" data-dismiss="modal" class="btn">关闭</button>
+        <%--<button type="button" data-dismiss="modal" class="btn">关闭</button>--%>
 
-        <button type="button" class="btn green" id="saveTask">确定</button>
+        <%--<button type="button" class="btn green" id="saveTask">确定</button>--%>
 
     </div>
 
@@ -294,7 +252,95 @@
 
 </div>
 <!-- END CONTAINER -->
+<div id="addTaskModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
+    <div class="modal-header">
+
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+        <h3>新建工单</h3>
+
+    </div>
+
+    <div class="modal-body">
+
+        <div class="portlet-body form">
+            <!-- BEGIN FORM-->
+            <form action="#" class="form-horizontal">
+                <%--隐藏字段--%>
+                <!--隐藏主键-->
+                <div class="control-group hidden">
+                    <label class="control-label">主键ID</label>
+                    <div class="controls">
+                        <%--<s:if test="model != null">--%>
+                        <input type="text" name="id" value="" id="taskId"/>
+                        <%--</s:if>--%>
+                        <span class="help-inline"></span>
+                    </div>
+                </div>
+
+
+                <div class="control-group">
+                    <label class="control-label" id="testtext">所属区域<span class="required">*</span></label>
+                    <div class="controls">
+                        <select data-placeholder="区域选择" class="" data-with-diselect="1" id="addSelAra">
+                        </select>
+                    </div>
+                </div>
+
+                <div class="control-group">
+                    <label class="control-label">所属线路<span class="required">*</span></label>
+                    <div class="controls">
+                        <select data-placeholder="线路选择" class="" data-with-diselect="1" id="addSelLine">
+                        </select>
+                    </div>
+                </div>
+
+
+                <div class="control-group">
+
+                    <label class="control-label">巡检人员<span class="required">*</span></label>
+
+                    <div class="controls">
+
+                        <select class="" data-placeholder="选择巡检人员" data-with-diselect="1" tabindex="1"
+                                name="patrolerId" id="selectPatroler">
+
+                            <%--<option value=""></option>--%>
+
+                        </select>
+
+                    </div>
+
+                </div>
+
+                <div class="control-group">
+
+                    <label class="control-label">工单描述<span class="required">*</span></label>
+
+                    <div class="controls">
+
+                        <textarea class="large m-wrap" rows="5"  name="description" id="description"></textarea>
+
+                    </div>
+
+                </div>
+
+            </form>
+            <!-- END FORM-->
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+
+        <button type="button" data-dismiss="modal" class="btn">关闭</button>
+
+        <button type="button" class="btn green" id="saveTask">确定</button>
+
+    </div>
+
+</div>
 
 <!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->
 <!-- BEGIN CORE PLUGINS -->
@@ -302,6 +348,7 @@
 <script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>
+
 <!--[if lt IE 9]>
 <![endif]-->
 <!-- END CORE PLUGINS -->
@@ -315,6 +362,9 @@
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
 <script type="text/javascript" src="${ctx}/s/list/list.min.js"></script>
 <script type="text/javascript" src="${ctx}/s/list/list.pagination.min.js"></script>
+<script src="${ctx}/s/media/js/jquery.bootpag.min.js" type="text/javascript"></script>
+<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.gritter.js"></script>--%>
+<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.pulsate.min.js"></script>--%>
 <!-- END PAGE LEVEL SCRIPTS -->
 <script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/json2.js" type="text/javascript"></script>
@@ -336,6 +386,9 @@
         Task.initSelect();
 
     })
+
+    function enlargeImage(){
+    }
 </script>
 
 <!-- END JAVASCRIPTS -->
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 864217b..90d3a9b 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -539,45 +539,45 @@
         },
 
         //获取Feature的列表
-        initAreasArray: function (type, domId) {
-
-            $.ajax({
-                type: "POST",
-                url: $('#context').val() + "/feature/getFeature.do",
-                data: {"type": type},
-                dataType: "json",
-                success: function (r) {
-                    //获取面的列表，将下拉列表初始化
-                    if (r.data) {
-                        for (var area in r.data) {
-//                                alert(r.data[area].id+":"+r.data[area].featureName);
-                            var dataArea = r.data[area];
-                            $("#" + domId).append(" <option value=" + dataArea.id + ">" + dataArea.featureName + "</option>")
-                        }
-                        if (domId != "select_area") {
-                            $("#" + domId).chosen();
-                        }
-
-
-                    }
-                },
-                error: function (request) {
-                    //提示错误信息
-                    alert(r.message);
-                }
-            });
-
-        },
+//        initAreasArray: function (type, domId) {
+//
+//            $.ajax({
+//                type: "POST",
+//                url: $('#context').val() + "/feature/getFeature.do",
+//                data: {"type": type},
+//                dataType: "json",
+//                success: function (r) {
+//                    //获取面的列表，将下拉列表初始化
+//                    if (r.data) {
+//                        for (var area in r.data) {
+////                                alert(r.data[area].id+":"+r.data[area].featureName);
+//                            var dataArea = r.data[area];
+//                            $("#" + domId).append(" <option value=" + dataArea.id + ">" + dataArea.featureName + "</option>")
+//                        }
+//                        if (domId != "select_area") {
+//                            $("#" + domId).chosen();
+//                        }
+//
+//
+//                    }
+//                },
+//                error: function (request) {
+//                    //提示错误信息
+//                    alert(r.message);
+//                }
+//            });
+//
+//        },
 
         initSelect: function () {
             $("#selectObjectType").chosen();
 //            Ems.initAreasArray(1, "select_area");
 //            Ems.initAreasArray(2, "select_line");
         },
-        initAddMarkerSelect: function () {
-//            Ems.initAreasArray(1, "addselAra");
-//            Ems.initAreasArray(2, "addselLine");
-        },
+//        initAddMarkerSelect: function () {
+////            Ems.initAreasArray(1, "addselAra");
+////            Ems.initAreasArray(2, "addselLine");
+//        },
 
         addMarker: function (data) {
             if (document.createElement('canvas').getContext) {  // 判断当前浏览器是否支持绘制海量点
@@ -599,17 +599,6 @@
                 pointCollection.addEventListener('click', function (e) {
                     var emsBean = e.point.Tag;
                     var searchInfoWindow = null;
-//                    var msg = "编&emsp;&emsp;号:" + emsBean.markerId + "<br/>" +
-//                        "所属区域:" + emsBean.featureName + "<br/>" +
-//                        "所属线路:" + emsBean.lineName + "<br/>" +
-//                        "对象类型:" + emsBean.markerObjectType + "<br/>" +
-//                        "管线埋深:" + emsBean.depth + "<br/>" +
-//                        "标识器埋深:" + emsBean.markerDepth + "<br/>" +
-//                        "权属单位:" + emsBean.ownerComp + "<br/>" +
-//                        "安装时间:" + emsBean.createTime + "<br/>" +
-//                        "里程1:" + emsBean.mileage + "<br/>" +
-//                        "里程2:" + emsBean.mileage2 + "<br/>" +
-//                        "备注:" + emsBean.memo + "<br/>";
                     var msg = "";
                     var height = 0;
                     if (emsBean.recordType == 1) {

diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index 6c56a11..2b97fdc 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -5,6 +5,9 @@
 import com.casic.accessControl.event.dto.EventDto;
 import com.casic.accessControl.task.dto.TaskDto;
 import com.casic.accessControl.util.DateUtils;
+import org.apache.xmlbeans.impl.xb.xsdschema.RestrictionDocument;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -30,6 +33,9 @@
      */
     public List<EventDto> getEventsByTaskId(Long taskId) {
        List<Event> events = this.findBy("taskId",taskId);
+//        Criteria criteria = this.createCriteria(Event.class);
+//        criteria.add(Restrictions.eq("taskId",taskId));
+//        List<Event> events = criteria.list();
         List<EventDto> eventDtos = EventDto.convert2EventDtoList(events);
         return eventDtos;
     }
diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml
index 765f043..5a50e2a 100644
--- a/src/main/resources/spring/applicationContext-hibernate.xml
+++ b/src/main/resources/spring/applicationContext-hibernate.xml
@@ -47,7 +47,7 @@
             <props>
                 <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
-                <prop key="hibernate.show_sql">false</prop>
+                <prop key="hibernate.show_sql">true</prop>
                 <prop key="hibernate.format_sql">true</prop>
             </props>
         </property>
@@ -62,6 +62,7 @@
                 <value>com.casic.accessControl.task.domain.Task</value>
                 <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.location.domain.Location</value>-->
 
             </list>
diff --git a/src/main/webapp/content/task/task.jsp b/src/main/webapp/content/task/task.jsp
index 87330c7..629b0f7 100644
--- a/src/main/webapp/content/task/task.jsp
+++ b/src/main/webapp/content/task/task.jsp
@@ -132,14 +132,14 @@
 </div>
 
 
-<!--添加标识对话框-->
-<div id="addTaskModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
+<!--事件展示对话框-->
+<div id="eventModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
     <div class="modal-header">
 
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
 
-        <h3>新建工单</h3>
+        <h3>事件详情</h3>
 
     </div>
 
@@ -150,63 +150,21 @@
             <form action="#" class="form-horizontal">
                 <%--隐藏字段--%>
                 <!--隐藏主键-->
-                <div class="control-group hidden">
-                    <label class="control-label">主键ID</label>
+                <div class="hidden">
                     <div class="controls">
-                        <%--<s:if test="model != null">--%>
-                        <input type="text" name="id" value="" id="taskId"/>
-                        <%--</s:if>--%>
-                        <span class="help-inline"></span>
+                        <input type="text" name="id" value="" id="eventId"/>
                     </div>
                 </div>
-
-
-                <div class="control-group">
-                    <label class="control-label" id="testtext">所属区域<span class="required">*</span></label>
-                    <div class="controls">
-                        <select data-placeholder="区域选择" class="" data-with-diselect="1" id="addSelAra">
-                        </select>
-                    </div>
-                </div>
-
-                    <div class="control-group">
-                        <label class="control-label">所属线路<span class="required">*</span></label>
-                        <div class="controls">
-                            <select data-placeholder="线路选择" class="" data-with-diselect="1" id="addSelLine">
-                            </select>
+                    <div>
+                        <%--<label class="control-label">事件描述</label>--%>
+                        <div>
+                            <div id="eventDescription" align="left"></div>
                         </div>
                     </div>
-
-
-                <div class="control-group">
-
-                    <label class="control-label">巡检人员<span class="required">*</span></label>
-
-                    <div class="controls">
-
-                        <select class="" data-placeholder="选择巡检人员" data-with-diselect="1" tabindex="1"
-                                name="patrolerId" id="selectPatroler">
-
-                            <%--<option value=""></option>--%>
-
-                        </select>
-
+                    <div>
+                      <p id="eventImg" ></p>
+                       <p id="eventPagination" class="pagination"></p>
                     </div>
-
-                </div>
-
-                <div class="control-group">
-
-                    <label class="control-label">工单描述<span class="required">*</span></label>
-
-                    <div class="controls">
-
-                        <textarea class="large m-wrap" rows="5"  name="description" id="description"></textarea>
-
-                    </div>
-
-                </div>
-
             </form>
             <!-- END FORM-->
         </div>
@@ -215,9 +173,9 @@
 
     <div class="modal-footer">
 
-        <button type="button" data-dismiss="modal" class="btn">关闭</button>
+        <%--<button type="button" data-dismiss="modal" class="btn">关闭</button>--%>
 
-        <button type="button" class="btn green" id="saveTask">确定</button>
+        <%--<button type="button" class="btn green" id="saveTask">确定</button>--%>
 
     </div>
 
@@ -294,7 +252,95 @@
 
 </div>
 <!-- END CONTAINER -->
+<div id="addTaskModal" class="modal hide fade" tabindex="-1" data-focus-on="input:first">
 
+    <div class="modal-header">
+
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+
+        <h3>新建工单</h3>
+
+    </div>
+
+    <div class="modal-body">
+
+        <div class="portlet-body form">
+            <!-- BEGIN FORM-->
+            <form action="#" class="form-horizontal">
+                <%--隐藏字段--%>
+                <!--隐藏主键-->
+                <div class="control-group hidden">
+                    <label class="control-label">主键ID</label>
+                    <div class="controls">
+                        <%--<s:if test="model != null">--%>
+                        <input type="text" name="id" value="" id="taskId"/>
+                        <%--</s:if>--%>
+                        <span class="help-inline"></span>
+                    </div>
+                </div>
+
+
+                <div class="control-group">
+                    <label class="control-label" id="testtext">所属区域<span class="required">*</span></label>
+                    <div class="controls">
+                        <select data-placeholder="区域选择" class="" data-with-diselect="1" id="addSelAra">
+                        </select>
+                    </div>
+                </div>
+
+                <div class="control-group">
+                    <label class="control-label">所属线路<span class="required">*</span></label>
+                    <div class="controls">
+                        <select data-placeholder="线路选择" class="" data-with-diselect="1" id="addSelLine">
+                        </select>
+                    </div>
+                </div>
+
+
+                <div class="control-group">
+
+                    <label class="control-label">巡检人员<span class="required">*</span></label>
+
+                    <div class="controls">
+
+                        <select class="" data-placeholder="选择巡检人员" data-with-diselect="1" tabindex="1"
+                                name="patrolerId" id="selectPatroler">
+
+                            <%--<option value=""></option>--%>
+
+                        </select>
+
+                    </div>
+
+                </div>
+
+                <div class="control-group">
+
+                    <label class="control-label">工单描述<span class="required">*</span></label>
+
+                    <div class="controls">
+
+                        <textarea class="large m-wrap" rows="5"  name="description" id="description"></textarea>
+
+                    </div>
+
+                </div>
+
+            </form>
+            <!-- END FORM-->
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+
+        <button type="button" data-dismiss="modal" class="btn">关闭</button>
+
+        <button type="button" class="btn green" id="saveTask">确定</button>
+
+    </div>
+
+</div>
 
 <!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->
 <!-- BEGIN CORE PLUGINS -->
@@ -302,6 +348,7 @@
 <script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>
+
 <!--[if lt IE 9]>
 <![endif]-->
 <!-- END CORE PLUGINS -->
@@ -315,6 +362,9 @@
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
 <script type="text/javascript" src="${ctx}/s/list/list.min.js"></script>
 <script type="text/javascript" src="${ctx}/s/list/list.pagination.min.js"></script>
+<script src="${ctx}/s/media/js/jquery.bootpag.min.js" type="text/javascript"></script>
+<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.gritter.js"></script>--%>
+<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.pulsate.min.js"></script>--%>
 <!-- END PAGE LEVEL SCRIPTS -->
 <script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/json2.js" type="text/javascript"></script>
@@ -336,6 +386,9 @@
         Task.initSelect();
 
     })
+
+    function enlargeImage(){
+    }
 </script>
 
 <!-- END JAVASCRIPTS -->
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 864217b..90d3a9b 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -539,45 +539,45 @@
         },
 
         //获取Feature的列表
-        initAreasArray: function (type, domId) {
-
-            $.ajax({
-                type: "POST",
-                url: $('#context').val() + "/feature/getFeature.do",
-                data: {"type": type},
-                dataType: "json",
-                success: function (r) {
-                    //获取面的列表，将下拉列表初始化
-                    if (r.data) {
-                        for (var area in r.data) {
-//                                alert(r.data[area].id+":"+r.data[area].featureName);
-                            var dataArea = r.data[area];
-                            $("#" + domId).append(" <option value=" + dataArea.id + ">" + dataArea.featureName + "</option>")
-                        }
-                        if (domId != "select_area") {
-                            $("#" + domId).chosen();
-                        }
-
-
-                    }
-                },
-                error: function (request) {
-                    //提示错误信息
-                    alert(r.message);
-                }
-            });
-
-        },
+//        initAreasArray: function (type, domId) {
+//
+//            $.ajax({
+//                type: "POST",
+//                url: $('#context').val() + "/feature/getFeature.do",
+//                data: {"type": type},
+//                dataType: "json",
+//                success: function (r) {
+//                    //获取面的列表，将下拉列表初始化
+//                    if (r.data) {
+//                        for (var area in r.data) {
+////                                alert(r.data[area].id+":"+r.data[area].featureName);
+//                            var dataArea = r.data[area];
+//                            $("#" + domId).append(" <option value=" + dataArea.id + ">" + dataArea.featureName + "</option>")
+//                        }
+//                        if (domId != "select_area") {
+//                            $("#" + domId).chosen();
+//                        }
+//
+//
+//                    }
+//                },
+//                error: function (request) {
+//                    //提示错误信息
+//                    alert(r.message);
+//                }
+//            });
+//
+//        },
 
         initSelect: function () {
             $("#selectObjectType").chosen();
 //            Ems.initAreasArray(1, "select_area");
 //            Ems.initAreasArray(2, "select_line");
         },
-        initAddMarkerSelect: function () {
-//            Ems.initAreasArray(1, "addselAra");
-//            Ems.initAreasArray(2, "addselLine");
-        },
+//        initAddMarkerSelect: function () {
+////            Ems.initAreasArray(1, "addselAra");
+////            Ems.initAreasArray(2, "addselLine");
+//        },
 
         addMarker: function (data) {
             if (document.createElement('canvas').getContext) {  // 判断当前浏览器是否支持绘制海量点
@@ -599,17 +599,6 @@
                 pointCollection.addEventListener('click', function (e) {
                     var emsBean = e.point.Tag;
                     var searchInfoWindow = null;
-//                    var msg = "编&emsp;&emsp;号:" + emsBean.markerId + "<br/>" +
-//                        "所属区域:" + emsBean.featureName + "<br/>" +
-//                        "所属线路:" + emsBean.lineName + "<br/>" +
-//                        "对象类型:" + emsBean.markerObjectType + "<br/>" +
-//                        "管线埋深:" + emsBean.depth + "<br/>" +
-//                        "标识器埋深:" + emsBean.markerDepth + "<br/>" +
-//                        "权属单位:" + emsBean.ownerComp + "<br/>" +
-//                        "安装时间:" + emsBean.createTime + "<br/>" +
-//                        "里程1:" + emsBean.mileage + "<br/>" +
-//                        "里程2:" + emsBean.mileage2 + "<br/>" +
-//                        "备注:" + emsBean.memo + "<br/>";
                     var msg = "";
                     var height = 0;
                     if (emsBean.recordType == 1) {
diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js
index 9970ef0..936c84a 100644
--- a/src/main/webapp/s/app/task/task.js
+++ b/src/main/webapp/s/app/task/task.js
@@ -9,8 +9,10 @@
     var taskMarkers = "";
     var drawOverlays = new Array();
     var drawTaskOverlays = new Array();
+    var drawEventOverlays = [];
     var taskLists;
     var taskDetailLists = new Array();
+    var eventBeanList = [];
     var options = {
         valueNames: [ 'id', 'patrolerName', 'status', 'deployDate', 'beginDate', 'endDate', 'description', {attr: 'src', name: 'image'} ],
         item: '<li onclick=""><img class="image" src="" style="float: left;width:20px;height:20px">' +
@@ -61,8 +63,8 @@
                         var icon = $('#context').val() + "/images/accidents/worker.png";
                         var id = r.data[data].id;
                         var patrolerName = r.data[data].patrolerName;
-                        if(patroler&&patrolerName!=patroler){
-                                continue;
+                        if (patroler && patrolerName != patroler) {
+                            continue;
                         }
                         var description = r.data[data].description;
                         var deployDate = r.data[data].deployDate;
@@ -91,6 +93,41 @@
         });
     }
 
+//    function eventImgPage(total, page, imgSrc) {
+//        alert("eventImgPage："+imgSrc);
+//        $('#eventPagination').bootpag({
+//            total: total,
+//            page: page
+//        }).die().live("page", function (event, num) {
+//            alert("live："+imgSrc);
+////            $("#eventImg").children().remove();//avatar1.jpg
+//            $("#eventImg").append("<img src=" + $('#context').val() + "/images/events/" + imgSrc[num - 1] + "?time="+new Date().getTime()+">")
+//        });
+//    }
+
+    function showEventInfo(e) {
+        var p = e.target;
+        var imgName = p.Tag.imageName;
+        var images = imgName.split(",");//图片路径数组
+//        alert(images[0]);
+        var msg2 = "<strong>事件描述:</strong>" + p.Tag.description + "</br>" +
+            "<strong>上传时间:</strong>" + p.Tag.createTime + "</br>";
+        $("#eventImg").children().remove();//avatar1.jpg
+        var imageDivs="";
+        var width = 100/images.length;//动态展示
+        for(var i =0;i<images.length;i++){
+            imageDivs +="<img height='70%' width='"+width+"%' onclick='enlargeImage()' src=" + $('#context').val() + "/images/events/" + images[i] + ">"
+        }
+        $("#eventImg").append(imageDivs)
+        $("#eventDescription").html(msg2);
+//        $('#eventPagination').remove
+//        $('#eventPagination').children().remove();
+        $('#eventModal').modal('show').css({width: "300px"});
+//        alert("showEventInfo："+images);
+//        eventImgPage(images.length, 1, images);
+
+    }
+
     return {
 
         //添加工单
@@ -155,7 +192,7 @@
                 cache: false,
                 data: {
                     areaId: areaId,
-                    lineId:lineId,
+                    lineId: lineId,
                     markers: taskMarkers,
                     patrolerId: patrolerId,
                     description: description
@@ -207,12 +244,12 @@
             }
             map.addContextMenu(menu);
 
-            var myFun = function(result){//根据城市名进行定位
+            var myFun = function (result) {//根据城市名进行定位
                 var cityName = result.name;
                 map.setCenter(cityName);
             }
 
-//声明全局变量
+            //声明全局变量
             if (!window.markerData || window.markerData.length == 0) {
                 window.markerData = new Array();
             }
@@ -256,14 +293,6 @@
                 e.overlay.enableEditing();
                 drawOverlays.push(e.overlay);
             };
-//            var styleOptions = {
-//                strokeColor: "red",    //边线颜色。
-//                fillColor: "blue",      //填充颜色。当参数为空时，圆形将没有填充效果。
-//                strokeWeight: 3,       //边线的宽度，以像素为单位。
-//                strokeOpacity: 0.2,	   //边线透明度，取值范围0 - 1。
-//                fillOpacity: 0.1,      //填充的透明度，取值范围0 - 1。
-//                strokeStyle: 'solid' //边线的样式，solid或dashed。
-//            }
             //实例化鼠标绘制工具
             var drawingManager = new BMapLib.DrawingManager(map, {
                 isOpen: false, //是否开启绘制模式
@@ -296,9 +325,10 @@
                                 window.markerData = [];//清空原来的数据
                                 for (var t = 0; t < r.data.length; t++) {
                                     var markerDto = r.data[t];
-                                    var emsBean = new EMSBean(markerDto.markerId, markerDto.markerName, markerDto.latitude, markerDto.longitude,
-                                        markerDto.depth, markerDto.ownerComp, markerDto.createTime, markerDto.markerObjectType,
-                                        markerDto.markerObjectName, markerDto.featureId, markerDto.lineId, markerDto.creator, markerDto.mileage, markerDto.mileage2, markerDto.memo, markerDto.id,markerDto.featureName,markerDto.lineName);
+                                    var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle,
+                                        markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter,
+                                        markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType,
+                                        markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id);
                                     window.markerData[t] = emsBean;
 
                                 }
@@ -330,7 +360,7 @@
             $('#btnSort').css("padding-right", 15);
             $('#btnSort').css("margin-bottom", 10);
             Task.bindClickEvent();
-            $('#selectPatroler3').live('change',function(e){//下拉列表更改的时候查询数据，更新列表，待优化为查询条件在后台利用
+            $('#selectPatroler3').live('change', function (e) {//下拉列表更改的时候查询数据，更新列表，待优化为查询条件在后台利用
                 Task.updateList($("#selectPatroler3").val());
             });
         },
@@ -343,6 +373,7 @@
                 clearAllTaskPoint();
                 var taskId = this.getElementsByClassName("id")[0].innerHTML;
                 var i = 0;
+                //请求任务
                 $.ajax({
                     type: "get",
                     url: $('#context').val() + "/task/get-task-markers.do",
@@ -387,6 +418,42 @@
                         alert(d.message);
                     }
                 });
+
+                //请求该任务上报的事件
+                $.ajax({
+                    type: "get",
+                    url: $('#context').val() + "/event/get-event-list.do",
+                    dataType: "json",
+                    cache: false,
+                    data: {
+                        taskId: taskId
+                    },
+                    success: function (r) {
+                        if (r.success) {//请求成功
+                            for (var data in r.data) {
+                                var id = r.data[data].id;
+                                var imageName = r.data[data].imageName;
+                                var latitude = r.data[data].latitude;
+                                var longitude = r.data[data].longitude;
+                                var createTime = r.data[data].createTime == null ? "" : r.data[data].createTime;
+                                var description = r.data[data].description == null ? "" : r.data[data].description;
+                                var status = r.data[data].status;
+                                var eventBean = new EventBean(id, imageName, latitude, longitude, description, status, createTime);
+
+                                eventBeanList.push(eventBean);
+
+                            }
+                            Task.addEventMarker(eventBeanList);
+                        }
+                        else {
+                            alert(r.message);
+                        }
+                    },
+                    error: function (d) {//请求出错
+                        alert(d.message);
+                    }
+                });
+
             });
 
         },
@@ -399,15 +466,6 @@
         },
 
         initForm: function () {
-            $("#saveTask").click(function (e) {
-                var areaId = $("#addSelAra").val();
-                var lineId = $("#addSelLine").val();
-                var patrolerId = $("#selectPatroler").val();
-                var description = $("#description").val();
-                Task.uploadTaskCallBack(areaId, lineId, patrolerId, description);
-                $('#addTaskModal').modal('hide');
-                $("#description").val("");
-            });
             $("#saveTask2").click(function (e) {
                 //alert(taskMarkers);
                 var patrolerId = $("#selectPatroler2").val();
@@ -418,34 +476,6 @@
             });
         },
 
-        //获取面的列表
-        initAreasArray: function (type, domId) {
-
-            $.ajax({
-                type: "POST",
-                url: $('#context').val() + "/feature/getFeature.do",
-                data: {
-                    "type": type
-                },
-                dataType: "json",
-                success: function (r) {
-                    //获取面的列表，将下拉列表初始化
-                    if (r.data) {
-                        for (var area in r.data) {
-                            //alert(r.data[area].id+":"+r.data[area].featureName);
-                            $("#" + domId).append(" <option value=" + r.data[area].id + ">" + r.data[area].featureName + "</option>");
-                        }
-                        $("#" + domId).chosen();
-                    }
-                },
-                error: function (request) {
-                    //提示错误信息
-                    alert(r.message);
-                }
-            });
-
-        },
-
         //获取巡检员列表
         initPatrolerArray: function () {
 
@@ -478,10 +508,6 @@
 
 
         initSelect: function () {
-            Task.initAreasArray(1, "addSelAra");
-            Task.initAreasArray(2, "addSelLine");
-//            Ems.initAreasArray(1, "addSelAra");
-//            Ems.initAreasArray(2, "addSelLine");
             Task.initPatrolerArray();
         },
 
@@ -504,15 +530,45 @@
                 pointCollection.addEventListener('click', function (e) {
                     var emsBean = e.point.Tag;
                     var searchInfoWindow = null;
-                    var msg = "编&emsp;&emsp;号:" + emsBean.markerId + "<br/>" +
-                        "所属区域:" + emsBean.featureName + "<br/>" +
-                        "所属线路:" + emsBean.lineName + "<br/>" +
-                        "对象类型:" + emsBean.markerObjectType + "<br/>" +
+                    var msg = "";
+                    var height = 0;
+//                    alert(emsBean.recordType);
+                    if (emsBean.recordType == 1) {
+                        msg = msg + "管线种类:" + emsBean.markerObjectType + "<br/>" +
+                            "管线直径:" + emsBean.pipeDiameter + "<br/>" +
+                            "管线材质:" + emsBean.pipeMaterial + "<br/>" +
+                            "埋设方式:" + emsBean.layStyle + "<br/>" +
+                            "管线埋深:" + emsBean.depth + "<br/>";
+                        height = 100;
+                    } else if (emsBean.recordType == 2) {
+                        msg = msg + "附属物名称:" + emsBean.markerObjectType + "<br/>" +
+                            "井深:" + emsBean.depth + "<br/>";
+                        height = 40;
+                    } else if (emsBean.recordType == 3) {
+                        msg = msg + "管点特征:" + emsBean.markerObjectType + "<br/>" +
+                            "特征点埋深:" + emsBean.depth + "<br/>";
+                        height = 40;
+                    } else {
+                        msg = msg + "上层管种类:" + emsBean.markerObjectType + "<br/>" +
+                            "上层管直径:" + emsBean.pipeDiameter + "<br/>" +
+                            "上层管材料:" + emsBean.pipeMaterial + "<br/>" +
+                            "上层管埋深:" + emsBean.depth + "<br/>" +
+                            "下层管种类:" + emsBean.belowType + "<br/>" +
+                            "下层管直径:" + emsBean.belowDiameter + "<br/>" +
+                            "下层管材料:" + emsBean.belowMaterial + "<br/>" +
+                            "下层管埋深:" + emsBean.belowDepth + "<br/>";
+                        height = 160;
+                    }
+                    height = height + 145;
+
+                    var msg = msg + "所属道路:" + emsBean.road + "<br/>" +
+                        "建设年代:" + emsBean.constructTime + "<br/>" +
                         "权属单位:" + emsBean.ownerComp + "<br/>" +
-                        "安装时间:" + emsBean.createTime + "<br/>" +
-                        "里程1:" + emsBean.mileage + "<br/>" +
-                        "里程2:" + emsBean.mileage2 + "<br/>" +
+                        "标识器ID:" + emsBean.markerId + "<br/>" +
+                        "标识器类型:" + emsBean.markerType + "<br/>" +
+                        "标识器埋深:" + emsBean.markerDepth + "<br/>" +
                         "备注:" + emsBean.memo + "<br/>";
+
                     var imgUrl = $('#context').val() + "/images/ems.jpg";
                     var content = '<div style="margin:0;line-height:20px;padding:2px;">' +
                         '<img src=' + '"' + imgUrl + '"' + ' alt="" style="float:right;zoom:1;overflow:hidden;width:100px;height:100px;margin-left:3px;"/>' +
@@ -521,7 +577,7 @@
                     searchInfoWindow = new BMapLib.SearchInfoWindow(map, content, {
                         title: emsBean.markerName,      //标题
                         width: 290,             //宽度
-                        height: 185,              //高度
+                        height: height,            //高度
                         panel: "panel",         //检索结果面板
                         enableAutoPan: true    //自动平移
                     });
@@ -538,12 +594,26 @@
                 alert('请在chrome、safari、IE8+以上浏览器查看本示例');
             }
         },
+        //增加事件图片的marker
+        addEventMarker: function () {
+            for (var i = 0; i < eventBeanList.length; i++) {
+                var bdPoint = gpsBdUtils.gcj2bd(eventBeanList[i].latitude, eventBeanList[i].longitude);
+                var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude);
+                var iconImage = $('#context').val() + "/images/tasks/multi-tasks.png";
+                var myIcon = new BMap.Icon(iconImage, new BMap.Size(20, 50));//图片marker的ICON
+                var msg = "事件描述:" + eventBeanList[i].description + "\r\n" +
+                    "上传时间:" + eventBeanList[i].createTime + "\r\n";
+                var marker = new BMap.Marker(point, {icon: myIcon, title: msg});  // 创建标注
+                marker.Tag = eventBeanList[i];
+                marker.addEventListener("click", showEventInfo);
+                map.addOverlay(marker);              // 将标注添加到地图中
 
+            }
+        },
         addTaskDetailMarker: function (data) {
             for (var i = 0; i < data.length; i++) {
                 var bdPoint = gpsBdUtils.gcj2bd(data[i].latitude, data[i].longitude);
                 var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude);
-//                var point = new BMap.Point(data[i].longitude, data[i].latitude);
                 var myIcon = new BMap.Icon(data[i].icon, new BMap.Size(20, 50));
                 var msg = "标识器名称:" + data[i].markerName + "\r\n" +
                     "巡检状态:" + data[i].isChecked + "\r\n" +
@@ -557,12 +627,11 @@
                     map.centerAndZoom(point, 17);
                 }
             }
-            var options = {
-                size: BMAP_POINT_SIZE_BIG,
-                shape: BMAP_POINT_SHAPE_STAR,
-                color: '#d340c3'
-            };
-            //var pointCollection = new BMap.PointCollection(drawTaskOverlays, options);  // 初始化PointCollection
+//            var options = {
+//                size: BMAP_POINT_SIZE_BIG,
+//                shape: BMAP_POINT_SHAPE_STAR,
+//                color: '#d340c3'
+//            };
 
         }
 
@@ -591,4 +660,15 @@
     this.isChecked = isChecked;
     this.finishTime = finishTime;
     this.description = description;
-};
\ No newline at end of file
+};
+
+EventBean = function (id, imageName, latitude, longitude, description, status, createTime) {
+    this.id = id;
+    this.imageName = imageName;
+    this.latitude = latitude;
+    this.longitude = longitude;
+    this.description = description;
+    this.status = status;
+    this.createTime = createTime;
+
+}
\ No newline at end of file