From 1a779120d9bcd4a50fe02ca792cb87c98ccf775b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 26 十一月 2018 10:31:55 +0800
Subject: [PATCH] 修改内容

---
 gx_tieta/WebRoot/index.jsp |  180 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 147 insertions(+), 33 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 33cb90f..e7640d6 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -121,8 +121,29 @@
 						<div class="map-info-detail">
 							<div class="layui-collapse" lay-filter="test" lay-accordion="">
 								<div class="layui-colla-item">
+									<h2 class="layui-colla-title">鎼滅储鏈烘埧</h2>
+									<div class="layui-colla-content layui-show">
+										<table>
+											<tbody>
+												<tr>
+													<td class="w5em alg-c f-bold"><span class="mrl8">鏈烘埧鍚嶇О:</span></td>
+					                				<td><input type="text" id="mapToolSearch"></td>
+													<td class="w54 btn-container">
+														<button type="button" value="鎼滅储" id="mapToolSearchBtn" class="mrr8"><i class="fa fa-search page-link"></i></button>
+													</td>
+												</tr>
+												<tr>
+					                				<td colspan="3" class="btn-container">
+					                					<span class="mrl8">宸插畨瑁呰澶囨暟/璁惧鎬绘暟锛�<span id="installnum">12/600</span><i id="installnumbtn" class="fa fa-refresh mrl8 page-link" title="鍒锋柊"></i></span>
+					                				</td>
+					                			</tr>
+											</tbody>
+										</table>
+									</div>
+								</div>
+								<div class="layui-colla-item" id="permitAddHome">
 									<h2 class="layui-colla-title">娣诲姞鏈烘埧</h2>
-									<div class="layui-colla-content layui-show"">
+									<div class="layui-colla-content">
 					                	<table id="mapToolAddHome">
 					                		<tbody>
 					                			<tr>
@@ -149,24 +170,6 @@
 					                		</tbody>
 					                	</table>
 					                </div>
-								</div>
-								<div class="layui-colla-item">
-									<h2 class="layui-colla-title">瀹氫綅鏈烘埧</h2>
-									<div class="layui-colla-content">
-										<table>
-											<tbody>
-												<tr>
-													<td class="w5em alg-c f-bold">鏈烘埧鍚嶇О:</td>
-					                				<td><input type="text" id="mapToolSearch"></td>
-												</tr>
-												<tr>
-					                				<td colspan="2" class="alg-r btn-container">
-					                					<button type="button" value="鎼滅储" id="mapToolSearchBtn" class="mrr8">鎼滅储</button>
-					                				</td>
-					                			</tr>
-											</tbody>
-										</table>
-									</div>
 								</div>
 							</div>
 						</div>
@@ -216,12 +219,12 @@
 						<i class="fa fa-cog"></i>
 					</a>
 				</div>
+				<!--鐢垫睜鏁呴殰淇鍥�-->
+				<div class="repair-pie module"></div>
 				<!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
 				<div class="brdn-pie module"></div>
 				<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
 				<div class="warn-pie module"></div>
-				<!--鐢垫睜鏁呴殰淇鍥�-->
-				<div class="repair-pie module"></div>
 				<!--鐢垫睜鍋ュ悍楗肩姸鍥�-->
 				<div class="health-pie module"></div>
 				<!--娓呴櫎娴姩-->
@@ -387,6 +390,7 @@
 		</div>
 	</div>
 	<input type="hidden" id="user_logo" value="<%=user_logo  %>">
+	<div id="homeInfoIframeData"></div>
 	<!--娓呴櫎娴姩-->
 	<div class="clear"></div>
 	<script type="text/javascript" src="pages/js/base.js"></script>
@@ -401,6 +405,8 @@
 	<script type="text/javascript" src="js/myConfirm.js"></script>
 	<script type="text/javascript" src="js/loading.js"></script>
 	<script type="text/javascript" src="src/layui.js"></script>
+	<script type="text/javascript" src="src/layui.all.js"></script>
+	<script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
 	<script type="text/javascript">
 	var permits;
 	<%	Object obj=session.getAttribute("permits");
