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 | 851 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 832 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 94e2813..71d3b71 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -24,6 +24,8 @@
<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.css">
<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>
@@ -113,6 +115,12 @@
.w400 {
width: 400px;
}
+ .w500 {
+ width: 500px;
+ }
+ .mr250 {
+ margin-left: -250px;
+ }
</style>
</head>
@@ -127,6 +135,13 @@
<table>
<tr>
<td id="ele_content">
+ <div class="siderbar-tools">
+ <div class="siderbar-tools-right">
+ <i class="fa fa-file-text-o" title="鏈哄巻鍗�" id="siderbarToolsCard"></i>
+ <i class="fa fa-search" title="鏌ヨ鏈烘埧" id="siderbarToolsSearch"></i>
+ <i class="fa fa-outdent" title="鍏ㄩ儴鏀剁缉" id="siderbarToolsHide"></i>
+ </div>
+ </div>
<!--鐢垫睜缁勮彍鍗曟爮-->
<div id="lside">
@@ -220,12 +235,22 @@
<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>
+ </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>
+ </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>
@@ -268,7 +293,13 @@
<!-- 鐢垫睜缁勬満鍘嗗崱璇︾粏淇℃伅-->
<div id="card_infor">
<span class="title-log"><s:text name="The_battery_pack_machine_through_the_card"/></span> <!-- 鐢垫睜缁勬満鍘嗗崱 -->
- <div class="con-list ele-infor con-show">
+ <div id="cardInfoTab" class="whyc-tab-card">
+ <ul class="whyc-tab-title">
+ <li class="whyc-tab-this">鐢垫睜缁勪俊鎭�</li>
+ <li class="">鍩虹珯淇℃伅</li>
+ </ul>
+ </div>
+ <div class="con-list ele-infor con-show" style="height: 400px;overflow-y: auto">
<table>
<tr>
<th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
@@ -345,6 +376,166 @@
<tr>
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
+ </tr>
+ </table>
+ </div>
+ <div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
+ <table>
+ <tr>
+ <th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
+ <th><s:text name="Parameter_value"/></th> <!-- 鍙傛暟鍊� -->
+ </tr>
+ <tr>
+ <td>绔欑偣ID</td>
+ <td id="station_stationid_ex"></td>
+ </tr>
+ <tr>
+ <td>绔欑偣鍚嶇О</td>
+ <td id="station_stationname"></td>
+ </tr>
+ <tr>
+ <td>鏈烘埧ID</td>
+ <td id="station_stationid"></td>
+ </tr>
+ <tr>
+ <td>鎵�灞炵粍缁�</td>
+ <td id="station_affiliation"></td>
+ </tr>
+ <tr>
+ <td>鏁版嵁鏉ユ簮</td>
+ <td id="station_dataSources"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃绫诲瀷</td>
+ <td id="station_stationType"></td>
+ </tr>
+ <tr>
+ <td>缁忕含搴�</td>
+ <td id="station_jinweidu"></td>
+ </tr>
+ <tr>
+ <td>鎵�鍦ㄥ湴鍧�</td>
+ <td id="station_stationAddr"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鐘舵��</td>
+ <td id="station_stationstate"></td>
+ </tr>
+ <tr>
+ <td>缁存姢鍗曚綅</td>
+ <td id="station_maintenanceCompany"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍦烘櫙</td>
+ <td id="station_stationscenario"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃浜ф潈</td>
+ <td id="station_stationproperty"></td>
+ </tr>
+ <tr>
+ <td>浣跨敤鍗曚綅</td>
+ <td id="station_useUnit"></td>
+ </tr>
+ <tr>
+ <td>鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_siteCode"></td>
+ </tr>
+ <tr>
+ <td>鍘嗗彶鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_historySiteCode"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍐呴儴缂栧彿</td>
+ <td id="station_siteInternalNumber"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎷奸煶绠�绉�</td>
+ <td id="station_sitePinyinReferred"></td>
+ </tr>
+ <tr>
+ <td>涓枃绠�绉�</td>
+ <td id="station_siteChineseReferred"></td>
+ </tr>
+ <tr>
+ <td>鏄惁寮�閫氫笟鍔�</td>
+ <td id="station_isOpenBusiness"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆浜哄憳</td>
+ <td id="station_schoolPersonnel"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆鏃堕棿</td>
+ <td id="station_entryTime"></td>
+ </tr>
+ <tr>
+ <td>淇敼浜�</td>
+ <td id="station_modifyPeople"></td>
+ </tr>
+ <tr>
+ <td>淇敼鏃堕棿</td>
+ <td id="station_modifyTime"></td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td id="station_note"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎺ユ敹鏍囪鍙婃槸鍚︽湁鏁�</td>
+ <td id="station_receiveorvalidity"></td>
+ </tr>
+ <tr>
+ <td>绉诲姩绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCMCC"></td>
+ </tr>
+ <tr>
+ <td>鐢典俊绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCTC"></td>
+ </tr>
+ <tr>
+ <td>鑱旈�氱珯鍧�鍚嶇О</td>
+ <td id="station_siteNameCUCC"></td>
+ </tr>
+ <tr>
+ <td>鍝佺墝</td>
+ <td id="station_producer"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻鏃堕暱</td>
+ <td id="station_lastTimeLong"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻绫诲埆</td>
+ <td id="station_lastTimeType"></td>
+ </tr>
+ <tr>
+ <td>缁埅鍙戠敓鏃堕棿</td>
+ <td id="station_lastTimeDate"></td>
+ </tr>
+ <tr>
+ <td>鍏变韩鎯呭喌</td>
+ <td id="station_shareInfo"></td>
+ </tr>
+ <tr>
+ <td>杩愯惀鍟嗚喘涔板彂鐢垫湇鍔＄姸鍐�</td>
+ <td id="station_electPower"></td>
+ </tr>
+ <tr>
+ <td>鏄惁鍏峰鍙戠數鏉′欢</td>
+ <td id="station_isCanElectPower"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯璺▼</td>
+ <td id="station_upperStationRoute"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯闅炬槗绋嬪害</td>
+ <td id="station_upperStationDifficult"></td>
+ </tr>
+ <tr>
+ <td>瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�</td>
+ <td id="station_clienteleErrorService"></td>
</tr>
</table>
</div>
@@ -764,6 +955,95 @@
</div>
</div>
+ <!-- 绯荤粺鍙傛暟璁剧疆 -->
+ <div class="popup" id="sysSet_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="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>
+ <th>璁惧ID</th>
+ <th>璁惧鍚嶇О</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="sysSet_dev_id" readonly="readonly" value=""></td>
+ <td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
+ </tr>
+ <tr>
+ <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>鐢垫祦閽抽噺绋嬶紙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>浜屾涓嬬數鐢靛帇锛�35.0~65.0V锛�</th>
+ <th>DCDC妯″潡鏁伴噺锛�1~10锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="sysSet_secVol" value=""></td>
+ <td><input type="text" id="sysSet_dcdc" value=""></td>
+ </tr>
+ <tr>
+ <th>鍗曚綋鏁版嵁鏉ユ簮绫诲瀷</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�0~2锛�</th>
+ </tr>
+ <tr>
+ <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>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄愶紙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>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙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>
+ </div>
+ </div>
+ <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="璁剧疆" >
+ </div>
+ </div>
+
<!-- 鍗曚綋鏇茬嚎 -->
<div class="popup w960 mr480x" id="monLineGraphPopup">
<div id="control_popupTools">
@@ -802,6 +1082,32 @@
</div>
</div>
+ <!-- 瀵艰埅瀹氫綅 -->
+ <div class="popup w500 mr250" id="localNav">
+ <div class="popup-title"><span>鏈烘埧鏌ヨ</span><a href="javascript:;" class="close">X</a></div>
+ <div class="popup-content">
+ <div class="popup-tbl">
+ <table>
+ <tbody>
+ <tr>
+ <th>鏈烘埧鍚嶇О/鏈烘埧id</th>
+ </tr>
+ <tr>
+ <td>
+ <input name="popupHomeName" id="popupHomeName" type="text">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="popup-footer">
+ <input type="button" name="" id="localNav_en" class="status-change-btn" value="纭畾" > <!-- 纭畾 -->
+ <input type="button" name="" class="close" value="鍙栨秷" > <!-- 鍙栨秷 -->
+ </div>
+ </div>
+
<!-- 鏈�澶у唴闃诲崟浣� -->
<div class="confirm">
<div class="confirm-header"><span>鏈�澶у唴闃诲崟浣擄紙鍓�10锛�</span><a href="javascript:closeConfirm();" class="close">X</a></div>
@@ -815,11 +1121,17 @@
</div>
</div>
</div>
-
+ <!-- 鍘婚櫎鑷姩濉厖 -->
+ <div style="position: absolute; top: -1000px; left: 0;">
+ <input type="text" id="user" name="user" value="" placeholder="璇疯緭鍏ョ敤鎴峰悕">
+ <input type="password" id="password" value="" name="password" placeholder="璇疯緭鍏ュ瘑鐮�">
+ </div>
<div id="myConfirm" class="myconfirm"></div>
<!-- 鏁翠綋鐨勯伄缃╁眰 -->
<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>
@@ -830,11 +1142,13 @@
<script type="text/javascript" src="js/mypattern.js"></script>
<script type="text/javascript" src="js/whyc-jqueryui.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>
+ <script type="text/javascript" src="js/MD5.js"></script>
<script type="text/javascript" src="js/dischargetest/LD9.js"></script>
<script type="text/javascript" src="js/dischargetest/61850.js"></script>
<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>
<!-- 寮曞叆鐢佃矾鍥� -->
@@ -848,7 +1162,6 @@
permits=<%=permits%>;
//console.info(json);
<% } %>
-
//鎷撴墤鍥剧姸鎬佸璞�
var mygraph = {
battstate:0,
@@ -900,11 +1213,25 @@
myChart=echarts.init(oConEcharts);
myChart.showLoading();
+ // 璁剧疆椤甸潰鏉冮檺妯″潡
+ $(function() {
+ var testOp = checkUserPermit(permits, 'batt_test_op_permit');
+ console.log(testOp);
+ if(!testOp) {
+ $(".ele-circle .tools-btn").remove();
+ }
+
+ });
+
+
+
// 璁剧疆闈㈡澘
var LD9_popup = new Popup($('#LD9_popup'));
var equip61850_popup = new Popup($('#equip61850'));
var BTS_popup = new Popup($('#bts'));
var equip4016_popup = new Popup($('#equip4016'));
+ var sysSet_popup = new Popup($('#sysSet_popup'));
+ var localNav = new Popup($('#localNav'));
// 鍏呮斁鐢靛脊鍑烘璁剧疆
$(function() {
// 鍒濆鍖朙D9鍏呮斁鐢靛脊鍑烘
@@ -927,12 +1254,25 @@
equip4016_popup.hidePopup(); // 闅愯棌61850寮瑰嚭妗嗗拰閬僵灞�
});
+ // 鍒濆鍖杔ocalNav寮瑰嚭妗�
+ $('#localNav').find('.close').bind('click', function() {
+ localNav.hidePopup(); // 闅愯棌localNav寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+ // 璁剧疆绯荤粺鍙傛暟
+ $('#sysSet_popup').find('.close').bind('click', function() {
+ sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+
// 绐楀彛澶у皬鏀瑰彉
$(window).resize(function() {
LD9_popup.hidePopup(); // 闅愯棌LD9寮瑰嚭妗嗗拰閬僵灞�
equip61850_popup.hidePopup(); // 闅愯棌61850寮瑰嚭妗嗗拰閬僵灞�
BTS_popup.hidePopup(); // 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
equip4016_popup.hidePopup(); // 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
+ localNav.hidePopup();
+ sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
});
});
//鍒濆鍖栨煴鐘跺浘
@@ -1425,7 +1765,7 @@
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
function searchDevStatusByDev_id(){
var obj = getBatt();
- console.info(obj);
+ //console.info(obj);
var lasttype = mygraph.graphtype; //璁板綍涓婁竴娆＄殑鐘舵��
$.ajax({
type: "post",
@@ -1438,7 +1778,8 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- console.log(model);
+ //console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
@@ -1451,9 +1792,17 @@
}else {
_str = GLOBAL.circleStatus.BTSCircle(batt, model, mygraph, updateEleCircle);
}
- console.log(mygraph);
- debugger;
+ //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();
@@ -2128,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() {
@@ -2684,8 +3037,10 @@
var batt = getBatt();
var province = batt.StationName1;
var city = batt.StationName2;
+ var county = batt.StationName5;
var home = batt.StationName;
- $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&home='+home);
+ var homeid = batt.BattGroupId;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
});
});
@@ -2720,6 +3075,7 @@
val:_data.BattGroupId,
province: _data.stationName1,
city: _data.stationName2,
+ county: _data.stationName5,
home: _data.stationName,
isCharge:0
});
@@ -2729,6 +3085,7 @@
val: _data.BattGroupId,
province: _data.stationName1,
city: _data.stationName2,
+ county: _data.stationName5,
home: _data.stationName,
isCharge:1
});
@@ -2781,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(){
@@ -3663,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);
});
// 鐐瑰嚮閫夐」鍗℃洿鏂板浘琛�
@@ -3884,6 +4247,14 @@
$('.confirm-mask').hide();
}
+ // 鏈烘埧瀹氫綅闈㈡澘鏁版嵁鏌ヨ
+ $(function() {
+
+
+ });
+
+
+
// siderbar妯″潡
$(function() {
var TreeView = GLOBAL.pages.TreeView;
@@ -3891,6 +4262,7 @@
var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var fifth = GLOBAL.pages.siderbar.fifth; // 浜旂骇瀵艰埅
var localSideBar = GLOBAL.pages.siderbar.localSideBar; // 瀹氫綅鏈烘埧
var treeView = new TreeView($('#lside'));
$('#lside').width($('#ele_content').width());
@@ -3915,10 +4287,16 @@
second(treeView, $(this).parent(), province);
});
- // 甯�->鏈烘埧
+ // 甯�->鍘�
treeView.ele.on('click', '.city', function() {
var city = $(this).data('attr');
third(treeView, $(this).parent(), city);
+ });
+
+ // 鍘�->鏈烘埧
+ treeView.ele.on('click', '.county', function() {
+ var county = $(this).data('attr');
+ fourth(treeView, $(this).parent(), county);
});
battinlist = [];
@@ -3928,10 +4306,11 @@
var tmp = {
StationName1: home.StationName1,
StationName2: home.StationName2,
+ StationName5: home.StationName5,
StationName: home.StationName,
StationId: home.StationId
};
- fourth(treeView, $(this).parent(), tmp);
+ fifth(treeView, $(this).parent(), tmp);
});
// 鐢垫睜缁�
@@ -3962,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});
@@ -3985,7 +4364,7 @@
var disX=(e||event).clientX+10; //寰楀埌榧犳爣鐐瑰嚮X鐨勪綅缃�
var disY=(e||event).clientY+10; //寰楀埌榧犳爣鐐瑰嚮Y鐨勪綅缃�
var scrollY=$(window).scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
- console.log(scrollY);
+ //console.log(scrollY);
var oRightMenu=document.getElementById("right_menu");
$(this).click();
@@ -3994,7 +4373,7 @@
$("#right_menu").show();
$("#right_menu .more_menu").hide();
$("#right_menu .angle").hide();
- console.log(disX+"***"+disY);
+ //console.log(disX+"***"+disY);
//浣胯彍鍗曡窡闅忛紶鏍囦綅缃�
oRightMenu.style.left= disX+'px';
oRightMenu.style.top= disY+scrollY+'px';
@@ -4009,6 +4388,49 @@
treeView.ele.find('li').removeClass('sider-menu-open');
});
+ // 宸ュ叿鏉℃暣浣撴牱寮�
+ $('.siderbar-tools').tooltip();
+
+ // 宸ュ叿鏉�-鏈哄巻鍗�
+ $('#siderbarToolsCard').click(function(){
+ var batt = getBatt();
+ var tmp = {
+ province: batt.StationName1,
+ city: batt.StationName2,
+ county: batt.StationName5,
+ home: batt.StationName,
+ homeid: batt.StationId,
+ battid: batt.BattGroupId
+ };
+ findBattinfByBattGroupId(batt.BattGroupId);
+ findStationInfoByStation(batt);
+ // 鏍规嵁鏁版嵁瀹氫綅
+ localSideBar(treeView, treeView.container, tmp);
+ });
+
+ // 宸ュ叿鏉�-鍏ㄩ儴鏀剁缉
+ $('#siderbarToolsHide').click(function(){
+ treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 宸ュ叿鏉�-鏌ヨ
+ $('#siderbarToolsSearch').click(function(){
+ localNav.homeInfo = undefined;
+ $('#popupHomeName').val('');
+ localNav.showPopup();
+ });
+
+ // 鐐瑰嚮闈㈡澘鐨勭‘瀹氭寜閽�
+ $('#localNav_en').click(function() {
+ // 瀹氫綅
+ if(localNav.homeInfo) {
+ localNav.hidePopup();
+ localSideBar(treeView, treeView.container, localNav.homeInfo);
+ }else {
+
+ }
+ });
+
// 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
var batt_list = $('#ele_content .batt-listen .batt-list');
batt_list.on('click', 'a', function(){
@@ -4019,14 +4441,405 @@
var tmp = {
province: battInfo.province,
city: battInfo.city,
+ county: battInfo.county,
home: battInfo.home,
homeid: battInfo.note,
battid: battInfo.val
- }
-
+ };
+ //console.log(tmp);
localSideBar(treeView, treeView.container, tmp);
});
+
+ // 鏌ヨ鏈烘埧骞舵洿鏂皊ource
+ var homeSource = [];
+ findHome();
+
+ // 瀹氫箟鏈烘埧鏌ヨ淇℃伅
+ $( "#popupHomeName" ).autocomplete({
+ source: homeSource,
+ select: function(event, ui) {
+ localNav.homeInfo = ui.item; // 璁剧疆鏈烘埧淇℃伅鍐呭
+ }
+ });
+
+ // 鏌ヨ鏈烘埧
+ function findHome() {
+ var tmp = {
+ StationName1:'',
+ StationName2: '',
+ StationName5:''
+ };
+
+ // 鏌ヨ灏嗕俊鎭�
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
+ var rs = JSON.parse(result.result);
+ if(rs.code==1){
+ homeSource = [];
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {
+ label: _data.StationName+'('+_data.StationId+')',
+ province: _data.StationName1,
+ city: _data.StationName2,
+ county: _data.StationName5,
+ home: _data.StationName,
+ homeid: _data.StationId,
+ battid: undefined
+ };
+
+ // 娣诲姞鍒拌祫婧�
+ homeSource.push(tmp);
+ }
+ $( "#popupHomeName" ).autocomplete('option', 'source', homeSource);
+ }
+ });
+ }
+
});
+
+ // 绯荤粺鍙傛暟璁剧疆
+ $(function() {
+ var sysCMD = GLOBAL.CMD.sys;
+
+ // 鐐瑰嚮璇诲彇
+ $('#sysSet_read').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id:batt.FBSDeviceId
+ };
+ searchSysData(temp, true);
+ });
+
+ // 鐐瑰嚮璁剧疆绯荤粺鍙傛暟
+ $('#sysSet').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id:batt.FBSDeviceId
+ };
+ searchSysData(temp);
+ });
+
+ // 璁剧疆
+ $('#sysSet_en').click(function() {
+ // 鍒ゆ柇褰撳墠鎸夐挳鏄惁鍙互鐐瑰嚮
+ if($(this).hasClass('whyc-btn-disabled')) {
+ return;
+ }
+ var tmp = getSysSetData();
+ updateSysData(tmp);
+ });
+
+ // 閲嶅惎璁惧
+ var resetPwd = '42ddc6374290e76908c1a0ba5f4caa19';
+ $("#sysSet_restart").click(function() {
+ layer.prompt({title: '杈撳叆閲嶅惎鍙ｄ护', formType: 1}, function(pass, index){
+ var _pass = hex_md5(pass);
+ if(_pass == resetPwd) {
+ // 鍏抽棴鍙ｄ护闈㈡澘
+ layer.close(index);
+ // 鏋勯�犻噸鍚懡鍚�
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId,
+ cmd: sysCMD.restart
+ };
+
+ /* console.log(temp);
+ layer.msg('鍔熻兘寮�鍙戜腑...');
+ return; */
+ // 閲嶅惎
+ restartSys(temp);
+ }else {
+ layer.msg('鍙ｄ护杈撳叆閿欒');
+ }
+ });
+ });
+
+
+ // 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
+ function searchSysData(temp, showSU) {
+ // 寮�鍚瓑寰呮
+ var load = layer.load(1);
+ // 璁剧疆鎸夐挳鏃犳硶鍙偣.whyc-btn-disabled
+ $('#sysSet_en').addClass('whyc-btn-disabled');
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_sysparamAction_action_serchByCondition",
+ 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 data = rs.data[0];
+ setSysSetData(data);
+ // 绉婚櫎涓嶅彲鐐瑰嚮鐘舵��
+ initSysDataPopup();
+ $('#sysSet_en').removeClass('whyc-btn-disabled');
+ sysSet_popup.showPopup();
+ if(showSU) {
+ noContent.showNoContent('璇诲彇鎴愬姛', true);
+ }
+ }else{
+ noContent.showNoContent('鏌ヨ澶辫触!');
+ }
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ },
+ error: function() {
+ noContent.showNoContent('鏌ヨ澶辫触!');
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ }
+ });
+ }
+
+ // 鏇存柊绯荤粺鍙傛暟
+ function updateSysData(temp) {
+ // 寮�鍚瓑寰呮
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_sysparamAction_action_update",
+ 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){
+ noContent.showNoContent('鏇存柊鎴愬姛', true);
+ }else{
+ noContent.showNoContent('鏇存柊澶辫触!');
+ }
+
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ },
+ error: function() {
+ noContent.showNoContent('鏇存柊澶辫触!');
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ }
+ });
+ }
+
+ // 閲嶅惎璁惧
+ function restartSys(temp) {
+ // 寮�鍚瓑寰呮
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_sysparamAction_action_update",
+ 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){
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゆ垚鍔�', true);
+ }else{
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゅけ璐�!');
+ }
+
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ },
+ error: function() {
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゅけ璐�!');
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ }
+ });
+
+ }
+
+
+
+ // 鏍规嵁鏁版嵁璁剧疆闈㈡澘淇℃伅
+ function setSysSetData(data) {
+ $('#sysSet_dev_id').val(data.dev_id); // 璁惧ID
+ $('#sysSet_stationName').val(data.stationName); // 璁惧鍚嶇О
+ $('#sysSet_ip').val(data.IPADDR); // ip鍦板潃
+ $('#sysSet_subnet').val(data.SubIPADDR); // 瀛愮綉鎺╃爜
+ $('#sysSet_netgate').val(data.NetGateADDR); // 缃戝叧
+ $('#sysSet_mac').val(data.MACADDR); // mac鍦板潃
+ $('#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_dcdc').val(data.LoaderCount); // DCDC妯″潡鏁伴噺
+ $('#sysSet_sourceStyle').val(data.DtCardCount); // 鍗曚綋鏁版嵁鏉ユ簮绫诲瀷
+ $('#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_powerBreakChargeCurr').val(data.PowerBreakChargeCurr); // 鍋滅數鍏呯數鐢垫祦
+ }
+
+ // 鑾峰彇闈㈡澘淇℃伅鐨勫��
+ function getSysSetData() {
+ var dev_id = $('#sysSet_dev_id').val(); // 鏈烘埧id
+ //var stationName = $('#sysSet_stationName').val(); // 鏈烘埧鍚嶇О
+ var ip = $('#sysSet_ip').val(); // ip鍦板潃
+ var subnet = $('#sysSet_subnet').val(); // 瀛愮綉鎺╃爜
+ var netgate = $('#sysSet_netgate').val(); // 缃戝叧
+ var mac = $('#sysSet_mac').val(); // mac鍦板潃
+ var endur = $('#sysSet_endur').val(); // 鎬荤画鑸椂闂�
+ var firTime = $('#sysSet_firTime').val(); // 淇濅竴娆′笅鐢电画鑸椂闂�
+ var range = $('#sysSet_range').val(); // 鐢垫祦閽抽噺绋�
+ var firVol = $('#sysSet_firVol').val(); // 涓�娆′笅鐢电數鍘�
+ var secVol = $('#sysSet_secVol').val(); // 浜屾涓嬬數鐢靛帇
+ var dcdc = $('#sysSet_dcdc').val(); // DCDC妯″潡鏁伴噺
+ var sourceStyle = $('#sysSet_sourceStyle').val(); // 鍗曚綋鏁版嵁鏉ユ簮绫诲瀷
+ var bleedNum = $('#sysSet_bleedNum').val(); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
+ var stopLimit = $('#sysSet_stopLimit').val(); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�
+ 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,
+ IPADDR: ip,
+ SubIPADDR: subnet,
+ NetGateADDR: netgate,
+ MACADDR: mac,
+ GroupVolRange: endur,
+ GroupVolSorce: firTime,
+ CurrentRange: range,
+ CurrentTyte: firVol,
+ MonomerOrder: secVol,
+ LoaderCount: dcdc,
+ DtCardCount: sourceStyle,
+ 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;
+ }
+ });
+
+ // 鏈哄巻鍗℃ā鍧�
+ $(function() {
+ // 鑾峰彇閫夐」鍗″垪琛�
+ var tabs = $('#cardInfoTab .whyc-tab-title li');
+ var tabContents = $('#card_infor .con-list');
+ // 鐐瑰嚮tabs瑙﹀彂
+ tabs.click(function() {
+ var index = $(this).index();
+ // 绉婚櫎鐗规晥
+ tabs.removeClass('whyc-tab-this');
+ tabContents.removeClass('con-show');
+
+ // 鏄剧ず鐗规晥
+ $(this).addClass('whyc-tab-this');
+ 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