From 81c7c8e734d57a2f92a31010f801d9107ee545c5 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.24>
Date: 星期一, 12 十一月 2018 15:08:21 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index f6bfa40..9b61671 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1760,6 +1760,8 @@
searchDevStatusByDev_id();
findrtstate();
findrtdata();
+ //鏌ヨ璁惧鐨刣cdc鐘舵��
+ searchDevDcDcState();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -4877,12 +4879,14 @@
console.log(data.data.ack_inf);
}); */
- //鏌ヨ璁惧鐨刣cdc鐘舵��
- searchDevDcDcState({
- dev_id:910000575
- });
+
//鑾峰彇璁惧鐨刣cdc鐘舵��
function searchDevDcDcState(temp){
+ var obj = getBatt();
+ var temp = {
+ dev_id: obj.FBSDeviceId
+ };
+
$.ajax({
type: "post",
url: "Fbs9100s_dcdc_stateAction_action_serchByInfo",
@@ -4893,9 +4897,20 @@
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() {
--
Gitblit v1.9.1