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 | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 151 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6915364..d59fe55 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -25,7 +25,7 @@
<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">
- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
+ <!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.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>
@@ -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">
@@ -246,6 +246,11 @@
<a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
<span class="whyc-btn-icon fa fa-gear"></span>
<span class="whyc-btn-txt">绯荤粺鍙傛暟</span>
+ </a>
+ <br>
+ <a href="javascript:void(0);" id="signalBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-signal"></span>
+ <span class="whyc-btn-txt">淇″彿璐ㄩ噺</span>
</a>
</div>
</div>
@@ -1125,6 +1130,8 @@
<!-- 鏁翠綋鐨勯伄缃╁眰 -->
<div id="allShade"></div>
<div class="clear"></div>
+ <!-- 寮曞叆layui妗嗘灦 -->
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript" src="js/jquery.bigcolorpicker.min.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.js"></script>
@@ -1147,8 +1154,6 @@
<!-- 寮曞叆鐢佃矾鍥� -->
<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");
@@ -1775,6 +1780,7 @@
var model = eval("("+data.result+")");
//console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍
@@ -1789,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();
@@ -3025,7 +3039,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
+ var homeid = batt.BattGroupId;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
});
});
@@ -3124,9 +3139,7 @@
function targetBattReport(){
var batt = getBatt();
var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
- //console.info(url);
window.open(url);
- //window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
}
// 浣跨敤jquery瀹炵幇宸﹀鑸殑鏄剧ず鍜岄殣钘�
$(document).ready(function(){
@@ -3444,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,
@@ -3464,7 +3479,7 @@
// 鎷撴墤鍥惧浘鏍�
changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1}); // 鏀剧數鍗曞厓
changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1}); // 鍏呯數鍗曞厓
-
+ console.log(data);
// 娌℃湁褰㈠弬灏变笉鍋氫换浣曟搷浣�
if(data == undefined) {
status.hide();
@@ -3475,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'];
// 璁剧疆浜岀骇绠＄殑瀵奸�氬帇闄�
@@ -3515,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();
}
}
@@ -4328,7 +4368,7 @@
// 璐熻浇鐢垫祦
var loadCurr = batt.Load_curr+'A';
changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
-
+ changeEleCircleOpt(eleCircle, 'signal', {isShow:false});
// 鏈�澶ф牳瀹圭數娴�
var disCurrMax = batt.DisCurrMax+'A';
changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'鏈�澶ф牳瀹圭數娴侊細'+disCurrMax});
@@ -4493,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);
});
@@ -4529,7 +4571,7 @@
var batt = getBatt();
var temp = {
dev_id: batt.FBSDeviceId,
- cmd: sysCMD.restart
+ num: sysCMD.restart
};
/* console.log(temp);
@@ -4660,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); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
@@ -4703,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,
@@ -4715,6 +4757,66 @@
PowerBreakChargeCurr: powerBreakChargeCurr,
num: sysCMD.set
};
+
+ return rs;
+ }
+
+ // 鏌ヨ淇″彿璐ㄩ噺妯″潡
+ var gprs = GLOBAL.CMD.gprs;
+ var signalSearch = {
+ num: gprs.param,
+ AT_cmd: gprs.signal,
+ dev_id: ''
+ };
+ // 鐐瑰嚮鏌ョ湅褰撳墠淇″彿鐨勮川閲�
+ $('#signalBtn').click(function() {
+ var batt = getBatt();
+ signalSearch.dev_id = batt.FBSDeviceId;
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴鑾峰彇淇″彿鐨勮川閲�
+ searchStationSignal(signalSearch,function(data){
+ layer.close(load);
+ // 鍩虹閰嶇疆
+ var signalOpts = {
+ img: signalBad,
+ isShow: true,
+ startX: 10,
+ startY: 30,
+ name: ''
+ };
+ var signalInfo = formatSignal("");
+ if(data.code == 1) {
+ var csq = data.data.ack_inf;
+ signalInfo = formatSignal(csq);
+ }
+ // 鏄剧ず鍥剧墖绫诲瀷
+ if(signalInfo.img) {
+ signalOpts.img = signalGood;
+ }
+
+ // 鍥剧墖鎻忚堪
+ signalOpts.name = '淇″彿寮哄害锛�'+signalInfo.signal;
+ changeEleCircleOpt(eleCircle, 'signal', signalOpts);
+ });
+
+ });
+
+ // 瑙ｆ瀽淇″彿璐ㄩ噺缁撴灉
+ function formatSignal(signal) {
+ var rs = {
+ signal: '鏈煡',
+ bitError: '鏈煡',
+ img: 0
+ };
+ var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");
+ var testCsq = ptn.test(signal);
+ if(testCsq) {
+ rs.signal = RegExp.$1;
+ rs.bitError = RegExp.$2;
+ if(rs.signal>20) {
+ rs.img = 1;
+ }
+ }
return rs;
}
@@ -4737,6 +4839,36 @@
tabContents.eq(index).addClass('con-show');
});
});
+
+ var gprs = GLOBAL.CMD.gprs;
+
+ var temp = {
+ num: gprs.param,
+ AT_cmd: gprs.signal,
+ 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', {
+ img: signalBad,
+ isShow: true,
+ });
+ var csq = data.data.ack_inf;
+ var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");
+ var testCsq = ptn.test(csq);
+ console.log(RegExp.$1);
+ console.log(RegExp.$2);
+ console.log(data.data.ack_inf);
+ }); */
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1