From b4568a464fbe712cadf15e48c3b033bc7761c1de Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 12:22:22 +0800
Subject: [PATCH] 修改一次和二次电压显示除10 提交*10
---
gx_tieta/WebRoot/control.jsp | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 9026d13..d59fe55 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -235,7 +235,7 @@
<div class="tools-btn">
<a href="javascript:void(0);" id="setParamBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
<span class="whyc-btn-icon fa fa-play-circle"></span>
- <span class="whyc-btn-txt">鍚姩鏍稿娴嬭瘯</span>
+ <span class="whyc-btn-txt">鏍稿娴嬭瘯</span>
</a>
<br>
<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
@@ -1780,6 +1780,7 @@
var model = eval("("+data.result+")");
//console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍
@@ -1794,6 +1795,14 @@
//console.log(mygraph);
//debugger;
if(model.code == 1) {
+ var _data = model.data[0];
+
+ var alarmstates = GLOBAL.BTS9100.alarmstates;
+ var lastStopReason = getStateFromIndex(_data.dev_last_captest_stop_type,alarmstates);
+ //console.info("涓婁竴娆℃牳瀹规祴璇曞仠姝㈠師鍥狅細"+lastStopReason);
+ //console.info("閫氫俊璁℃暟锛�"+_data.dev_commcount);
+ //console.info("閫氫俊涓㈠寘鐜囷細"+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));
+
var nowTime = new Date().getTime(); //褰撳墠鏃堕棿
var record = new Date(model.data[0].record_datetime).getTime();
@@ -3448,9 +3457,11 @@
});
}
// 鏍规嵁璁惧淇℃伅鏄剧ず瀵瑰簲鐢佃矾鎷撴墤鍥�
+
function updateEleCircle(batt, data, mygraph) {
var status = GLOBAL.circleStatus.status;
- //console.info(status);
+ var e61850Opts = GLOBAL.circleStatus.e61850Opts;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
// 鍒濆鍖栦簩绾х
changeEleCircleOpt(eleCircle, 'diode', {
isShowValue: false,
@@ -3468,7 +3479,7 @@
// 鎷撴墤鍥惧浘鏍�
changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1}); // 鏀剧數鍗曞厓
changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1}); // 鍏呯數鍗曞厓
-
+ console.log(data);
// 娌℃湁褰㈠弬灏变笉鍋氫换浣曟搷浣�
if(data == undefined) {
status.hide();
@@ -3479,6 +3490,7 @@
if(regEquipType(data.dev_id, globalPattern.equip61850)) {
//console.info(data);
var alarms = data.dev_61850alarms.split(',');
+ status.setOpts(e61850Opts);
status.show();
//alarms = ['true', 'false', 'true', 'true'];
// 璁剧疆浜岀骇绠＄殑瀵奸�氬帇闄�
@@ -3519,7 +3531,31 @@
// 鎷撴墤鍥惧浘鏍�
changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:mygraph.graphtype}); // 鏀剧數鍗曞厓
changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:mygraph.graphtype}); // 鍏呯數鍗曞厓
- }else {
+ }else if(regEquipType(data.dev_id, globalPattern.BTS)){ // 鍒ゆ柇濡傛灉鏄疊TS9100鐨勮澶�
+ // 璁剧疆鐘舵�佺殑閰嶇疆椤�
+ status.setOpts(btsOpts);
+
+ // 宸ヤ綔鐘舵��
+ 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.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
+
+ // 璁剧疆涓㈠寘鐜�
+ var errorCount = data.dev_errcommcount;
+ var allCount = data.dev_commcount+errorCount;
+ var percent= (allCount==0?0:errorCount/allCount*100).toFixed(3);
+ status.setText('percent', "閫氫俊涓㈠寘鐜囷細"+percent+'%');
+
+ status.show();
+ }else{
status.hide();
}
}
@@ -4497,16 +4533,18 @@
$('#sysSet_read').click(function() {
var batt = getBatt();
var temp = {
- dev_id:batt.FBSDeviceId
+ dev_id:batt.FBSDeviceId,
+ num: sysCMD.get
};
searchSysData(temp, true);
});
- // 鐐瑰嚮璁剧疆绯荤粺鍙傛暟
+ // 鐐瑰嚮绯荤粺鍙傛暟鎸夐挳
$('#sysSet').click(function() {
var batt = getBatt();
var temp = {
- dev_id:batt.FBSDeviceId
+ dev_id:batt.FBSDeviceId,
+ num: sysCMD.get
};
searchSysData(temp);
});
@@ -4533,7 +4571,7 @@
var batt = getBatt();
var temp = {
dev_id: batt.FBSDeviceId,
- cmd: sysCMD.restart
+ num: sysCMD.restart
};
/* console.log(temp);
@@ -4664,8 +4702,8 @@
$('#sysSet_endur').val(data.GroupVolRange); // 鎬荤画鑸椂闂�
$('#sysSet_firTime').val(data.GroupVolSorce); // 淇濅竴娆′笅鐢电画鑸椂闂�
$('#sysSet_range').val(data.CurrentRange); // 鐢垫祦閽抽噺绋�
- $('#sysSet_firVol').val(data.CurrentTyte); // 涓�娆′笅鐢电數鍘�
- $('#sysSet_secVol').val(data.MonomerOrder); // 浜屾涓嬬數鐢靛帇
+ $('#sysSet_firVol').val(data.CurrentTyte/10); // 涓�娆′笅鐢电數鍘�
+ $('#sysSet_secVol').val(data.MonomerOrder/10); // 浜屾涓嬬數鐢靛帇
$('#sysSet_dcdc').val(data.LoaderCount); // DCDC妯″潡鏁伴噺
$('#sysSet_sourceStyle').val(data.DtCardCount); // 鍗曚綋鏁版嵁鏉ユ簮绫诲瀷
$('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
@@ -4707,8 +4745,8 @@
GroupVolRange: endur,
GroupVolSorce: firTime,
CurrentRange: range,
- CurrentTyte: firVol,
- MonomerOrder: secVol,
+ CurrentTyte: firVol*10,
+ MonomerOrder: secVol*10,
LoaderCount: dcdc,
DtCardCount: sourceStyle,
POF_BG_Boost_Cnt:bleedNum,
@@ -4810,7 +4848,14 @@
dev_id:910000577
};
-
+ //鏍规嵁绱㈠紩鑾峰彇鐘舵��
+ function getStateFromIndex(index,statearr){
+ var state = '鏃�';
+ if(index>0 && statearr && statearr.length>index){
+ state = statearr[index];
+ }
+ return state;
+ }
/* searchStationSignal(temp,function(data){
changeEleCircleOpt(eleCircle, 'signal', {
--
Gitblit v1.9.1