From be47638f60bc2efbbe98b3debb854a5fcd4fc9b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期六, 03 十一月 2018 16:54:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/control.jsp |   92 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 91 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 3e38315..87c2ea5 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -24,6 +24,7 @@
 	<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.css">
 	<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
 	<link rel="stylesheet" type="text/css" href="css/confirm.css">
+	<link rel="stylesheet" type="text/css" href="src/css/layui.css">
 	<script type="text/javascript" src="js/echarts.js"></script>
 	<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
 	<script type="text/javascript" src="js/base.js"></script>
@@ -239,6 +240,11 @@
 								<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
 									<span class="whyc-btn-icon fa fa-stop-circle"></span>
 									<span class="whyc-btn-txt" id="stopTestBtn">鍋滄娴嬭瘯</span>
+								</a>
+								<br>
+								<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+									<span class="whyc-btn-icon fa fa-gear"></span>
+									<span class="whyc-btn-txt" id="sysSet">璁剧疆绯荤粺鍙傛暟</span>
 								</a>
 					        </div>
 						</div>
@@ -943,6 +949,33 @@
 		</div>
 	</div>
 	
+	<!-- 绯荤粺鍙傛暟璁剧疆 -->
+	<div class="popup" id="sysSet_popup">
+		<div class="popup-title"><span>绯荤粺鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
+		<div class="popup-content">
+			<div class="popup-tbl">
+				<table>
+					<tbody>
+						<tr>
+							<th>鏈烘埧id</th>
+							<th>鏈烘埧鍚嶇О</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_dev_id" readonly="readonly" value=""></td>
+							<td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+		
+		<div class="popup-footer">
+			<input type="button" name="" id="sysSet_restart" value="閲嶅惎璁惧" >
+			<input type="button" name="" id="sysSet_read" value="璇诲彇" >							
+			<input type="button" name="" id="sysSet_en" class="status-change-set" value="璁剧疆" >
+		</div>
+	</div>
+	
 	<!-- 鍗曚綋鏇茬嚎 -->
 	<div class="popup w960 mr480x" id="monLineGraphPopup">
 		<div id="control_popupTools">
@@ -1045,6 +1078,8 @@
 	<!-- 寮曞叆鐢佃矾鍥� -->
 	<script type="text/javascript" src="js/elecircle.js"></script>
 	<script type="text/javascript" src="js/elecircle.content.js"></script>
+	<!-- 寮曞叆layui妗嗘灦 -->
+	<script type="text/javascript" src="src/layui.all.js"></script>
 	<script type="text/javascript">
 	var permits;
 	<%	Object obj=session.getAttribute("permits");
@@ -1053,7 +1088,6 @@
 			permits=<%=permits%>;
 			//console.info(json);
 	<%	}	%>
-	console.log(permits);
 		//鎷撴墤鍥剧姸鎬佸璞�
 		var mygraph = {
 			battstate:0,
@@ -1105,11 +1139,24 @@
 		myChart=echarts.init(oConEcharts);
 		myChart.showLoading();
 		
+		// 璁剧疆椤甸潰鏉冮檺妯″潡
+		$(function() {
+			var testOp = checkUserPermit(permits, 'batt_test_op_permit');
+			console.log(testOp);
+			if(!testOp) {
+				$(".ele-circle .tools-btn").remove();
+			}
+			
+		});
+		
+		
+		
 		// 璁剧疆闈㈡澘
 		var LD9_popup = new Popup($('#LD9_popup'));
 		var equip61850_popup = new Popup($('#equip61850'));
 		var BTS_popup = new Popup($('#bts'));
 		var equip4016_popup = new Popup($('#equip4016'));
+		var sysSet_popup = new Popup($('#sysSet_popup'));
 		var localNav = new Popup($('#localNav'));
 		// 鍏呮斁鐢靛脊鍑烘璁剧疆
 		$(function() {
@@ -1138,6 +1185,12 @@
 				localNav.hidePopup();	// 闅愯棌localNav寮瑰嚭妗嗗拰閬僵灞�
 			});
 			
+			// 璁剧疆绯荤粺鍙傛暟
+			$('#sysSet_popup').find('.close').bind('click', function() {
+				sysSet_popup.hidePopup();	// 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
+			});
+			
+			
 			// 绐楀彛澶у皬鏀瑰彉
 			$(window).resize(function() {
 				LD9_popup.hidePopup();	// 闅愯棌LD9寮瑰嚭妗嗗拰閬僵灞�
@@ -1145,6 +1198,7 @@
 				BTS_popup.hidePopup();	// 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
 				equip4016_popup.hidePopup();	// 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
 				localNav.hidePopup();
+				sysSet_popup.hidePopup();	// 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
 			});
 		});
 		//鍒濆鍖栨煴鐘跺浘
@@ -4350,6 +4404,42 @@
 			
 		});
 		
+		// 绯荤粺鍙傛暟璁剧疆
+		$(function() {
+			// 鐐瑰嚮璁剧疆绯荤粺鍙傛暟
+			$('#sysSet').click(function() {
+				var batt = getBatt();
+				var temp = {
+					dev_id:batt.FBSDeviceId
+				};
+				layer.msg('鍔熻兘寮�鍙戜腑...');
+				
+				return;
+				sysSet_popup.showPopup();
+				searchSysData(temp);
+			});
+				
+			// 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
+			function searchSysData(temp) {
+				$.ajax({
+		            type: "post",
+		            url: "Fbs9100_sysparamAction_action_serchByCondition",
+		            async: true,
+		            dataType: 'json',
+		            data: "json = " + JSON.stringify(temp),
+		            success: function(data) {
+		                var rs = JSON.parse(data.result);
+		                console.info(rs);
+		                if(rs.code == 1){
+		                	
+		                }else{
+		                
+		                }
+		            }
+		        });
+			}
+		});
+		
 		// 鏈哄巻鍗℃ā鍧�
 		$(function() {
 			// 鑾峰彇閫夐」鍗″垪琛�

--
Gitblit v1.9.1