From e2ce9886ff1456cd48e72f73c9efba70ad9320f5 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 14 十二月 2018 17:06:31 +0800
Subject: [PATCH] 添加机房信息切换

---
 gx_tieta/WebRoot/mobil/map.html                  |   33 ++
 gx_tieta/WebRoot/mobil/app/css/map.css           |   17 +
 gx_tieta/WebRoot/mobil/app/js/common.js          |   24 ++
 gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html  |  526 +++++++++++++++++++++++++++++++++++++++++++++++
 gx_tieta/WebRoot/mobil/app/image/table_th_bg.gif |    0 
 gx_tieta/WebRoot/mobil/app/css/common.css        |    5 
 6 files changed, 599 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/app/css/common.css b/gx_tieta/WebRoot/mobil/app/css/common.css
index 4a4021b..efa2efb 100644
--- a/gx_tieta/WebRoot/mobil/app/css/common.css
+++ b/gx_tieta/WebRoot/mobil/app/css/common.css
@@ -8,7 +8,7 @@
     overflow: hidden;
 }
 .overflowY {
-    overflow-y: auto;
+    overflow-y: auto !important;
 }
 .overflowX {
     overflow-x: auto;
@@ -34,6 +34,9 @@
 .abs.abs-top40 {
     top: 40px;
 }
+.abs.abs-top41 {
+	top: 41px;
+}
 .abs.abs-top80 {
     top: 80px;
 }
diff --git a/gx_tieta/WebRoot/mobil/app/css/map.css b/gx_tieta/WebRoot/mobil/app/css/map.css
index 3c86c8e..5c71360 100644
--- a/gx_tieta/WebRoot/mobil/app/css/map.css
+++ b/gx_tieta/WebRoot/mobil/app/css/map.css
@@ -96,4 +96,21 @@
 }
 .home-list .home-item .home-item-txt {
     margin-left: 8px;
+}
+
+/* hdw-tbl-style */
+.hdw-tbl {
+	width: 100%;
+	border-collapse: collapse;
+}
+.hdw-tbl th, .hdw-tbl td {
+	border: 1px solid #cccccc;
+}
+.hdw-tbl th {
+	font-size: 14px;
+	padding: 4px 10px;
+	background: url('../image/table_th_bg.gif') repeat-x; 
+}
+.hdw-tbl td {
+	padding: 4px 0 4px 8px;
 }
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/app/image/table_th_bg.gif b/gx_tieta/WebRoot/mobil/app/image/table_th_bg.gif
new file mode 100644
index 0000000..b454b49
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/app/image/table_th_bg.gif
Binary files differ
diff --git a/gx_tieta/WebRoot/mobil/app/js/common.js b/gx_tieta/WebRoot/mobil/app/js/common.js
index 4398eff..ffcafaf 100644
--- a/gx_tieta/WebRoot/mobil/app/js/common.js
+++ b/gx_tieta/WebRoot/mobil/app/js/common.js
@@ -81,4 +81,26 @@
     	var str = reg.replace(ptn, '\\'+'$&');
     	return str;
     }
