From 0c414c8027c6b3a91a0bc44f9ca99d1ed1b04ca6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 15 十一月 2018 15:12:42 +0800
Subject: [PATCH] 修复位置显示bug
---
gx_tieta/WebRoot/control.jsp | 524 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 467 insertions(+), 57 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 190b60c..0e86670 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -25,9 +25,9 @@
<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"> -->
<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 {
@@ -234,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">
@@ -244,7 +244,12 @@
<br>
<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>
+ <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>
@@ -954,6 +959,10 @@
<div class="popup-title"><span>绯荤粺鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
<div class="popup-content">
<div class="popup-tbl">
+ <input type="hidden" id="sysSet_ip" value=""> <!-- IP鍦板潃 -->
+ <input type="hidden" id="sysSet_subnet" value=""> <!-- 瀛愮綉鎺╃爜 -->
+ <input type="hidden" id="sysSet_netgate" value=""> <!-- 缃戝叧鍦板潃 -->
+ <input type="hidden" id="sysSet_mac" value=""> <!-- 鐗╃悊鍦板潃 -->
<table>
<tbody>
<tr>
@@ -965,40 +974,24 @@
<td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
</tr>
<tr>
- <th>IP鍦板潃</th>
- <th>瀛愮綉鎺╃爜</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_ip" readonly="readonly" value=""></td>
- <td><input type="text" id="sysSet_subnet" readonly="readonly" value=""></td>
- </tr>
- <tr>
- <th>缃戝叧鍦板潃</th>
- <th>鐗╃悊鍦板潃</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_netgate" readonly="readonly" value=""></td>
- <td><input type="text" id="sysSet_mac" readonly="readonly" value=""></td>
- </tr>
- <tr>
- <th>鎬荤画鑸椂闂�</th>
- <th>淇濅竴娆′笅鐢电画鑸椂闂�</th>
+ <th>鎬荤画鑸椂闂达紙0~9999鍒嗛挓锛�</th>
+ <th>淇濅竴娆′笅鐢电画鑸椂闂达紙0~9999鍒嗛挓锛�</th>
</tr>
<tr>
<td><input type="text" id="sysSet_endur" value=""></td>
<td><input type="text" id="sysSet_firTime" value=""></td>
</tr>
<tr>
- <th>鐢垫祦閽抽噺绋�</th>
- <th>涓�娆′笅鐢电數鍘�(V)</th>
+ <th>鐢垫祦閽抽噺绋嬶紙10~9999A锛�</th>
+ <th>涓�娆′笅鐢电數鍘嬶紙35.0~65.0V锛�</th>
</tr>
<tr>
<td><input type="text" id="sysSet_range" value=""></td>
<td><input type="text" id="sysSet_firVol" value=""></td>
</tr>
<tr>
- <th>浜屾涓嬬數鐢靛帇(V)</th>
- <th>DCDC妯″潡鏁伴噺</th>
+ <th>浜屾涓嬬數鐢靛帇锛�35.0~65.0V锛�</th>
+ <th>DCDC妯″潡鏁伴噺锛�1~10锛�</th>
</tr>
<tr>
<td><input type="text" id="sysSet_secVol" value=""></td>
@@ -1006,27 +999,38 @@
</tr>
<tr>
<th>鍗曚綋鏁版嵁鏉ユ簮绫诲瀷</th>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�0~2锛�</th>
</tr>
<tr>
- <td><input type="text" id="sysSet_sourceStyle" value=""></td>
+ <td>
+ <select id="sysSet_sourceStyle">
+ <option value="0">浠庢眹闆嗗櫒鑾峰彇</option>
+ <option value="1">浠庝竴鎷�24鑾峰彇</option>
+ </select>
+ </td>
<td><input type="text" id="sysSet_bleedNum" value=""></td>
</tr>
<tr>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�(V)</th>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�(V)</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄愶紙35.0~65.0V锛�</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄愶紙35.0~65.0V锛�</th>
</tr>
<tr>
<td><input type="text" id="sysSet_stopLimit" value=""></td>
<td><input type="text" id="sysSet_startLimit" value=""></td>
</tr>
<tr>
- <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�</th>
- <th>鑳屽厜鏃堕暱</th>
+ <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙1~2锛�</th>
+ <th>鑳屽厜鏃堕暱锛�0~999鍒嗛挓锛�</th>
</tr>
<tr>
<td><input type="text" id="sysSet_groupNum" value=""></td>
<td><input type="text" id="sysSet_backLightTime" value=""></td>
+ </tr>
+ <tr>
+ <th>鍋滅數鍏呯數鐢垫祦锛�0~50A锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="sysSet_powerBreakChargeCurr" value=""></td>
</tr>
</tbody>
</table>
@@ -1035,7 +1039,7 @@
<div class="popup-footer">
<input type="button" name="" id="sysSet_restart" value="閲嶅惎璁惧" >
<input type="button" name="" id="sysSet_read" value="璇诲彇" >
- <input type="button" name="" id="sysSet_en" class="status-change-set" value="璁剧疆" >
+ <input type="button" name="" id="sysSet_en" class="status-change-set " value="璁剧疆" >
</div>
</div>
@@ -1125,6 +1129,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>
@@ -1141,13 +1149,13 @@
<script type="text/javascript" src="js/dischargetest/9611.js"></script>
<script type="text/javascript" src="js/dischargetest/bts.js"></script>
<script type="text/javascript" src="js/dischargetest/4016.js"></script>
+ <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">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1210,7 +1218,7 @@
// 璁剧疆椤甸潰鏉冮檺妯″潡
$(function() {
var testOp = checkUserPermit(permits, 'batt_test_op_permit');
- console.log(testOp);
+ //console.log(testOp);
if(!testOp) {
$(".ele-circle .tools-btn").remove();
}
@@ -1754,6 +1762,8 @@
searchDevStatusByDev_id();
findrtstate();
findrtdata();
+ //鏌ヨ璁惧鐨刣cdc鐘舵��
+ searchDevDcDcState();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -1774,6 +1784,7 @@
var model = eval("("+data.result+")");
//console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍
@@ -1788,6 +1799,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();
@@ -3024,7 +3043,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);
});
});
@@ -3123,9 +3143,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(){
@@ -3443,9 +3461,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,
@@ -3463,10 +3483,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; // 缁撴潫鍑芥暟
}
@@ -3474,6 +3504,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'];
// 璁剧疆浜岀骇绠＄殑瀵奸�氬帇闄�
@@ -3501,6 +3532,7 @@
status.setStatus('msg', isLink);
// 璁剧疆娓╁害淇℃伅
status.setStatus('tmp', alarms[2] == 'true'?0:1);
+
// 璁剧疆鏍稿鍋滄鍘熷洜
if(data.dev_workstate == 2) {
status.setStatus('stop', 99);
@@ -3514,7 +3546,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();
}
}
@@ -4302,6 +4354,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;
@@ -4372,6 +4426,46 @@
//鍏ㄩ儴鏀剁缉
$('#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);
});
// 宸ュ叿鏉℃暣浣撴牱寮�
@@ -4492,24 +4586,29 @@
$('#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);
});
// 璁剧疆
$('#sysSet_en').click(function() {
+ // 鍒ゆ柇褰撳墠鎸夐挳鏄惁鍙互鐐瑰嚮
+ if($(this).hasClass('whyc-btn-disabled')) {
+ return;
+ }
var tmp = getSysSetData();
-
updateSysData(tmp);
});
@@ -4525,7 +4624,7 @@
var batt = getBatt();
var temp = {
dev_id: batt.FBSDeviceId,
- cmd: sysCMD.restart
+ num: sysCMD.restart
};
/* console.log(temp);
@@ -4544,6 +4643,8 @@
function searchSysData(temp, showSU) {
// 寮�鍚瓑寰呮
var load = layer.load(1);
+ // 璁剧疆鎸夐挳鏃犳硶鍙偣.whyc-btn-disabled
+ $('#sysSet_en').addClass('whyc-btn-disabled');
// 璇锋眰鍚庡彴
$.ajax({
type: "post",
@@ -4557,6 +4658,10 @@
if(rs.code == 1){
var data = rs.data[0];
setSysSetData(data);
+ // 绉婚櫎涓嶅彲鐐瑰嚮鐘舵��
+ initSysDataPopup();
+ $('#sysSet_en').removeClass('whyc-btn-disabled');
+ sysSet_popup.showPopup();
if(showSU) {
noContent.showNoContent('璇诲彇鎴愬姛', true);
}
@@ -4587,7 +4692,7 @@
data: "json = " + JSON.stringify(temp),
success: function(result) {
var rs = JSON.parse(result.result);
- console.info(rs);
+ //console.info(rs);
if(rs.code == 1){
noContent.showNoContent('鏇存柊鎴愬姛', true);
}else{
@@ -4650,17 +4755,16 @@
$('#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.PowerBreakChargeCurr); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
+ $('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
$('#sysSet_stopLimit').val(data.POF_BG_Boost_VolStop); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�
$('#sysSet_startLimit').val(data.POF_BG_Boost_VolStart); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�
$('#sysSet_groupNum').val(data.MajorBattGroupNum); // 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�
$('#sysSet_backLightTime').val(data.BackLightTime); // 鑳屽厜鏃堕棿
-
- sysSet_popup.showPopup();
+ $('#sysSet_powerBreakChargeCurr').val(data.PowerBreakChargeCurr); // 鍋滅數鍏呯數鐢垫祦
}
// 鑾峰彇闈㈡澘淇℃伅鐨勫��
@@ -4683,7 +4787,7 @@
var startLimit = $('#sysSet_startLimit').val(); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�
var groupNum = $('#sysSet_groupNum').val(); // 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�
var backLightTime = $('#sysSet_backLightTime').val(); // 鑳屽厜鏃堕棿
-
+ var powerBreakChargeCurr = $('#sysSet_powerBreakChargeCurr').val(); // 鍋滅數鍏呯數鐢垫祦
var rs = {
dev_id: dev_id,
@@ -4694,18 +4798,90 @@
GroupVolRange: endur,
GroupVolSorce: firTime,
CurrentRange: range,
- CurrentTyte: firVol,
- MonomerOrder: secVol,
+ CurrentTyte: firVol*10,
+ MonomerOrder: secVol*10,
LoaderCount: dcdc,
DtCardCount: sourceStyle,
- PowerBreakChargeCurr:bleedNum,
+ POF_BG_Boost_Cnt:bleedNum,
POF_BG_Boost_VolStop:stopLimit,
POF_BG_Boost_VolStart:startLimit,
MajorBattGroupNum:groupNum,
BackLightTime:backLightTime,
+ 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();
+ 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,
+ 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;
+
+ // 鏄剧ず淇″彿寮哄害
+ layer.msg(signalOpts.name, {time: 5000});
+ });
+
+ });
+
+ // 瑙ｆ瀽淇″彿璐ㄩ噺缁撴灉
+ 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>25) {
+ rs.img = 1;
+ rs.signal += '锛堝己锛�';
+ }else if(rs.signal>19) {
+ rs.img = 1;
+ rs.signal += '锛堜腑锛�';
+ }else {
+ rs.signal += '锛堝急锛�';
+ }
+ }
+ //console.info(rs);
return rs;
}
});
@@ -4727,6 +4903,240 @@
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);
+ }); */
+
+
+ //鑾峰彇璁惧鐨刣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() {
+
+ }
+ });
+ }
+
+ // 鏄剧ず鏈烘埧淇℃伅
+ function showHomeInfo(sid) {
+ var temp = {
+ StationId: sid
+ };
+
+ // 鏌ヨ鍩虹珯鐨勪俊鎭�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchBattAllInfoByStationId',
+ data: 'json='+JSON.stringify(temp),
+ dataType: 'json',
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ //console.log(data);
+ var rsData = formatHomeInfo(data);
+ $('#homeInfoIframeData').data('data', rsData);
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '<i class="fa fa-home"></i>鍩虹珯淇℃伅',
+ area: ['960px', '524px'],
+ fixed: false, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/homeinfo.html'
+ });
+ }else {
+ layer.msg('鏆傛棤鍩虹珯淇℃伅锛�');
+ }
+
+ }
+ });
+ }
+
+ // 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
+ function formatHomeInfo(data) {
+ var groupDefaults = {
+ homeid: '',
+ homename: '',
+ homeip: '',
+ groupid: '',
+ groupname: '',
+ ordernum: '',
+ brand: '',
+ model: '',
+ monproperty: '',
+ startusetime: '',
+ chargecurr: '',
+ chargevol: '',
+ equipeinfo: '',
+ person: ''
+ };
+
+ var homeDefaults = {
+
+ };
+ var rs = {
+ tabc:[]
+ };
+ var tabc = rs.tabc;
+ // 閬嶅巻data鐢熸垚鏈烘埧鐨勫��
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {};
+ tmp.title = '鐢垫睜缁�'+(i+1)+'淇℃伅';
+ tmp.type = 'group';
+ tmp.content = $.extend({}, groupDefaults);
+ tmp.tshow = '';
+ tmp.cshow = '';
+ if(i==0) {
+ tmp.tshow = 'layui-this';
+ tmp.cshow = 'layui-show';
+ }
+ // 璁剧疆content鐨勫��
+ var content = tmp.content;
+ content.homeid = _data.StationId; // 鏈烘埧id
+ content.homename = _data.StationName; // 鏈烘埧鍚嶇О
+ content.homeip = _data.StationIp; // 鏈烘埧ip
+ content.groupid = _data.BattGroupId; // 鐢垫睜缁刬d
+ content.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
+ content.ordernum = _data.GroupIndexInFBSDevice+1;// 鐢垫睜缁勭紪鍙�
+ content.brand = _data.BattProducer; // 鐢垫睜鍝佺墝
+ content.model = _data.BattModel;
+ var monproperty = '鏍囩О瀹归噺锛�'+_data.MonCapStd+'AH'+'锛涙爣绉板崟浣撶數鍘嬶細'+_data.MonVolStd+'V'+'锛涙爣绉板唴闃伙細'+_data.MonResStd.toFixed(3)+'m惟'
+ +'锛涙爣绉版俯搴︼細'+_data.MonTmpStd+'鈩�'+'锛涘崟浣撴暟閲忥細'+_data.MonCount+'鑺�';
+ content.monproperty = monproperty;
+ content.startusetime = new Date(_data.BattInUseDate).format('yyyy-MM-dd');
+ content.chargecurr = _data.BattFloatCurrent;
+ content.chargevol = _data.FloatVolLevel;
+ var equipeinfo = '鍨嬪彿锛�'+_data.FBSDeviceName+'锛汭D锛�'+_data.FBSDeviceId
+ +'锛汭P锛�'+_data.FbsDeviceIp+'锛汢Index锛�'+_data.GroupIndexInFBSDevice;
+ content.equipeinfo = equipeinfo;
+ content.person = '';
+
+ tabc.push(tmp);
+ }
+ var StationId_ex = data[0].StationId_ex;
+ var homeData = data[0].binf_ex;
+ var tmp = {};
+ tmp.title = '鍩虹珯淇℃伅';
+ tmp.type = 'home';
+ tmp.content = $.extend({}, homeDefaults);
+ tmp.tshow = '';
+ tmp.cshow = '';
+ // 璁剧疆content鐨勫��
+ var content = tmp.content;
+ content.stationid = StationId_ex;
+ content.stationname = homeData.stationName;
+ content.homeid = homeData.stationId;
+ content.organize = homeData.affiliation;
+ content.datasource = homeData.dataSources;
+ content.addrstyle = homeData.stationType;
+ var position = '缁忓害锛�'+homeData.longitude+'锛涚含搴︼細'+homeData.latitude;
+ content.position = position;
+ content.addr = homeData.stationAddr;
+ var blockedState = homeData.blockedState?'鏄�': '鍚�';
+ var stationstatus = '绔欏潃绛夌骇锛�'+homeData.stationLevel+'锛涚淮鎶ょ姸鎬侊細'+homeData.maintenanceState+'锛涘皝閿佺姸鎬侊細'+blockedState;
+ content.stationstatus = stationstatus;
+ content.maintain = homeData.maintenanceCompany;
+ var environment = '涓氬姟鍦烘櫙锛�'+homeData.businessScenario+'锛涜鐩栧満鏅細'+homeData.CoverScenario+'锛涚珯鍧�鍦板舰锛�'+homeData.siteTerrain;
+ content.environment = environment;
+ var isShare = homeData.isShare?'鏄�':'鍚�';
+ var addrpower = '浜ф潈鎬ц川锛�'+homeData.propertyRights+'锛涳紙鍘燂級浜ф潈鍗曚綅锛�'+homeData.propertyUnit+'锛涙槸鍚﹀叡浜細'+isShare;
+ content.addrpower = addrpower;
+ content.usecompany = homeData.useUnit;
+ content.physicsaddrnum = homeData.siteCode;
+ content.hisphysicsaddrnum = homeData.historySiteCode;
+ content.addrinsidenum = homeData.siteInternalNumber;
+ content.addrpinyin = homeData.sitePinyinReferred;
+ content.chinesename = homeData.siteChineseReferred; // 涓枃绠�绉�
+ content.isopenbusiness = homeData.isOpenBusiness;
+ content.entryperson = homeData.schoolPersonnel;
+ content.entrytime = homeData.entryTime;
+ content.revisedperson = homeData.modifyPeople;
+ content.revisedtime = homeData.modifyTime;
+ content.remark = homeData.note;
+ var addrMark = homeData.siteReceivesMark?'鏄�':'鍚�';
+ var isEffe = homeData.siteValidity?'鏄�':'鍚�';
+ var isactive = '绔欏潃鎺ユ敹鏍囪锛�'+addrMark+'锛涙槸鍚︽湁鏁堬細'+isEffe;
+ content.isactive = isactive;
+ content.yidongaddrname = homeData.siteNameCMCC;
+ content.dianxinaddrname = homeData.siteNameCTC;
+ content.liantongaddrname = homeData.siteNameCUCC;
+ content.brand = homeData.producer;
+ content.endurtime = homeData.lastTimeLong;
+ content.endurstyle = homeData.lastTimeType;
+ content.endurstarttime = homeData.lastTimeDate;
+ content.shareinfo = homeData.shareInfo;
+ var buystauts = "绉诲姩璐拱:"+(homeData.electPowerCMCC==1?'鏄�':'鍚�')+";鐢典俊璐拱:"+(homeData.electPowerCTC==1?'鏄�':'鍚�')+";鑱旈�氳喘涔�:"+(homeData.electPowerCUCC==1?'鏄�':'鍚�');
+ content.buystatus = buystauts;
+ var ischarge = homeData.isCanElectPower==1?'鏄�':'鍚�';
+ content.ischarge = ischarge;
+ content.distance = homeData.upperStationRoute;
+ content.degree = homeData.upperStationDifficult;
+ content.repair = homeData.clienteleErrorService;
+
+ tabc.push(tmp);
+ // 杩斿洖缁撴灉闆�
+ return rs;
+ }
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1