diff --git a/src/main/webapp/content/ems/ems-gd.jsp b/src/main/webapp/content/ems/ems-gd.jsp
index 5137b49..5ce63aa 100644
--- a/src/main/webapp/content/ems/ems-gd.jsp
+++ b/src/main/webapp/content/ems/ems-gd.jsp
@@ -69,6 +69,10 @@
             height: 50px;
         }
 
+        .info-img {
+            height: 70px;
+        }
+
         .map-control {
             position: absolute;
             z-index: 20;

diff --git a/src/main/webapp/content/ems/ems-gd.jsp b/src/main/webapp/content/ems/ems-gd.jsp
index 5137b49..5ce63aa 100644
--- a/src/main/webapp/content/ems/ems-gd.jsp
+++ b/src/main/webapp/content/ems/ems-gd.jsp
@@ -69,6 +69,10 @@
             height: 50px;
         }
 
+        .info-img {
+            height: 70px;
+        }
+
         .map-control {
             position: absolute;
             z-index: 20;
diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js
index 09592ee..e9c9aec 100644
--- a/src/main/webapp/s/app/ems/ems-gd.js
+++ b/src/main/webapp/s/app/ems/ems-gd.js
@@ -73,7 +73,7 @@
                                 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,markerDto.line,markerDto.area,markerDto.colorType);
+                                markerDto.recordType, markerDto.id,markerDto.line,markerDto.area,markerDto.colorType, markerDto.photos);
                             markerData[t] = emsBean;
                         }
                         //2.增加marker
@@ -81,6 +81,7 @@
                     }
                     hadRequest = false;
                     map.off("complete", requestMarkers());
+                    console.log(markerData)
                 },
                 error: function (d) {//请求出错
                     hadRequest = false;
@@ -95,6 +96,7 @@
 
     // 处理鼠标单击事件
     function processClickInfo(emsBean){
+        console.log("processClickInfo")
         var msg = "";
         if (emsBean.recordType == 1) {
             msg = msg + "管线种类：" + emsBean.markerObjectType + "<br/>" +
@@ -129,7 +131,16 @@
             "安装部门：" + emsBean.creator + "<br/>" +
             "最后修改时间："+emsBean.createTime + "<br/>" +
             "备注：" + emsBean.memo + "<br/>";
-
+        if(emsBean.photos){
+            msg = msg + '<div class="info-img">'
+            var imgs = emsBean.photos.split(",");
+            for (var i = 0;i<imgs.length; i++){
+                var path = "http://"+window.location.host+ $('#context').val()+ imgs[i];
+                msg = msg + '<img style="float:left;width: auto;height: 100%;" src="' + path +'"/>'
+            }
+            msg = msg + '</div>'
+        }
+        console.log(msg);
         return msg;
     }
 
@@ -603,9 +614,10 @@
             map.setFitView(viewMarkers);
 
             mass.on("click", function(e) {
+                console.log("mass.onmass.on")
                 var index = parseInt(e.data.id);
                 var emsBean = viewMarkers[index].Tag;
-
+                console.log(emsBean)
                 var msg = processClickInfo(emsBean);
                 var titleName ="";
                 var height = 0;
@@ -627,7 +639,7 @@
                 var content = titleName + '<div class="info-content">' +
                     '<img src=' + '"' + imgUrl + '"' + ' />' + msg +
                     '</div>';
-
+                console.log(content)
                 var infowindow = new AMap.AdvancedInfoWindow({
                     content: content,
                     width: 290,             //宽度