@@ -718,7 +724,7 @@
 						}
 					},
 					{
-						text: '鎭㈠姝e父',
+						text: '閫�鍑哄叏灞忔樉绀�',
 						callback: function(e) {
 							// console.info(e);
 							smallMap();
@@ -953,6 +959,8 @@
 	         				Almarr.push(/*{
 	         				name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId)			// 瀹归噺鍛婅鍛婅 									
 		         			} ,*/{
+		         				name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id),				// 鍦ㄧ嚎鐢靛帇 
+		         			},{
 		         				name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum),					// 缁勭鐢靛帇 
 		         			},{
 		         				name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id),					// 鍏呯數鐢垫祦 
@@ -997,6 +1005,15 @@
 					//鍒涘缓鐢垫睜鍛婅楗肩姸鍥�
 					var warnTle="<s:text name='Battery_alarm_rate'/>";		/* 鐢垫睜鍛婅鐜� */
 					createPie(warnPie,warnTle,Almarr);
+					warnPie.on('click', function(param) {
+						// 0:鍦ㄧ嚎鐢靛帇   1:缁勭鐢靛帇   2:鍏呯數鐢垫祦   3:鏀剧數鐢垫祦  4:鍗曚綋鐢靛帇  5:瀹归噺鍛婅 
+						if(param.dataIndex == 5) {
+							
+						}else {
+							window.open('elewarn.jsp?warntype='+param.dataIndex+'&warntxt='+param.name);
+						}
+						
+					});
 	         	}
 	         });
 		}		
@@ -1076,7 +1093,8 @@
 		}
 		$.ajax({ 	
        		type: "post", 				
-	        url: "BattPower_offAction!serchPowerOff",				
+	        //url: "BattPower_offAction!serchPowerOff",		
+	        url: "Bts_station_stateAction_action_serchPowerOff",	
 	        async:true,				
 	        dataType:'text',
 	        data:null,		
@@ -1087,10 +1105,12 @@
 	        	//console.info(model);
 	        	if((model.sum>=0) && (model.newsum>=0) && (model.newsum>=model.sum)){
 	        		repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:model.sum,color:'#FF0000'},							/*宸插仠鐢垫満鎴�*/
-								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'}];			/* 鏈仠鐢垫満鎴� */
+								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'},	/* 鏈仠鐢垫満鎴� */
+								{name:"鏈烘埧鎺夌珯", val: model.code}];			
 	        	}else{
 	        		repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:0,color:'#FF0000'},									/* 宸插仠鐢垫満鎴� */
-								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'}];						/* '鏈慨澶�' */
+								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'},
+								{name:"鏈烘埧鎺夌珯", val: model.code}];						/* '鏈慨澶�' */
 	        	}
 	        	var repairTle="<s:text name='Computer_room'/><s:text name='Power_cut'/>";		/* '鏈烘埧鍋滅數' */
 	        	if(powercut_isNew){
@@ -1098,7 +1118,7 @@
 		        	powercut_isNew = false;
 		        	createPie(repairPie,repairTle,repairObj);
 		        	repairPie.on('click', function() {
-						window.open('powercut.jsp?power_state=0');
+						window.open('batt-state-manage.jsp');
 					});
 	        	}else{
 	        		var opt = getOpt(repairTle, repairObj);
@@ -1146,6 +1166,11 @@
 				}
 				//鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
 				createPie(healthPie,healthTle,healthObj);
+				
+				// 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
+				healthPie.on('click', function(param) {
+					window.open('taskplan.jsp');	// 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
+				});
 			});			
 		}		
 	}
@@ -1557,28 +1582,42 @@
 	
 	// 鏅�氭満鎴挎弿杩�
 	function mapImgDescNormal(iconExplain) {
-		// 鏈烘埧钀藉悗
+		// 钀藉悗鏈烘埧
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var input = $('<input type="checkbox" data-img="item-behind" checked="checked">');
+		var span = $('<span>鐢垫睜钀藉悗鏈烘埧</span>');
 		var icon = $('<img src="'+mapImages.behind+'">');
-		var span = $('<span>鐢垫睜缁勮惤鍚庢満鎴�</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-behind">0</a>');
 		iconList.append(input);
 		iconList.append(span);
 		iconList.append(icon);
+		iconList.append(badge);
 		iconExplain.append(iconList);
 		
-		// 鏈烘埧鍛婅
+		// 鍛婅鏈烘埧
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var input = $('<input type="checkbox" data-img="item-warn" checked="checked">');
+		var span = $('<span>鐢垫睜鍛婅鏈烘埧</span>');
 		var icon = $('<img src="'+mapImages.warn+'">');
-		var span = $('<span>鐢垫睜缁勫憡璀︽満鎴�</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-warn">0</a>');
 		iconList.append(input);
 		iconList.append(span);
 		iconList.append(icon);
+		iconList.append(badge);
 		iconList.append('<div class="clear"></div>');
 		iconExplain.append(iconList);
 		
-		
+		// 鎺夌珯鏈烘埧
+		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+		var input = $('<input type="checkbox" data-img="item-down" checked="checked">');
+		var icon = $('<img src="'+mapImages.timeout+'">');
+		var span = $('<span>鎺夌珯鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">0</a>');
+		iconList.append(input);
+		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
+		//iconExplain.append(iconList);
 		
 		// 鏈烘埧寤舵椂
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
@@ -1588,16 +1627,18 @@
 		iconList.append(input);
 		iconList.append(span);
 		iconList.append(icon);
-		iconExplain.append(iconList);
+		//iconExplain.append(iconList);
 		
 		// 鍋滅數鏈烘埧
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var input = $('<input type="checkbox" data-img="item-poff" checked="checked">');
 		var icon = $('<img src="'+mapImages.powercut+'">');
 		var span = $('<span>鍋滅數鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">0</a>');
 		iconList.append(input);
 		iconList.append(span);
 		iconList.append(icon);
+		iconList.append(badge);
 		iconExplain.append(iconList);
 		
 		// 姝e父鏈烘埧
@@ -1605,11 +1646,39 @@
 		var input = $('<input type="checkbox" data-img="item-normal" checked="checked">');
 		var icon = $('<img src="'+mapImages.normal+'">');
 		var span = $('<span>姝e父鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-normal">0</a>');
 		iconList.append(input);
 		iconList.append(span);
 		iconList.append(icon);
+		iconList.append(badge);
 		iconExplain.append(iconList);
+		
+		// 缁埅涓嶈冻3灏忔椂鏈烘埧
+		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+		var input = $('<input type="checkbox" data-img="item-weak" checked="checked">');
+		var icon = $('<img src="'+mapImages.normal+'">');
+		var span = $('<span>缁埅涓嶈冻3灏忔椂鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-weak">0</a>');
+		iconList.append(input);
+		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
+		//iconExplain.append(iconList);
+		
+		
 	}
