From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 220 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 173 insertions(+), 47 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 2134d43..71d3b71 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -25,6 +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"> -->
<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>
@@ -234,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">
@@ -244,7 +245,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 +960,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 +975,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 +1000,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 +1040,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 +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>
@@ -1141,13 +1148,12 @@
<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/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");
@@ -1774,6 +1780,7 @@
var model = eval("("+data.result+")");
//console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍
@@ -1788,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();
@@ -2462,7 +2477,11 @@
$('#echarts_menu .batt-mon-search').click(function() {
var batt = getBatt();
- window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num);
+
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId,battmon_num);
+ //console.info(url);
+ window.open(url);
+ //window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num);
});
$('#echarts_menu .batt-attention').click(function() {
@@ -3020,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);
});
});
@@ -3118,7 +3138,8 @@
//璺宠浆鍒版寚瀹氱殑鐢垫睜缁勭粺璁″垎鏋愭煡璇�
function targetBattReport(){
var batt = getBatt();
- window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
+ var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
// 浣跨敤jquery瀹炵幇宸﹀鑸殑鏄剧ず鍜岄殣钘�
$(document).ready(function(){
@@ -4000,7 +4021,12 @@
$('#monLineGraphPopup .control-popupClose .fa-file-text-o').click(function() {
var batt = getBatt();
var type = getPopupTabNum(getPopupTab());
- window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num+'&test_type='+type);
+
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId,battmon_num);
+ url += '&test_type='+type;
+ //console.info(url);
+ window.open(url);
+ //window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num+'&test_type='+type);
});
// 鐐瑰嚮閫夐」鍗℃洿鏂板浘琛�
@@ -4315,7 +4341,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});
@@ -4496,8 +4522,11 @@
// 璁剧疆
$('#sysSet_en').click(function() {
+ // 鍒ゆ柇褰撳墠鎸夐挳鏄惁鍙互鐐瑰嚮
+ if($(this).hasClass('whyc-btn-disabled')) {
+ return;
+ }
var tmp = getSysSetData();
-
updateSysData(tmp);
});
@@ -4516,8 +4545,9 @@
cmd: sysCMD.restart
};
- console.log(temp);
- return;
+ /* console.log(temp);
+ layer.msg('鍔熻兘寮�鍙戜腑...');
+ return; */
// 閲嶅惎
restartSys(temp);
}else {
@@ -4531,6 +4561,8 @@
function searchSysData(temp, showSU) {
// 寮�鍚瓑寰呮
var load = layer.load(1);
+ // 璁剧疆鎸夐挳鏃犳硶鍙偣.whyc-btn-disabled
+ $('#sysSet_en').addClass('whyc-btn-disabled');
// 璇锋眰鍚庡彴
$.ajax({
type: "post",
@@ -4544,6 +4576,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);
}
@@ -4574,7 +4610,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{
@@ -4641,13 +4677,12 @@
$('#sysSet_secVol').val(data.MonomerOrder); // 浜屾涓嬬數鐢靛帇
$('#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); // 鍋滅數鍏呯數鐢垫祦
}
// 鑾峰彇闈㈡澘淇℃伅鐨勫��
@@ -4670,7 +4705,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,
@@ -4685,13 +4720,74 @@
MonomerOrder: secVol,
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();
+ 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;
}
@@ -4714,6 +4810,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