From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001 From: 81041 <81041@DESKTOP-025NVD9> Date: 星期五, 18 一月 2019 09:01:41 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/control.jsp | 776 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 709 insertions(+), 67 deletions(-) diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp index 2134d43..41c33a3 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 { @@ -120,6 +120,19 @@ .mr250 { margin-left: -250px; } + .page-link { + cursor: pointer; + } + .page-link:hover { + color: #1495E7; + } + .page-link:active { + color: #FF0000; + } + i.fa.f-size16 { + font-size: 16px; + vertical-align: middle; + } </style> </head> @@ -234,17 +247,32 @@ <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"> <span class="whyc-btn-icon fa fa-stop-circle"></span> - <span class="whyc-btn-txt" id="stopTestBtn">鍋滄娴嬭瘯</span> + <span class="whyc-btn-txt">鍋滄娴嬭瘯</span> + </a> + <br> + <a href="javascript:void(0);" id="battInfoBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport"> + <span class="whyc-btn-icon fa fa-battery-full"></span> + <span class="whyc-btn-txt">鐢垫睜鍙傛暟</span> </a> <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> + <br> + <a href="javascript:void(0);" id="threadInfo" class="whyc-btn whyc-btn-disabled" id="specialGraphExport"> + <span class="whyc-btn-icon fa fa-desktop"></span> + <span class="whyc-btn-txt">璁惧杩涚▼</span> </a> </div> </div> @@ -370,6 +398,10 @@ <tr> <td><s:text name="Head"/></td> <!-- 璐熻矗浜� --> <td></td> + </tr> + <tr> + <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� --> + <td id="installUser"></td> </tr> </table> </div> @@ -651,7 +683,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"/><!-- 鍏呯數鐢垫祦 -->锛�<span class="val-range"></span>A锛�<i class="fa fa-edit page-link f-size16" title="淇敼鍏呯數鐢垫祦鑼冨洿"></i></th> </tr> <tr> <td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td> @@ -670,7 +702,7 @@ </div> </div> <div class="popup-footer"> - <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 --> + <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled no-remove-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 --> <input type="button" name="" id="btn_flush" value="璇诲彇" > <!-- 璇诲彇 --> <input type="button" name="" id="btn_ensure" class="status-change-btn whyc-btn-disabled" value="璁惧畾" > <!-- 璁惧畾 --> <!-- <input type="button" name="" id="bts_graph" value="鎷撴墤鍥�"> --> @@ -954,6 +986,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 +1001,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 +1026,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>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙0~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 +1066,79 @@ <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> + <!-- 鐢垫睜鍙傛暟 --> + <div class="popup" id="battInfo_popup"> + <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="battInfo_dev_id" value=""> <!-- dev_id --> + <input type="hidden" id="battInfo_ip" value=""> <!-- IP鍦板潃 --> + <table> + <tbody> + <tr> + <th>璁惧ID</th> + <th>鏈烘埧鍚嶇О</th> + </tr> + <tr> + <td><input type="text" id="battInfo_fbs_id" readonly="readonly" value=""></td> + <td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td> + </tr> + <tr> + <th>鐢垫睜鏍囩О瀹归噺锛�1~6000.0AH锛�</th> + <th>鐢垫睜鏍囩О鍐呴樆锛�1~60000u惟锛�</th> + </tr> + <tr> + <td><input type="text" id="battInfo_nom_cap" value=""></td> + <td><input type="text" id="battInfo_nom_res" value=""></td> + </tr> + <tr> + <th>鐢垫睜缁勬暟锛�1~2锛�</th> + <th>姣忕粍鐢垫睜鍗曚綋鏁伴噺锛�1~300 锛�</th> + </tr> + <tr> + <td><input type="text" id="battInfo_batt_num" value=""></td> + <td><input type="text" id="battInfo_batt_mon_num" value=""></td> + </tr> + <tr> + <th>鍗曚綋鏍囩О鐢靛帇锛�0.1~20.0V锛�</th> + <th>鐢垫睜缁勭鏍囩О鐢靛帇锛�0.1~600.0V锛�</th> + </tr> + <tr> + <td><input type="text" id="battInfo_batt_nom_vol" value=""></td> + <td><input type="text" id="battInfo_group_nom_vol" value=""></td> + </tr> + <tr> + <th>鐢垫睜鏍囩О娓╁害锛�0.1~60.0鈩冿級</th> + <th>鐢垫睜娴厖鐢靛帇闃�鍊硷紙0.1~60.0V锛�</th> + </tr> + <tr> + <td><input type="text" id="battInfo_batt_nom_temp" value=""></td> + <td><input type="text" id="battInfo_batt_float_vol" value=""></td> + </tr> + <tr> + <th>鐢垫睜娴厖鐢垫祦闃�鍊硷紙0.1~30.0A锛�</th> + <th>鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙0.1~60.0V锛�</th> + </tr> + <tr> + <td><input type="text" id="battInfo_batt_float_curr" value=""></td> + <td><input type="text" id="battInfo_online_low_vol" value=""></td> + </tr> + <tr> + <th>鐢垫睜缁勮繛鎺ョ被鍨�(0~1)</th> + </tr> + <tr> + <td><input type="text" id="battInfo_batt_link_type" value=""></td> + </tr> + </tbody> + </table> + </div> + </div> + <div class="popup-footer"> + <input type="button" name="" id="battInfo_read" value="璇诲彇" > + <input type="button" name="" id="battInfo_en" class="status-change-set whyc-btn-disabled" value="璁剧疆" > </div> </div> @@ -1125,6 +1228,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 +1248,18 @@ <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="js/dischargetest/battData.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/html" id="setChargeCurrTpl"> + + </script> <script type="text/javascript"> var permits; <% Object obj=session.getAttribute("permits"); @@ -1210,7 +1322,7 @@ // 璁剧疆椤甸潰鏉冮檺妯″潡 $(function() { var testOp = checkUserPermit(permits, 'batt_test_op_permit'); - console.log(testOp); + //console.log(testOp); if(!testOp) { $(".ele-circle .tools-btn").remove(); } @@ -1226,6 +1338,7 @@ var equip4016_popup = new Popup($('#equip4016')); var sysSet_popup = new Popup($('#sysSet_popup')); var localNav = new Popup($('#localNav')); + var battInfo_popup = new Popup($('#battInfo_popup')); // 鍏呮斁鐢靛脊鍑烘璁剧疆 $(function() { // 鍒濆鍖朙D9鍏呮斁鐢靛脊鍑烘 @@ -1258,6 +1371,75 @@ sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞� }); + // 璁剧疆鐢垫睜鍙傛暟 + $('#battInfo_popup').find('.close').bind('click', function() { + battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞� + }); + + + // bts闈㈡澘鍏呯數鐢垫祦缂栬緫 + $('#ChargeCurrSetLabel .fa-edit').click(function() { + var batt =getBatt(); + //console.log(batt); + // 璁剧疆闈㈡澘 + layer.open({ + type: 1 + ,title: '璁剧疆鍏呯數鐢垫祦闃�鍊�' + , content: '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px;">'+ + '<input type="text" style="width: 100%; height:32px; border: 1px solid #ccc;" id="setChargeCurrVal" value="">'+ + '</div></div>' + ,btn:['璁剧疆', '鍙栨秷'] + ,yes: function(index) { + var chargeCurrVal = $('#setChargeCurrVal').val(); + var num = Number(chargeCurrVal); + if(isNaN(num) || num==0) { + layer.msg('璇疯緭鍏ユ暟瀛�'); + return; + } + var tmp = { + charge_curr_max: num + ,BattGroupId: batt.BattGroupId + }; + var load; + // 璇锋眰璁剧疆鐢垫祦鐨勫悗鍙� + $.ajax({ + type: 'post' + ,async: true + ,url: 'BattInfAction!update_charge' + ,data: 'json='+JSON.stringify(tmp) + ,dataType: 'json' + ,beforeSend: function(){ + load = layer.load(1); + } + ,success: function(res) { + var rs = JSON.parse(res.result); + // 鍏抽棴绛夊緟妗� + layer.close(load); + //console.log(rs); + if(rs.code == 1) { + // 璁剧疆寮瑰嚭妗嗕俊鎭� + layer.msg('璁剧疆鎴愬姛锛�'); + layer.close(index); + // 鍏呯數鐢垫祦 + $('#ChargeCurrSet').testVal('option', 'allOpts', { + regVal: true + ,update: true + ,min: 0 + ,max: num + ,msg: '鍙栧�艰寖鍥�0~'+num+'A' + }); + + // 璁剧疆鏂囨湰鍊� + $('#ChargeCurrSetLabel .val-range').text('0~'+num); + }else { + layer.msg('璁剧疆澶辫触!璇烽噸鏂拌缃�'); + } + } + + }); + } + }); + }); // 绐楀彛澶у皬鏀瑰彉 $(window).resize(function() { @@ -1267,6 +1449,7 @@ equip4016_popup.hidePopup(); // 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞� localNav.hidePopup(); sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞� + battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞� }); }); //鍒濆鍖栨煴鐘跺浘 @@ -1628,7 +1811,6 @@ $('.fir:first').next().children().eq(i).children().eq(0).css('display','none'); } } - //alert(BattGroupId); clearInterval(time); searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟 @@ -1751,9 +1933,13 @@ //鏌ヨ鐢垫睜缁勭殑瀹炴椂鐘舵�佷俊鎭� function showtable(){ //searbattrealInfomation(); - searchDevStatusByDev_id(); findrtstate(); findrtdata(); + //鏌ヨ璁惧鐨刣cdc鐘舵�� + searchDevDcDcState(); + + // 鏇存柊鎷撴墤鍥剧姸鎬� + searchDevStatusByDev_id(); } //鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬� @@ -1774,6 +1960,7 @@ var model = eval("("+data.result+")"); //console.log(model); + var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓) var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝e父 var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍 @@ -1788,7 +1975,14 @@ //console.log(mygraph); //debugger; if(model.code == 1) { - var nowTime = new Date().getTime(); //褰撳墠鏃堕棿 + 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(model.data[0].note).getTime(); //褰撳墠鏃堕棿 var record = new Date(model.data[0].record_datetime).getTime(); //console.info(Math.abs(nowTime-record)/1000); @@ -2096,6 +2290,7 @@ table_index = 0; createAllTbl(tbHd, tbBd, thVol, mon_vol_table_list); title.setAvg(parseFloat(sum/array.length).toFixed(3)); + title.setSum(sum); getBattAlarmTitle(batt,"Voltage",title); //title.alow = temp.alow; //璁剧疆鐢靛帇鍛婅浣庡�� //title.ahight = temp.ahight; //璁剧疆鐢靛帇鍛婅楂樺�� @@ -2462,7 +2657,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 +3219,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); }); }); @@ -3118,7 +3318,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(){ @@ -3436,9 +3637,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, @@ -3456,10 +3659,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; // 缁撴潫鍑芥暟 } @@ -3467,6 +3680,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']; // 璁剧疆浜岀骇绠$殑瀵奸�氬帇闄� @@ -3494,6 +3708,7 @@ status.setStatus('msg', isLink); // 璁剧疆娓╁害淇℃伅 status.setStatus('tmp', alarms[2] == 'true'?0:1); + // 璁剧疆鏍稿鍋滄鍘熷洜 if(data.dev_workstate == 2) { status.setStatus('stop', 99); @@ -3507,7 +3722,30 @@ // 鎷撴墤鍥惧浘鏍� 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); + + // 璁剧疆璁惧鐗堟湰鍙� + status.setText('devVersion', '璁惧鐗堟湰鍙凤細'+data.dev_version); + + // 璁剧疆涓㈠寘鐜� + 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(); } } @@ -4000,7 +4238,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); }); // 鐐瑰嚮閫夐」鍗℃洿鏂板浘琛� @@ -4290,6 +4533,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; @@ -4322,6 +4567,7 @@ getBattStr(); searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟 + searchDevSDState(); clearInterval(time); mygraph.graphtype = 4; showtable(); @@ -4362,6 +4608,48 @@ treeView.ele.find('li').removeClass('sider-menu-open'); }); + // 鐢佃矾鎷撴墤鍥惧彸閿彍鍗� + var menuItems = [ + {txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'}, + {txt: '鏈烘埧闂璁板綍', cla: 'target', data:{target: 'batt-fault-manage.jsp'}}, + {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); + }); + // 宸ュ叿鏉℃暣浣撴牱寮� $('.siderbar-tools').tooltip(); @@ -4376,8 +4664,8 @@ homeid: batt.StationId, battid: batt.BattGroupId }; - findBattinfByBattGroupId(batt.BattGroupId); - findStationInfoByStation(batt); + // 鏄剧ず鍩虹珯鏈哄巻鍗� + showHomeInfo(batt.StationId); // 鏍规嵁鏁版嵁瀹氫綅 localSideBar(treeView, treeView.container, tmp); }); @@ -4480,24 +4768,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); }); @@ -4513,11 +4806,12 @@ var batt = getBatt(); var temp = { dev_id: batt.FBSDeviceId, - cmd: sysCMD.restart + num: sysCMD.restart }; - console.log(temp); - return; + /* console.log(temp); + layer.msg('鍔熻兘寮�鍙戜腑...'); + return; */ // 閲嶅惎 restartSys(temp); }else { @@ -4531,6 +4825,8 @@ function searchSysData(temp, showSU) { // 寮�鍚瓑寰呮 var load = layer.load(1); + // 璁剧疆鎸夐挳鏃犳硶鍙偣.whyc-btn-disabled + $('#sysSet_en').addClass('whyc-btn-disabled'); // 璇锋眰鍚庡彴 $.ajax({ type: "post", @@ -4543,7 +4839,11 @@ console.info(rs); if(rs.code == 1){ var data = rs.data[0]; + // 绉婚櫎涓嶅彲鐐瑰嚮鐘舵�� + initSysDataPopup(); + $('#sysSet_en').removeClass('whyc-btn-disabled'); setSysSetData(data); + sysSet_popup.showPopup(); if(showSU) { noContent.showNoContent('璇诲彇鎴愬姛', true); } @@ -4574,7 +4874,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{ @@ -4637,17 +4937,23 @@ $('#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); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺 + //var POF_BG_Boost_Cnt = data.POF_BG_Boost_Cnt?data.POF_BG_Boost_Cnt:1; + $('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺 $('#sysSet_stopLimit').val(data.POF_BG_Boost_VolStop); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄� $('#sysSet_startLimit').val(data.POF_BG_Boost_VolStart); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄� + //var majorBattGroupNum = data.MajorBattGroupNum?data.MajorBattGroupNum:1; $('#sysSet_groupNum').val(data.MajorBattGroupNum); // 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙� $('#sysSet_backLightTime').val(data.BackLightTime); // 鑳屽厜鏃堕棿 + $('#sysSet_powerBreakChargeCurr').val(data.PowerBreakChargeCurr); // 鍋滅數鍏呯數鐢垫祦 - sysSet_popup.showPopup(); + + GLOBAL.testVal.check($('#sysSet_bleedNum'), $('#sysSet_bleedNum').data('testVal'), checkSysData); + GLOBAL.testVal.check($('#sysSet_groupNum'), $('#sysSet_groupNum').data('testVal'), checkSysData); + } // 鑾峰彇闈㈡澘淇℃伅鐨勫�� @@ -4670,7 +4976,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, @@ -4681,19 +4987,254 @@ 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}); + }); + + }); + + // 瑙f瀽淇″彿璐ㄩ噺缁撴灉 + 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; + } + + // 璁惧杩涚▼鏄剧ず + var threadInfoSearch = { + num: gprs.threadinfo, + dev_id:910000001 + }; + + // 鐐瑰嚮璁惧杩涚▼鎸夐挳 + $('#threadInfo').click(function() { + // console.log(threadInfoSearch); + var batt = getBatt(); + //console.log(batt); + threadInfoSearch.dev_id = batt.FBSDeviceId; + SendDeviceThreadInfo(threadInfoSearch,function(data){ + searchDeviceThreadInfo({dev_id: threadInfoSearch.dev_id}); + }); + }); + + //缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊� + var threadInfoLoad; + function SendDeviceThreadInfo(param,callback){ + threadInfoLoad = layer.load(1); + $.ajax({ + type:"post", + url: "Bts_gprs_stateAction_action_update_bts_task_inf", + async:true, + dataType:'json', + data:'json='+JSON.stringify(param), + success: function(data){ + var model = eval('('+data.result+')'); + console.info(model); + if(callback && typeof callback == 'function'){ + callback(model); + } + },error:function(e){ + var model = { + code:0, + data:e, + msg:'閫氫俊澶辫触' + }; + if(callback && typeof callback == 'function'){ + callback(model); + } + } + }); + } + + //鏌ヨ璁惧鐨勮繘绋嬩俊鎭� + function searchDeviceThreadInfo(param,callback){ + $.ajax({ + type:"post", + url: "Bts_gprs_stateAction_action_serchByCondition", + async:true, + dataType:'json', + data:'json='+JSON.stringify(param), + success: function(data){ + layer.close(threadInfoLoad); + var model = eval('('+data.result+')'); + if(model.code == 1) { + var btsTaskInf = model.data[0].bts_task_inf; + layer.open({ + title: '璁惧杩涚▼', + width: 380, + height: 450, + content: '<pre>'+btsTaskInf+'</pre>' + }); + }else { + layer.msg('鏌ヨ澶辫触'); + } + + + if(callback && typeof callback == 'function'){ + callback(model); + } + },error:function(e){ + var model = { + code:0, + data:e, + msg:'閫氫俊澶辫触' + }; + if(callback && typeof callback == 'function'){ + callback(model); + } + } + }); + } + + + // 鐢垫睜鍙傛暟 + var battCMD = GLOBAL.CMD.batt; // cmd鍛戒护 + var battPopup = GLOBAL.battInfoPopup; // 鐢垫睜鍙傛暟妯″潡 + battPopup.testVal(); // 璁剧疆闈㈡澘鐨勫彇鍊艰寖鍥� + $('#battInfoBtn').click(function() { + // 鑾峰彇鐢垫睜淇℃伅 + var batt = getBatt(); + var temp = { + dev_id: batt.FBSDeviceId + }; + + // 鏌ヨ鐢垫睜鍙傛暟闈㈡澘淇℃伅 + var load = layer.load(1); + battPopup.search(temp, batt, function(res, binf) { + layer.close(load); + battInfo_popup.showPopup(); // 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞� + }); + + }); + + // 鐐瑰嚮璁惧畾 + $('#battInfo_en').click(function() { + if($(this).hasClass('whyc-btn-disabled')) { + return; + } + // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅 + var load = layer.load(1); + battPopup.set(function(res) { + layer.close(load); + layer.msg(res.msg); + }); + }); + + // 鐐瑰嚮璇诲彇 + $('#battInfo_read').click(function() { + var batt = getBatt(); + var temp = { + dev_id: batt.FBSDeviceId + }; + // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅 + var load = layer.load(1); + battPopup.read(function(res) { + layer.close(load); + // console.log(res); + if(res.code == 1) { + battPopup.search(temp, batt, function(res, binf) { + layer.close(load); + layer.msg('鑾峰彇鍙傛暟鎴愬姛'); + }); + }else { + layer.msg('鑾峰彇鍙傛暟澶辫触'); + } + + }); + }); + + // 鏌ヨ鐢垫睜鍙傛暟鐨勫�� + function searchBattInfo(temp, binf) { + var load = layer.load(1); + // 鏌ヨ鐢垫睜鍙傛暟 + $.ajax({ + type: 'post' + ,async: true + ,url:'Fbs9100_battparamAction_action_serchByCondition' + ,data: 'json='+JSON.stringify(temp) + ,dataType: 'json' + ,success: function(res) { + var rs = JSON.parse(res.result); + //console.log(rs); + } + ,complete: function() { + layer.close(load); + } + }); } }); @@ -4714,6 +5255,107 @@ 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() { + + } + }); + } + + + //鏌ヨ璁惧鐨凷D鍗$姸鎬� + function searchDevSDState(){ + var obj= getBatt(); + var status = GLOBAL.circleStatus.status; + $.ajax({ + type: "post", + url: "Bts_station_stateAction_action_serchSDCard", + async: true, + dataType: 'json', + data: "json = " + JSON.stringify(obj), + success: function(result) { + var rs = JSON.parse(result.result); + //console.info(rs); + var sdStatus = (rs.data == 0)?'姝e父': '<span style="color: #FF0000">鏁呴殰</span>'; + //console.log(sdStatus); + status.setText('sdCard', "SD鍗$姸鎬侊細"+sdStatus); + clearTimeout(searchDevSDState.timeout); + searchDevSDState.timeout = setTimeout(function() { + searchDevSDState(); + }, 2000); + }, + error: function() { + clearTimeout(searchDevSDState.timeout); + searchDevSDState.timeout = setTimeout(function() { + searchDevSDState(); + }, 5000); + } + }); + } </script> <script type="text/javascript" src="js/Title.js"></script> <script type="text/javascript" src="js/control.js"></script> -- Gitblit v1.9.1