From f87e0c49cf023c58b090ea4a30863d5dd8e9cc97 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 14:47:34 +0800
Subject: [PATCH] 添加dcdc告警模块显示

---
 gx_tieta/WebRoot/control.jsp |   65 ++++++++++++++++++++++++++++----
 1 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index d59fe55..9b61671 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1216,7 +1216,7 @@
 		// 璁剧疆椤甸潰鏉冮檺妯″潡
 		$(function() {
 			var testOp = checkUserPermit(permits, 'batt_test_op_permit');
-			console.log(testOp);
+			//console.log(testOp);
 			if(!testOp) {
 				$(".ele-circle .tools-btn").remove();
 			}
@@ -1760,6 +1760,8 @@
 			searchDevStatusByDev_id();
 			findrtstate();
 			findrtdata();
+			//鏌ヨ璁惧鐨刣cdc鐘舵��
+			searchDevDcDcState();
 		}
 		
 		//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -3479,10 +3481,20 @@
 			// 鎷撴墤鍥惧浘鏍�
 			changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1});	// 鏀剧數鍗曞厓
 			changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1});	// 鍏呯數鍗曞厓
-			console.log(data);
+			//console.log(data);
 			// 娌℃湁褰㈠弬灏变笉鍋氫换浣曟搷浣�
 			if(data == undefined) {
-				status.hide();
+				var opts = [{
+					name: 'none',
+					type: 'text',
+					status: 0,
+					notShow: false,
+					content: {
+						text:'璁惧鐘舵�侊細<span class="red">鏈繛鎺�</span>'
+					}
+				}];
+				status.setOpts(opts);
+				//status.hide();
 				return false;	// 缁撴潫鍑芥暟
 			}
 			
@@ -3518,6 +3530,7 @@
 				status.setStatus('msg', isLink);
 				// 璁剧疆娓╁害淇℃伅
 				status.setStatus('tmp', alarms[2] == 'true'?0:1);
+				
 				// 璁剧疆鏍稿鍋滄鍘熷洜
 				if(data.dev_workstate == 2) {
 					status.setStatus('stop', 99);
@@ -3539,11 +3552,7 @@
 				status.setStatus('workstatus', data.dev_workstate);
 				
 				// 璁剧疆鏍稿鍋滄鍘熷洜
-				if(data.dev_workstate == 2) {
-					status.setStatus('stop', 99);
-				}else {
-					status.setStatus('stop', data.dev_last_captest_stop_type);	
-				}
+				status.setStatus('stop', data.dev_last_captest_stop_type);
 				
 				// 璁剧疆閫氫俊璁℃暟
 				status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
@@ -4869,6 +4878,46 @@
 			console.log(RegExp.$2);
 			console.log(data.data.ack_inf);
 		}); */
+		
+		
+		//鑾峰彇璁惧鐨刣cdc鐘舵��
+		function searchDevDcDcState(temp){
+			var obj = getBatt();
+			var temp = {
+				dev_id: obj.FBSDeviceId	
+			};
+		
+			$.ajax({
+	            type: "post",
+	            url: "Fbs9100s_dcdc_stateAction_action_serchByInfo",
+	            async: true,
+	            dataType: 'json',
+	            data: "json = " + JSON.stringify(temp),
+	            success: function(result) {
+	                var rs = JSON.parse(result.result);
+	                console.info(rs);
+	                if(rs.code == 1){
+	                	var dcdcWarn = '';
+	                	var data = rs.data;
+	                	for(var i=0; i<data.length; i++) {
+	                		var _data = data[i];
+	                		if(i ==  (data.length-1)) {
+	                			dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16;
+	                		}else {
+	                			dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16+'/';
+	                		}
+	                	}
+	                
+	                	changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC妯″潡鍛婅锛�'+dcdcWarn});
+	                }else{
+	                	changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC妯″潡鍛婅锛氭湭鐭�'});	// 
+	                }
+	            },
+	            error: function() {
+	            	
+	            }
+	        });
+		}
 	</script>
 	<script type="text/javascript" src="js/Title.js"></script>
 	<script type="text/javascript" src="js/control.js"></script>

--
Gitblit v1.9.1