From 47baad903367aab2cc21475ee8b15bb25a90fc97 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 09:55:16 +0800
Subject: [PATCH] 更新实时界面放电测试面板数据
---
gx_tieta/WebRoot/control.jsp | 208 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 182 insertions(+), 26 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 8952efb..b972711 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -28,7 +28,6 @@
<!-- <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>
<script type="text/javascript" src="js/right-menu.js"></script>
<style>
body {
@@ -235,7 +234,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">
@@ -376,6 +375,10 @@
<tr>
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
+ </tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
</tr>
</table>
</div>
@@ -657,7 +660,7 @@
</tr>
<tr>
<th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 鍗囧帇涓婇檺 -->锛圴锛�</th>
- <th><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
+ <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
</tr>
<tr>
<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
@@ -1130,6 +1133,10 @@
<!-- 鏁翠綋鐨勯伄缃╁眰 -->
<div id="allShade"></div>
<div class="clear"></div>
+ <!-- iframe鏁版嵁涓存椂瀛樺偍浣嶇疆 -->
+ <div id="homeInfoIframeData"></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>
@@ -1149,11 +1156,11 @@
<script type="text/javascript" src="js/dischargetest/sysData.js"></script>
<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
+ <script type="text/javascript" src="js/rightmenu.js"></script>
<!-- 寮曞叆鐢佃矾鍥� -->
<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" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1216,7 +1223,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 +1767,8 @@
searchDevStatusByDev_id();
findrtstate();
findrtdata();
+ //鏌ヨ璁惧鐨刣cdc鐘舵��
+ searchDevDcDcState();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -1780,6 +1789,7 @@
var model = eval("("+data.result+")");
//console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍
@@ -1794,6 +1804,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();
@@ -3030,7 +3048,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 battid = batt.BattGroupId;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
});
});
@@ -3129,9 +3148,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(){
@@ -3449,9 +3466,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,
@@ -3469,10 +3488,20 @@
// 鎷撴墤鍥惧浘鏍�
changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1}); // 鏀剧數鍗曞厓
changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1}); // 鍏呯數鍗曞厓
-
+ //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; // 缁撴潫鍑芥暟
}
@@ -3480,6 +3509,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'];
// 璁剧疆浜岀骇绠＄殑瀵奸�氬帇闄�
@@ -3507,6 +3537,7 @@
status.setStatus('msg', isLink);
// 璁剧疆娓╁害淇℃伅
status.setStatus('tmp', alarms[2] == 'true'?0:1);
+
// 璁剧疆鏍稿鍋滄鍘熷洜
if(data.dev_workstate == 2) {
status.setStatus('stop', 99);
@@ -3520,7 +3551,27 @@
// 鎷撴墤鍥惧浘鏍�
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);
+
+ // 璁剧疆鏍稿鍋滄鍘熷洜
+ 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();
}
}
@@ -4308,6 +4359,8 @@
// 鐢垫睜缁�
treeView.ele.on('click', '.eleGroup', function() {
var eleGroup = $(this).data('attr');
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
// 鏍规嵁BattGroupId鏌ヨ鏁版嵁
if(BattGroupId != eleGroup.BattGroupId) {
BattGroupId = eleGroup.BattGroupId;
@@ -4333,7 +4386,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});
@@ -4378,6 +4431,47 @@
//鍏ㄩ儴鏀剁缉
$('#all_hide').click(function(){
treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
+ var menuItems = [
+ {txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'},
+ {txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
+ {txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
+ {txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
+ {txt: '璁惧鍏呮斁鐢垫ā鍧楃姸鎬�', cla:'target', data: {target: 'equip-charge-param.jsp'}},
+ {txt: '鏈烘埧鍘嗗彶浜嬩欢鏌ヨ', cla:'target', data: {target: 'batt-state-statistical.jsp'}},
+ ];
+ // 缁欒〃鏍兼坊鍔犺嚜宸辩殑鍙抽敭鑿滃崟
+ $('#contai').on('mousedown','.ele-circle canvas',function(e){
+ var batt = getBatt();
+ if (e.which == 3) {
+ var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+ var disY = (e || event).clientY + 10; // 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+
+ rightMenu.showMenu(menuItems, disX, disY);
+ }
+ });
+
+ // 鐐瑰嚮鍙抽敭鑿滃崟璺宠浆
+ $('body').on('click', '#rightMenu .target', function() {
+ var batt = getBatt();
+ var pageName = $(this).data('data').target;
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var county = batt.StationName5;
+ var home = batt.StationName;
+ var battid = batt.BattGroupId;
+
+ // 瀹炵幇璺宠浆
+ window.open(skipUrl(pageName, province, city, county, home, battid));
+ });
+
+ // 鐐瑰嚮鍩虹珯鏈哄巻鍗�
+ $('body').on('click', '#rightMenu .home-info-card', function() {
+ var batt = getBatt();
+ // 鏄剧ず鍩虹珯鏈哄巻鍗�
+ showHomeInfo(batt.StationId);
});
// 宸ュ叿鏉℃暣浣撴牱寮�
@@ -4498,16 +4592,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);
});
@@ -4534,7 +4630,7 @@
var batt = getBatt();
var temp = {
dev_id: batt.FBSDeviceId,
- cmd: sysCMD.restart
+ num: sysCMD.restart
};
/* console.log(temp);
@@ -4665,8 +4761,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); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
@@ -4708,8 +4804,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,
@@ -4734,9 +4830,14 @@
// 鐐瑰嚮鏌ョ湅褰撳墠淇″彿鐨勮川閲�
$('#signalBtn').click(function() {
var batt = getBatt();
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
+ //var btsOpts = GLOBAL.circleStatus.btsOpts;
signalSearch.dev_id = batt.FBSDeviceId;
+ var load = layer.load(1);
// 璇锋眰鍚庡彴鑾峰彇淇″彿鐨勮川閲�
searchStationSignal(signalSearch,function(data){
+ layer.close(load);
// 鍩虹閰嶇疆
var signalOpts = {
img: signalBad,
@@ -4757,7 +4858,9 @@
// 鍥剧墖鎻忚堪
signalOpts.name = '淇″彿寮哄害锛�'+signalInfo.signal;
- changeEleCircleOpt(eleCircle, 'signal', signalOpts);
+
+ // 鏄剧ず淇″彿寮哄害
+ layer.msg(signalOpts.name, {time: 5000});
});
});
@@ -4774,11 +4877,17 @@
if(testCsq) {
rs.signal = RegExp.$1;
rs.bitError = RegExp.$2;
- if(rs.signal>20) {
+ if(rs.signal>25) {
rs.img = 1;
+ rs.signal += '锛堝己锛�';
+ }else if(rs.signal>19) {
+ rs.img = 1;
+ rs.signal += '锛堜腑锛�';
+ }else {
+ rs.signal += '锛堝急锛�';
}
}
-
+ //console.info(rs);
return rs;
}
});
@@ -4809,7 +4918,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', {
@@ -4823,6 +4939,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