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 | 27 +++++++++++++++++++++------
gx_tieta/WebRoot/js/elecircle.content.js | 10 +++++++++-
2 files changed, 30 insertions(+), 7 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() {
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 0bb0133..d8bd338 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -491,6 +491,14 @@
name: '璁惧娓╁害锛�0鈩�',
});
+ // dcdc妯″潡鍛婅
+ eleCircle.drawText({
+ id: 'dcdcWarn',
+ startX: 250,
+ startY: 390,
+ name: 'DCDC妯″潡鍛婅锛�0x8000/0x8000',
+ });
+
var currentObj = {
id: 'current'
};
@@ -984,7 +992,7 @@
status: 0,
content: {
list:gl.BTS9100.workstates,
- text: '璁惧鐘舵��:'
+ text: '璁惧鐘舵�侊細'
}
},
{
--
Gitblit v1.9.1