+	
+	// 鏇存柊鍦板浘鍥炬爣badge鐨勫��
+	function updateMapIconBadge() {
+		var mapImgDesc = $('#mapImgDesc');
+		var behind = mapImgDesc.find('.badge-behind');		// 鐢垫睜钀藉悗鏈烘埧
+		var warn = mapImgDesc.find('.badge-warn');			// 鐢垫睜鍛婅鏈烘埧
+		var down = mapImgDesc.find('.badge-down');			// 鎺夌珯鏈烘埧
+		var powercut = mapImgDesc.find('.badge-powercut');	// 鍋滅數鏈烘埧
+		var normal = mapImgDesc.find('.badge-normal');		// 姝e父鏈烘埧
+		var weak = mapImgDesc.find('.badge-weak');			// 缁埅涓嶈冻3灏忔椂鏈烘埧
+	}
+	
 	
 	// 61850鎻忚堪
 	function mapImgDesc61850(iconExplain) {
@@ -2466,11 +2535,13 @@
 					var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
-							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a></div>'+
+							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a>'+
+							'<a style="margin-left: 20px" href="javascript:showHomeInfo('+data.data.StationId+');">鍩虹珯淇℃伅</a></div>'+
 							'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
 							'<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+
 							'<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
 							'<input type="hidden" class="ipt-hide county" value="'+data.data.stationName5+'">'+							
+							'<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+
 							'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
 					
 					var list = {
@@ -3631,6 +3702,13 @@
 			});
 		}
 		
+		// 鏍规嵁鏉冮檺鏇存柊鍦板浘宸ュ叿鍐呭
+		var permitAddHome = getPermit('batt_map_edit_permit', permits);	// 娣诲姞鏈烘埧鐨勬潈闄�
+		// 娌℃湁娣诲姞鏈烘埧鐨勬潈闄�
+		if(!permitAddHome) {
+			$('#permitAddHome').remove();
+		}
+		
 		// 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�-鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
 		$('#showMapInfoDetail').click(function() {
 			$('.map-info-detail').slideToggle();
@@ -3715,6 +3793,42 @@
 			
 			return point;
 		}
+		// 鐐瑰嚮璁惧瀹夎鐘舵�佺殑鍒锋柊鎸夐挳
+		$('#installnumbtn').click(function() {
+			getInstallNum(true);
+		});
+		
+		// 缁熻璁惧瀹夎鎯呭喌
+		getInstallNum();
+		// 鑾峰彇褰撳墠宸茬粡瀹夎鐨勮澶囨暟鐩�
+		function getInstallNum(isLoad) {
+			var load;
+			// 鏌ヨ鍚庡彴鏁版嵁
+			$.ajax({
+				type: 'post',
+				async:true,
+				url: 'BattInfAction!serchDevice',
+				data: null,
+				dataType: 'json',
+				beforeSend:  function(xhr) {
+					if(isLoad) {
+						load = layer.load(1);
+					}
+					
+				},
+				complete: function(xhr) {
+					layer.close(load);
+				},
+				success: function(result) {
+					// 鏍煎紡鍖栨暟鎹�
+					var rs = JSON.parse(result.result);
+					var txt = rs.newsum+'/'+rs.sum;
+					
+					// 鏇存柊鏂囨湰鍊�
+					$('#installnum').text(txt);
+				}
+			});
+		};
 	});
 	
 	// 鏇存柊鍦板浘宸ュ叿鎼滅储鏈烘埧

--
Gitblit v1.9.1