Merge branch 'master' of gitlab.maxrocky.com:hanjixin/MeteorologicalBureau

map/js/Map3D.js

@@ -126,16 +126,16 @@ class Map3D {
         console.log(item);
         var html = `
         <div id=box>
-          <div id=title>${item.clientaddress || item.name}</div>
+          <div id=title>${item.name}</div>
           <div id=contant>
             <div class=li>
-              <div>阿斯顿</div>1
+              <div>地址</div>${item.address}
             </div>
             <div class=li>
-              <div>阿斯顿</div>2
+              <div>电话</div>${item.telephone}
             </div>
             <div class=li>
-              <div>阿顿</div>啊实打实的
+              <div>职位</div>${item.role}
             </div>
           </div>
           <div id=close  onclick="popclose()"></div>
@@ -168,7 +168,7 @@ class Map3D {
         marker._data = item
         marker.on('click', (params) => {
             console.log(item, params);
-            // infoWindow.open(this.map, marker.getPosition());
+            infoWindow.open(this.map, marker.getPosition());
         })
 
 
@@ -185,13 +185,13 @@ class Map3D {
           <div id=title>${item.USERNAME}</div>
           <div id=contant>
             <div class=li>
-              <div>阿斯顿</div>1
+              <div>区域</div>${item.CITY}${item.COUNTY}
             </div>
             <div class=li>
-              <div>阿斯顿</div>2
+              <div>电话</div>${item.MOBILE}
             </div>
             <div class=li>
-              <div>阿顿</div>啊实打实的
+              <div>职级</div>${item.DUTY}
             </div>
           </div>
           <div id=close  onclick="popclose()"></div>
@@ -224,7 +224,7 @@ class Map3D {
         marker._data = item
         marker.on('click', (params) => {
             console.log(item, params);
-            // infoWindow.open(this.map, marker.getPosition());
+            infoWindow.open(this.map, marker.getPosition());
         })
 
 
@@ -246,7 +246,7 @@ class Map3D {
               <div>阿斯顿</div>2
             </div>
             <div class=li>
-              <div>阿顿</div>啊实打实的
+              <div>阿顿</div>啊实打实的2
             </div>
           </div>
           <div id=close  onclick="popclose()"></div>
@@ -279,7 +279,7 @@ class Map3D {
         marker._data = item
         marker.on('click', (params) => {
             console.log(item, params);
-            // infoWindow.open(this.map, marker.getPosition());
+            infoWindow.open(this.map, marker.getPosition());
         })
 
 
@@ -295,10 +295,7 @@ class Map3D {
           <div id=title>${name}</div>
           <div id=contant>
             <div class=li>
-              <div>阿斯顿</div>1
-            </div>
-            <div class=li>
-              <div>阿斯顿</div>2
+            <div>状态</div>${item.clientStatus }
             </div>
             <div class=li>
               <div>地址</div>${item.clientAddress }
@@ -334,7 +331,7 @@ class Map3D {
         marker._data = item
         marker.on('click', (params) => {
             console.log(item, params);
-            // infoWindow.open(this.map, marker.getPosition());
+            infoWindow.open(this.map, marker.getPosition());
         })