From 1dce4eec8df821d243cfcb6a056b195967c2f06a Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.14>
Date: 星期二, 11 十二月 2018 17:25:23 +0800
Subject: [PATCH] web端设备实时告警和设备历史告警页面中添加设备高温告警显示功能
---
gx_tieta/WebRoot/dischargetest.jsp | 477 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 371 insertions(+), 106 deletions(-)
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 5ec1420..492948c 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -17,6 +17,7 @@
<link rel="stylesheet" type="text/css" href="font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="font-awesome-4.7.0/css/font-awesome-animation.min.css">
<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style>
.confirm {
z-index: 999;
@@ -66,6 +67,19 @@
outline: none !important;
border: 1px solid #FF0000 !important;
}
+ .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>
<body>
@@ -84,7 +98,9 @@
<table>
<thead>
<tr>
- <th><s:text name="Maintenance_area"/><!-- 缁存姢鍖� --></th>
+ <th>鐪�</th>
+ <th>甯�</th>
+ <th>鍖�/鍘�</th>
<th><s:text name="Computer_site"/><!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� --></th>
<th><s:text name="Battery_name"/><!-- 钃勭數姹犵粍鍚嶇О --></th>
</tr>
@@ -93,6 +109,14 @@
<tr>
<td>
<select id="station_name1">
+ </select>
+ </td>
+ <td>
+ <select id="city">
+ </select>
+ </td>
+ <td>
+ <select id="county">
</select>
</td>
<td>
@@ -164,31 +188,31 @@
<th><s:text name="Discharging"/><s:text name="Hourly_rate"/><!-- 鏀剧數灏忔椂鐜� --></th>
</tr>
<tr>
- <td><input id="discurr" type="text" value="25"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
- <td><input id="hourrate" type="text" value="20"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="discurr" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="hourrate" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
</tr>
<tr>
<th><s:text name="Discharging"/><s:text name="Capacity"/><!-- 鏀剧數瀹归噺 -->锛�0~90000AH锛�</th>
<th><s:text name="Discharging"/><s:text name="Time_long"/><!-- 鏀剧數鏃堕暱 -->锛�0~5940<s:text name="Minutes"/>锛�</th>
</tr>
<tr>
- <td><input id="discap" type="text" value="250"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
- <td><input id="distime" type="text" value="600"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="discap" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="distime" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
</tr>
<tr>
<th><s:text name="Monomer"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 鍗曚綋涓嬮檺闃�鍊� -->锛�0~20V锛�</th>
<th><s:text name="Group_of_end"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 缁勭涓嬮檺闃�鍊� -->锛�0~60V锛�</th>
</tr>
<tr>
- <td><input id="MonomerVol_low" type="text" value="1.804"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
- <td><input id="GroupVol_low" type="text" value="46.0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="MonomerVol_low" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="GroupVol_low" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
</tr>
<tr>
<th><s:text name="Monomer"/><s:text name="Lower_limit"/><s:text name="Amount"/><!-- 鍗曚綋涓嬮檺鏁伴噺 --></th>
<th><s:text name="On-line_voltage"/><s:text name="Low"/><s:text name="Dispose"/><!-- 鍦ㄧ嚎鐢靛帇浣庡鐞� --></th>
</tr>
<tr>
- <td><input id="MonomerlowCount" type="text" value="1"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="MonomerlowCount" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
<td>
<select id="OnlineVolLowAction">
<option value="0"><s:text name="Stop"/><s:text name="Test"/><!-- 鍋滄娴嬭瘯 --></option>
@@ -198,7 +222,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>
@@ -528,6 +552,7 @@
<script type="text/javascript" src="js/elecircle.content.js"></script>
<script type="text/javascript" src="js/mypattern.js"></script>
<script type="text/javascript" src="js/whyc-jqueryui.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var arrTh = new Array();
var arrTd = new Array();
@@ -720,46 +745,160 @@
}; // 鍏呯數鐢垫祦
$('.popup.fbs9100 .popup-tbl td i').removeClass('error-data');
+ $('.popup.fbs9100 .popup-tbl input[type=text]').removeClass('error-data');
}
});
})(jQuery);
// 鏇存敼鏀剧數闈㈡澘鐨勫�煎悗
$(function() {
- $('.popup.fbs9100 .popup-tbl td i').tooltip();
- // 鐩戞祴闈㈡澘涓殑input鏀瑰彉瑙﹀彂$.checkTestInfor()浜嬩欢
- $('.popup.fbs9100 .popup-tbl').on('input propertychange', 'input', function() {
+ // 鏀剧數鐢垫祦
+ $('#discurr').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: true,
+ min: 0,
+ max: 1000,
+ msg: '鍙栧�艰寖鍥�0~1000A'
+ });
+
+ // 鏀剧數灏忔椂鐜�
+ $('#hourrate').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 鏀剧數鐢靛
+ $('#discap').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: true,
+ min: 0,
+ max: 90000,
+ msg: '鍙栧�艰寖鍥�0~90000AH'
+ });
+
+ // 鏀剧數鏃堕暱
+ $('#distime').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: true,
+ min: 0,
+ max: 5940,
+ msg: '鍙栧�艰寖鍥�0~5940鍒嗛挓'
+ });
+
+ // 鍗曚綋涓嬮檺闃�鍊�
+ $('#MonomerVol_low').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: true,
+ min: 0,
+ max: 20,
+ msg: '鍙栧�艰寖鍥�0~20V'
+ });
+
+ // 缁勭涓嬮檺闃�鍊糋roupVol_low
+ $('#GroupVol_low').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: true,
+ min: 0,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0~60V'
+ });
+
+ // 鍗曚綋涓嬮檺鏁伴噺
+ $('#MonomerlowCount').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 鍗囧帇涓婇檺
+ $('#MonomerlowCount').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 鍏呯數鐢垫祦
+ $('#ChargeCurrSet').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 娓╁害涓婇檺
+ $('#TempUpHighLimit').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+
+ // bts闈㈡澘鍏呯數鐢垫祦缂栬緫
+ $('#ChargeCurrSetLabel .fa-edit').click(function() {
+ var battGroupId = $('#battgroupname').find('option:selected').attr('battgroupid');
+ //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: 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('璁剧疆澶辫触!璇烽噸鏂拌缃�');
+ }
+ }
+
+ });
+ }
+ });
+ });
+
+ $('.popup.fbs9100').on('input propertychange', 'input[type=text]', function() {
$.checkTestInfor();
- var bool = $.regPositiveNum($(this).val());
- if(bool) {
- // 璇诲彇鏀剧數鍙傛暟鎴愬姛鎵ц
- if($.disTestInfor.success) {
- paramsBtn.ensure(true);
- }
- $(this).next('i').removeClass('error-data');
- $(this).myTooltip('hide');
- }else {
- paramsBtn.ensure(false);
- //var errorImg = $('<i class="fa fa-frown-o error-img"></i>');
- $(this).next('i').addClass('error-data');
- $(this).myTooltip({
- position: 'top',
- thing: 'show',
- content: '<span style="color:#FF0000">鏁版嵁鏍煎紡閿欒(璇疯緭鍏ユ鏁�)</span>'
- });
- }
- });
-
- // 褰撴枃鏈鑾峰彇鐒︾偣鏃�
- $('.popup.fbs9100 .popup-tbl').on('focus', 'input', function() {
- if($(this).next('i').hasClass('error-data')) {
- $(this).myTooltip('show');
- }
- });
-
- // 鏂囨湰妗嗗け鍘荤劍鐐�
- $('.popup.fbs9100 .popup-tbl').on('blur', 'input', function() {
- $(this).myTooltip('hide');
});
$('.popup.fbs9100').on('change', 'select', function() {
@@ -1116,69 +1255,180 @@
$('#DCVolHighLimit').val(list[i].fsparam.DCVolHighLimit);
$('#ChargeCurrSet').val(list[i].fsparam.ChargeCurrSet);
$('#TempUpHighLimit').val(list[i].fsparam.MonomerTmp_High);
+
+ // 鍏呯數鐢垫祦
+ $('#ChargeCurrSet').testVal('option', 'allOpts', {
+ regVal: true,
+ min: 0,
+ max: list[0].binf.charge_curr_max,
+ msg: '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A'
+ });
+
+ // 璁剧疆鏂囨湰鍊�
+ $('#ChargeCurrSetLabel .val-range').text('0~'+list[0].binf.charge_curr_max);
}
}
}
}
-
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
+ $.post("BattInfAction!serchAllStation",null,function(data){
data=data.result;
data=eval("("+data+")");
- //console.info(data);
if(data.code==1 && data.data.length>0){
var $select = $("#station_name1");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = data.data[i];
+ var tmp = getOptionsData(_data.StationName1, _data.StationName1, _data);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
$("#station_name1").text('').html('<option>鏆傛棤鍙祴缁存姢鍖�</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity(isLoad) {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ // 鏌ヨ鍖�/鍘�
+ findCounty();
+ }
+ });
+ }
+
+
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findStationNamebyStationname1();
+ findCity(true);
});
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ //褰撳競鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
+ });
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ function findStationNamebyStationname1(isLoad){
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
@@ -1187,44 +1437,55 @@
}
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var user = {
- UNote:$("#station_name1 option:selected").val(),
- UName:$("#station_name option:selected").val()
+ function findserchByBattGroupNamebystationname(isLoad){
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
- $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+ $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
data=eval("("+data+")");
//console.info(data);
if(data.code==1 && data.data.length>0){
var $select = $("#battgroup_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- $option.attr("stationname",data.data[i-1].StationName);
- $option.attr("dev_id",data.data[i-1].FBSDeviceId);
- $option.attr("batt_num",(data.data[i-1].GroupIndexInFBSDevice+1));
- }else{
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = data.data[i];
+ var _attr = {
+ stationname: _data.StationName,
+ dev_id: _data.FBSDeviceId,
+ batt_num: _data.GroupIndexInFBSDevice+1
+ };
+ var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+ var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
// 闅愯棌琛ㄦ牸鍔熻兘鎸夐挳鍒楄〃
@@ -1369,9 +1630,9 @@
if(regEquipType(dev_id, globalPattern.LD9) || regEquipType(dev_id, globalPattern.BTS)) {
if(confirm("纭鍋滄"+dev_id+"璁惧鐨勬祴璇曞悧锛�")){
if(regEquipType(dev_id, globalPattern.LD9)){
- sendLD9DischargeParam(CMD_Stop);
+ sendLD9DischargeParam(CMD_Stop,true);
}else if(regEquipType(dev_id, globalPattern.BTS)){
- checkDischargeParam(CMD_Stop);
+ checkDischargeParam(CMD_Stop,true);
}
}
}
@@ -1434,7 +1695,8 @@
loading.showLoading();
flushDischargeParam({
num:CMD_GetDischargeParm,
- dev_id:$('#dev_id').val()
+ dev_id:$('#dev_id').val(),
+ TestCmd:0,
});
});
@@ -1537,13 +1799,16 @@
}
//鍚戝鎴风鍙戦�佹寚瀹氱殑鍛戒护
- function checkDischargeParam(cmd){
+ function checkDischargeParam(cmd,stop){
var dev_id = $('#main .tbl-body tbody tr.active').find('td').eq(2).text();
loading.showLoading($('#main'));
+ var distype = stop?0:$('#discharge_type').val();
var param = {
num:cmd,
- dev_id:dev_id
+ dev_id:dev_id,
+ TestCmd:distype
};
+
$.ajax({
type: "post",
url:"Fbs9100_setparamAction_action_serchbyDev_id",
@@ -1788,6 +2053,7 @@
updateUserDevinfo(); //璁剧疆鏀剧數鍙傛暟鎴愬姛鍚庝慨鏀圭敤鎴锋坊鍔犵殑鏀剧數璁惧淇℃伅
flushDischargeParam({
num:CMD_GetDischargeParm,
+ TestCmd:$('#discharge_type').val(),
dev_id:$('#dev_id').val()
});
paramsBtn.startTest(true);
@@ -1919,7 +2185,6 @@
var ld9alarm_arr = ['鏃�','鎵嬪姩鍋滄','鍗曚綋涓嬮檺鍒�','鍏呯數瀹屾垚鍋滄','娴嬭瘯瀹屾垚鍋滄','杩滅▼鍋滄','鍦ㄧ嚎鐢靛帇浣�', '娓╁害寮傚父楂�', '鐢垫祦寮傚父'];
function flushTable(obj){
- console.info(obj);
$('#main .tbl-body tbody tr').each(function(i){
var dev_id = $(this).find('td').eq(2).text();
if(dev_id == obj.binf.FBSDeviceId){
--
Gitblit v1.9.1