-}
\ No newline at end of file
+};
+
+//鏍煎紡鍖栨椂闂�
+Date.prototype.format =function(format)
+{
+    var o = {
+    "M+" : this.getMonth()+1, //month
+	"d+" : this.getDate(),    //day
+	"h+" : this.getHours(),   //hour
+	"m+" : this.getMinutes(), //minute
+	"s+" : this.getSeconds(), //second
+	"q+" : Math.floor((this.getMonth()+3)/3),  //quarter
+	"S" : this.getMilliseconds() //millisecond
+    };
+    if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
+    (this.getFullYear()+"").substr(4- RegExp.$1.length));
+    for(var k in o)if(new RegExp("("+ k +")").test(format))
+    format = format.replace(RegExp.$1,
+    RegExp.$1.length==1? o[k] :
+    ("00"+ o[k]).substr((""+ o[k]).length));
+    return format;
+};
+
diff --git a/gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html b/gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html
new file mode 100644
index 0000000..09093a4
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html
@@ -0,0 +1,526 @@
+<!DOCTYPE html>
+<html lang="en" class="full-height">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>鐧惧害鍦板浘</title>
+    <link rel="stylesheet" href="../css/basic.css">
+    <link rel="stylesheet" href="../src/css/layui.css">
+    <link rel="stylesheet" href="../app/css/common.css">
+    <link rel="stylesheet" href="../app/css/map.css">
+    <link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.css">
+    <style>
+    	body.homeinfo-tab .layui-tab {
+        	margin: 0;
+        }
+        body.homeinfo-tab .layui-tab-card{
+            border: none;
+        }
+        body.homeinfo-tab .layui-tab-content {
+        	padding: 0;
+        }
+        body.homeinfo-tab .layui-tab-content .layui-tab-item.layui-show {
+        	height: 100%;
+        }
+    </style>
+</head>
+<body class="full-height homeinfo-tab">
+    <div class="rel-full">
+        <div class="page-header bg-gay3">
+            <div class="layui-row h40">
+                <div class="layui-col-xs3 layui-col-md1 full-height">
+                    <button class="layui-btn layui-btn-primary layui-btn-sm mrt5 mrl8" id="closeIframe"><i class="fa fa-close mrr4"></i>鍏抽棴</button>
+                </div>
+                <div class="layui-col-xs6 layui-col-md10 full-height line-height40">鏈烘埧淇℃伅褰曞叆</div>
+                <div class="layui-col-xs3 layui-col-md1 full-height line-height40 t-align-right"></div>
+            </div>
+        </div>
+        <div class="page-content abs abs-top40 abs-bottom45">
+            <div class="rel-full">
+                <div class="abs footer-menu-content-show" id="homeInfo">
+                    <div class="rel-full">
+                    	<div class="layui-tab layui-tab-card" lay-filter="homeInfoTab" id="homeInfoTab" style="height: 100%;"></div>
+                    </div>
+                </div>
+                <div class="abs" id="video">
+                    <div class="rel-full">
+                    	瑙嗛淇℃伅
+                    </div>
+                </div>
+                <div class="abs" id="imgs">
+                    <div class="rel-full">
+                    	鍥剧墖淇℃伅
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="pageFooter" class="page-footer" style="position:absolute; bottom: 0;width: 100%; height: 44px; background-color: #FFFFFF; border-top: 1px solid #eeeeee">
+            <div class="layui-row">
+                <div class="layui-col-xs4 layui-col-md4">
+                    <div class="hdw-btn">
+                        <a href="javascript:;" class="this-active h44" data-href="#homeInfo"><i class="fa fa-home mrt4"></i><br><span>鏈烘埧淇℃伅</span></a>
+                    </div>
+                </div>
+                <div class="layui-col-xs4 layui-col-md4">
+                    <div class="hdw-btn">
+                        <a href="javascript:;" class="h44" data-href="#video"><i class="fa fa-video-camera mrt4"></i><br><span>瑙嗛</span></a>
+                    </div>
+                </div>
+                <div class="layui-col-xs4 layui-col-md4">
+                    <div class="hdw-btn">
+                        <a href="javascript:;" class="h44" data-href="#imgs"><i class="fa fa-image mrt4"></i><br><span>鍥剧墖</span></a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <input type="hidden" id="homeId">
+    <script type="text/html" id="homeTab">
+        <ul class="layui-tab-title">
+            {{# layui.each(d.tabc, function(index, item){ }}
+                <li class="{{ item.tshow }}">{{ item.title }}</li>
+            {{# }); }}
+        </ul>
+        <div class="layui-tab-content abs abs-top41 overflowY">
+            {{# layui.each(d.tabc, function(index, item){ }}
+                {{# if(item.type == 'group'){ }}
+                <div class="layui-tab-item {{ item.cshow }}">
+                    <table class="hdw-tbl mrb8">
+                        <thead>
+                            <tr>
+                                <th style="width:5em">鍙傛暟鍚嶇О</th>
+                                <th>鍙傛暟鍊�</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>鏈烘埧ID</td>
+                                <td>{{ item.content.homeid }}</td>
+                            </tr>
+                            <tr>
+                                <td>鏈烘埧鍚嶇О</td>
+                                <td>{{ item.content.homename }}</td>
+                            </tr>
+                            <tr>
+                                <td>鏈烘埧IP</td>
+                                <td>{{ item.content.homeip }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢垫睜缁処D</td>
+                                <td>{{ item.content.groupid }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢垫睜缁勫悕绉�</td>
+                                <td>{{ item.content.groupname }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢垫睜缁勫簭鍙�</td>
+                                <td>{{ item.content.ordernum }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢垫睜缁勫搧鐗�</td>
+                                <td>{{ item.content.brand }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢垫睜缁勫瀷鍙�</td>
+                                <td>{{ item.content.model }}</td>
+                            </tr>
+                            <tr>
+                                <td>鍗曚綋鐢垫睜灞炴��</td>
+                                <td>{{ item.content.monproperty }}</td>
+                            </tr>
+                            <tr>
+                                <td>鎶曞叆浣跨敤鏃ユ湡锛坹-M-d锛�</td>
+                                <td>{{ item.content.startusetime }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�</td>
+                                <td>{{ item.content.chargecurr }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢垫睜鍧囧厖鐢靛帇闃�鍊硷紙V锛�</td>
+                                <td>{{ item.content.chargevol }}</td>
+                            </tr>
+                            <tr>
+                                <td>鍏呮斁鐢佃澶囦俊鎭�</td>
+                                <td>{{ item.content.equipeinfo }}</td>
+                            </tr>
+                            <tr>
+                                <td>璐熻矗浜�</td>
+                                <td>{{ item.content.person }}</td>
+                            </tr>
+							<tr>
+                                <td>瀹夎浜哄憳</td>
+                                <td>{{ item.content.install_user }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+                {{# }else if(item.type == 'home'){ }}
+                <div class="layui-tab-item {{ item.cshow }}">
+                    <table class="hdw-tbl mrb8">
+                        <thead>
+                            <tr>
+                                <th style="white-space:nowrap">鍙傛暟鍚嶇О</th>
+                                <th>鍙傛暟鍊�</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>绔欑偣ID</td>
+                                <td>{{ item.content.stationid }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欑偣鍚嶇О</td>
+                                <td>{{ item.content.stationname }}</td>
+                            </tr>
+                            <tr>
+                                <td>鏈烘埧ID</td>
+                                <td>{{ item.content.homeid }}</td>
+                            </tr>
+                            <tr>
+                                <td>鎵�灞炵粍缁�</td>
+                                <td>{{ item.content.organize }}</td>
+                            </tr>
+                            <tr>
+                                <td>鏁版嵁鏉ユ簮</td>
+                                <td>{{ item.content.datasource }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欏潃绫诲瀷</td>
+                                <td>{{ item.content.addrstyle }}</td>
+                            </tr>
+                            <tr>
+                                <td>缁忕含搴�</td>
+                                <td>{{ item.content.position }}</td>
+                            </tr>
+                            <tr>
+                                <td>鎵�鍦ㄥ湴鍧�</td>
+                                <td>{{ item.content.addr }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欏潃鐘舵��</td>
+                                <td>{{ item.content.stationstatus }}</td>
+                            </tr>
+                            <tr>
+                                <td>缁存姢鍗曚綅</td>
+                                <td>{{ item.content.maintain }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欏潃鍦烘櫙</td>
+                                <td>{{ item.content.environment }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欏潃浜ф潈</td>
+                                <td>{{ item.content.addrpower }}</td>
+                            </tr>
+                            <tr>
+                                <td>浣跨敤鍗曚綅</td>
+                                <td>{{ item.content.usecompany }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐗╃悊绔欏潃缂栫爜</td>
+                                <td>{{ item.content.physicsaddrnum }}</td>
+                            </tr>
+                            <tr>
+                                <td>鍘嗗彶鐗╃悊绔欏潃缂栫爜</td>
+                                <td>{{ item.content.hisphysicsaddrnum }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欏潃鍐呴儴缂栫爜</td>
+                                <td>{{ item.content.addrinsidenum }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欏潃鎷奸煶绠�绉�</td>
+                                <td>{{ item.content.addrpinyin }}</td>
+                            </tr>
+                            <tr>
+                                <td>涓枃绠�绉�</td>
+                                <td>{{ item.content.chinesename }}</td>
+                            </tr>
+                            <tr>
+                                <td>鏄惁寮�閫氫笟鍔�</td>
+                                <td>{{ item.content.isopenbusiness }}</td>
+                            </tr>
+                            <tr>
+                                <td>褰曞叆浜哄憳</td>
+                                <td>{{ item.content.entryperson }}</td>
+                            </tr>
+                            <tr>
+                                <td>褰曞叆鏃堕棿</td>
+                                <td>{{ item.content.entrytime }}</td>
+                            </tr>
+                            <tr>
+                                <td>淇敼浜�</td>
+                                <td>{{ item.content.revisedperson }}</td>
+                            </tr>
+                            <tr>
+                                <td>淇敼鏃堕棿</td>
+                                <td>{{ item.content.revisedtime }}</td>
+                            </tr>
+                            <tr>
+                                <td>澶囨敞</td>
+                                <td>{{ item.content.remark }}</td>
+                            </tr>
+                            <tr>
+                                <td>绔欏潃鎺ユ敹鏍囪鍙婃槸鍚︽湁鏁�</td>
+                                <td>{{ item.content.isactive }}</td>
+                            </tr>
+                            <tr>
+                                <td>绉诲姩绔欏潃鍚嶇О</td>
+                                <td>{{ item.content.yidongaddrname }}</td>
+                            </tr>
+                            <tr>
+                                <td>鐢典俊绔欏潃鍚嶇О</td>
+                                <td>{{ item.content.dianxinaddrname }}</td>
+                            </tr>
+                            <tr>
+                                <td>鑱旈�氱珯鍧�鍚嶇О</td>
+                                <td>{{ item.content.liantongaddrname }}</td>
+                            </tr>
+                            <tr>
+                                <td>鍝佺墝</td>
+                                <td>{{ item.content.brand }}</td>
+                            </tr>
+                            <tr>
+                                <td>缁埅娴嬬畻鏃堕棿</td>
+                                <td>{{ item.content.endurtime }}</td>
+                            </tr>
+                            <tr>
+                                <td>缁埅娴嬬畻绫诲瀷</td>
+                                <td>{{ item.content.endurstyle }}</td>
+                            </tr>
+                            <tr>
+                                <td>缁埅鍙戠敓鏃堕棿</td>
+                                <td>{{ item.content.endurstarttime }}</td>
+                            </tr>
+                            <tr>
+                                <td>鍏变韩鎯呭喌</td>
+                                <td>{{ item.content.shareinfo }}</td>
+                            </tr>
+                            <tr>
+                                <td>杩愯惀鍟嗚喘涔板彂鐢垫湇鍔$姸鎬�</td>
+                                <td>{{ item.content.buystatus }}</td>
+                            </tr>
+                            <tr>
+                                <td>鏄惁鍏峰鍙戠數鏉′欢</td>
+                                <td>{{ item.content.ischarge }}</td>
+                            </tr>
+                            <tr>
+                                <td>涓婄珯璺▼</td>
+                                <td>{{ item.content.distance }}</td>
+                            </tr>
+                            <tr>
+                                <td>涓婄珯闅炬槗绋嬪害</td>
+                                <td>{{ item.content.degree }}</td>
+                            </tr>
+                            <tr>
+                                <td>瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�</td>
+                                <td>{{ item.content.repair }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+				{{# } }}
+            {{# }); }}
+        </div>
+    </script>
+    <script src="../js/jquery-1.8.3.js"></script>
+    <script src="../../src/layui.js"></script>
+    <script src="../app/js/common.js"></script>
+    <script src="../../pages/js/GPS.js"></script>
+    <script type="text/javascript">
+        // layui妯″潡
+        layui.use(['layer', 'laytpl', 'form', 'upload', 'element'], function() {
+            var layer = layui.layer;        // 鑾峰彇layer妯″潡
+            var laytpl = layui.laytpl;      // 鑾峰彇laytpl妯″潡
+            var form = layui.form;          // 鑾峰彇form妯″潡
+            var upload = layui.upload;      // 鑾峰彇upload妯″潡
+            var element = layui.element;	// 鑾峰彇element妯″潡
+            var footerMenu = new FooterMenu($('#pageFooter'));  // 瀹炰緥鍖栧簳閮ㄥ鑸爮
+            var homeInfo = parent.$('#homeInfoIframe').data('homeInfo'); // 鏈烘埧淇℃伅
+            var homeInfoTpl = $('#homeTab').html();		// 鏈烘埧淇℃伅妯℃澘
+            showHomeInfo(homeInfo.homeId);
+            // 鍏抽棴form
+            var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+            $('#closeIframe').click(function() {        // 璁剧疆鐐瑰嚮鎸夐挳鍏抽棴褰撳墠iframe
+                parent.layer.close(index);
+            });
+            
+            
+            // 鏄剧ず鏈烘埧淇℃伅
+			function showHomeInfo(sid) {
+				var temp = {
+					StationId: sid
+				};
+				var load = layer.load(1);
+				// 鏌ヨ鍩虹珯鐨勪俊鎭�
+				$.ajax({
+					type: 'post',
+					async: true,
+					url: 'BattInfAction!serchBattAllInfoByStationId',
+					data: 'json='+JSON.stringify(temp),
+					dataType: 'json',
+					success: function(result) {
+						var rs = JSON.parse(result.result);
+						if(rs.code == 1) {
+							var data = rs.data;
+							var rsData = formatHomeInfo(data);
+							console.log(rsData);
+							laytpl(homeInfoTpl).render(rsData, function(html) {
+								$('#homeInfoTab').html(html);
+                    			element.render('tab', 'homeInfoTab');
+							});
+						}else {
+							layer.msg('鏆傛棤鍩虹珯淇℃伅锛�');
+						}
+						
+					},
+					complete: function() {
+						layer.close(load);
+					}
+				});
+			}
+			
+			// 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
+			function formatHomeInfo(data) {
+				//console.log(data);
+				var groupDefaults = {
+					homeid: '',
+					homename: '',
+					homeip: '',
+					groupid: '',
+					groupname: '',
+					ordernum: '',
+					brand: '',
+					model: '',
+					monproperty: '',
+					startusetime: '',
+					chargecurr: '',
+					chargevol: '',
+					equipeinfo: '',
+					person: '',
+					install_user: ''
+				};
+				
+				var homeDefaults = {
+					
+				};
+				var rs = {
+					sid: 0,
+					tabc:[]
+				};
+				var tabc = rs.tabc;
+				// 閬嶅巻data鐢熸垚鏈烘埧鐨勫��
+				for(var i=0; i<data.length; i++) {
+					var _data = data[i];
+					var tmp = {};
+					tmp.title = '鐢垫睜缁�'+(i+1)+'淇℃伅';
+					tmp.type = 'group';
+					tmp.content = $.extend({}, groupDefaults);
+					tmp.tshow = '';
+			        tmp.cshow = '';
+					if(i==0) {
+						tmp.tshow = 'layui-this';
+			        	tmp.cshow = 'layui-show';
+					}
+					// 璁剧疆content鐨勫��
+					var content = tmp.content;
+					rs.sid = _data.StationId;	    		// 鏈烘埧id
+					content.homeid = _data.StationId;	    		// 鏈烘埧id
+					content.homename = _data.StationName;			// 鏈烘埧鍚嶇О
+					content.homeip = _data.StationIp;				// 鏈烘埧ip
+					content.groupid = _data.BattGroupId;			// 鐢垫睜缁刬d
+					content.groupname = _data.BattGroupName;		// 鐢垫睜缁勫悕绉�
+					content.ordernum = _data.GroupIndexInFBSDevice+1;// 鐢垫睜缁勭紪鍙�
+					content.brand = _data.BattProducer;				// 鐢垫睜鍝佺墝
+					content.model = _data.BattModel;
+					var monproperty = '鏍囩О瀹归噺锛�'+_data.MonCapStd+'AH'+'锛涙爣绉板崟浣撶數鍘嬶細'+_data.MonVolStd+'V'+'锛涙爣绉板唴闃伙細'+_data.MonResStd.toFixed(3)+'m惟'
+									+'锛涙爣绉版俯搴︼細'+_data.MonTmpStd+'鈩�'+'锛涘崟浣撴暟閲忥細'+_data.MonCount+'鑺�'; 
+					content.monproperty = monproperty;
+					content.startusetime = new Date(_data.BattInUseDate).format('yyyy-MM-dd');
+					content.chargecurr = _data.BattFloatCurrent;
+					content.chargevol = _data.FloatVolLevel;
+					var equipeinfo = '鍨嬪彿锛�'+_data.FBSDeviceName+'锛汭D锛�'+_data.FBSDeviceId
+									+'锛汭P锛�'+_data.FbsDeviceIp+'锛汢Index锛�'+_data.GroupIndexInFBSDevice;
+					content.equipeinfo = equipeinfo;
+					content.person = '';
+					content.install_user = _data.install_user;
+					
+					tabc.push(tmp);
+				}
+				var StationId_ex = data[0].StationId_ex;
+				var install_user = data[0].install_user;
+				var homeData = data[0].binf_ex;
+				var tmp = {};
+				tmp.title = '鍩虹珯淇℃伅';
+				tmp.type = 'home';
+				tmp.content = $.extend({}, homeDefaults);
+				tmp.tshow = '';
+			    tmp.cshow = '';
+			    // 璁剧疆content鐨勫��
+				var content = tmp.content;
+				content.stationid = StationId_ex;
+				content.stationname = homeData.stationName;
+				content.homeid = homeData.stationId;
+				content.organize = homeData.affiliation;
+				content.datasource = homeData.dataSources;
+				content.addrstyle = homeData.stationType;
+				var position = '缁忓害锛�'+homeData.longitude+'锛涚含搴︼細'+homeData.latitude;
+				content.position = position;
+				content.addr = homeData.stationAddr;
+				var blockedState = homeData.blockedState?'鏄�': '鍚�';
+				var stationstatus = '绔欏潃绛夌骇锛�'+homeData.stationLevel+'锛涚淮鎶ょ姸鎬侊細'+homeData.maintenanceState+'锛涘皝閿佺姸鎬侊細'+blockedState;
+				content.stationstatus = stationstatus;
+				content.maintain = homeData.maintenanceCompany;
+				var environment = '涓氬姟鍦烘櫙锛�'+homeData.businessScenario+'锛涜鐩栧満鏅細'+homeData.CoverScenario+'锛涚珯鍧�鍦板舰锛�'+homeData.siteTerrain;
+				content.environment = environment;
+				var isShare = homeData.isShare?'鏄�':'鍚�';
+				var addrpower = '浜ф潈鎬ц川锛�'+homeData.propertyRights+'锛涳紙鍘燂級浜ф潈鍗曚綅锛�'+homeData.propertyUnit+'锛涙槸鍚﹀叡浜細'+isShare;
+				content.addrpower = addrpower;
+				content.usecompany = homeData.useUnit;
+				content.physicsaddrnum = homeData.siteCode;
+				content.hisphysicsaddrnum = homeData.historySiteCode;
+				content.addrinsidenum = homeData.siteInternalNumber;
+				content.addrpinyin = homeData.sitePinyinReferred;
+				content.chinesename = homeData.siteChineseReferred;					// 涓枃绠�绉�
+				content.isopenbusiness = homeData.isOpenBusiness;
+				content.entryperson = homeData.schoolPersonnel;
+				content.entrytime = homeData.entryTime;
+				content.revisedperson = homeData.modifyPeople;
+				content.revisedtime = homeData.modifyTime;
+				content.remark = homeData.note;
+				var addrMark = homeData.siteReceivesMark?'鏄�':'鍚�';
+				var isEffe = homeData.siteValidity?'鏄�':'鍚�';
+				var isactive = '绔欏潃鎺ユ敹鏍囪锛�'+addrMark+'锛涙槸鍚︽湁鏁堬細'+isEffe;
+				content.isactive = isactive;
+				content.yidongaddrname = homeData.siteNameCMCC;
+				content.dianxinaddrname = homeData.siteNameCTC;
+				content.liantongaddrname = homeData.siteNameCUCC;
+				content.brand = homeData.producer;
+				content.endurtime = homeData.lastTimeLong;
+				content.endurstyle = homeData.lastTimeType;
+				content.endurstarttime = homeData.lastTimeDate;
+				content.shareinfo = homeData.shareInfo;
+				var buystauts = "绉诲姩璐拱:"+(homeData.electPowerCMCC==1?'鏄�':'鍚�')+";鐢典俊璐拱:"+(homeData.electPowerCTC==1?'鏄�':'鍚�')+";鑱旈�氳喘涔�:"+(homeData.electPowerCUCC==1?'鏄�':'鍚�');
+				content.buystatus = buystauts;
+				var ischarge = homeData.isCanElectPower==1?'鏄�':'鍚�';
+				content.ischarge = ischarge;
+				content.distance = homeData.upperStationRoute;
+				content.degree = homeData.upperStationDifficult;
+				content.repair = homeData.clienteleErrorService;
+				content.install_user = install_user;
+				
+				// 鏄惁娣诲姞鍩虹珯淇℃伅
+				if(content.stationid != '0') {
+					tabc.push(tmp);
+				}
+				
+				// 杩斿洖缁撴灉闆�
+				return rs;
+			}
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/map.html b/gx_tieta/WebRoot/mobil/map.html
index 64140fb..239790d 100644
--- a/gx_tieta/WebRoot/mobil/map.html
+++ b/gx_tieta/WebRoot/mobil/map.html
@@ -522,7 +522,35 @@
 		
 		// 鏌ョ湅鏈烘埧淇℃伅
 		function seenHomeInfo() {
-			layer.msg('鍔熻兘寮�鍙戜腑...')
+			var lng = $('.ipt-hide.lng').val();							// 鑾峰彇缁忓害
+			var lat = $('.ipt-hide.lat').val();							// 鑾峰彇绾害
+			var addr = $('.ipt-hide.addr').val();						// 鑾峰彇鍦板潃
+			var homeId = $('.ipt-hide.sid').val();						// 鏈烘埧Id
+			var homeName = $('.ipt-hide.home').val();					// 鏈烘埧鍚嶇О
+			var temp = {
+				homeId: homeId
+				,homeName: homeName
+				,addr: addr
+				,lng: lng
+				,lat: lat
+			}
+			// 鏄剧ず鏆傛棤鍙绔欑偣
+			if(homeId == 0) {
+				layer.msg(homeName);
+				return;
+			}
+			// 瀛樺偍鍊�
+			$('#homeInfoIframe').data('homeInfo', temp);
+			
+			iframePopup = layer.open({
+                type: 2
+                ,closeBtn: 0
+                ,title: false
+                ,area: ['100%', '100%']
+                ,full: true
+                ,anim: 4
+                ,content: 'iframe/seenhomeinfo.html'
+            });
 		}
 		
 		// 鏄剧ず鍦板浘鎻愮ず闈㈡澘
@@ -637,9 +665,6 @@
 			// console.log(mkList);
 			for(var i=0; i<mkList.length; i++) {
 				var mk = mkList[i];
-				if(mk.getLabel) {
-					console.log(mk.getLabel());
-				}
 				var _label = mk.getLabel?mk.getLabel()?mk.getLabel().content:'':'';
 				// 鍒ゆ柇鏈烘埧鍚嶇О
 				if(_label == name) {

--
Gitblit v1.9.1