From 0188e55fa87458ae8ceef837f4052d1ecec15b7e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 17:38:56 +0800
Subject: [PATCH] xiu
---
gx_tieta/WebRoot/batch-set-curr.jsp | 131 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 121 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index aecdb7c..582651d 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -117,8 +117,8 @@
<div class="layui-form-item">
<div class="layui-input-block">
<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
- <option value="12">1U璁惧</option>
- <option value="2">2U璁惧</option>
+ <option value="12">12V璁惧</option>
+ <option value="2">2V璁惧</option>
</select>
</div>
</div>
@@ -565,6 +565,7 @@
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
+
$('#batchAdd').click(function() {
var structData = structAddData();
// 鍒ゆ柇鏄惁閫夋嫨瑕佹坊鍔犵殑鍐呭
@@ -578,7 +579,8 @@
});
-
+ // 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
+ var addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勮澶�
function searchChargeDev(callback, cParam, isCallback) {
var rq = structAddData(); // 鑾峰彇鏌ヨ鏉′欢
@@ -589,6 +591,8 @@
devType = preDevType;
// 璁惧绫诲瀷鐨勬潯浠舵敼鍙樻竻绌鸿〃鏍�
tOptions.data = [];
+ // 娓呯┖瀛楃涓�
+ addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勫唴瀹�
$.ajax({
type: 'post'
@@ -668,12 +672,21 @@
if(rs.code == 1) {
data = getFilterData(rs.data, tOptions.data);
}
+
+ // 濡傛灉鏈夋坊鍔犵殑鏁版嵁
+ if(data.length !=0) {
+ if(addBattStr.length == 0) { // 瀛楃涓查暱搴︿负0
+ addBattStr += getFilterStr(temp);
+ }else {
+ addBattStr += ','+getFilterStr(temp);
+ }
+ }
// 灏嗘暟鎹坊鍔犲埌琛ㄦ牸涓�
for(var i=0; i<data.length; i++) {
var _data = data[i];
tOptions.data.push(_data);
}
- // console.log(tOptions.data);
+ //console.log(tOptions.data);
// 鐢熸垚琛ㄦ牸鏁版嵁
if(data.length != 0) {
table.render(tOptions);
@@ -790,14 +803,14 @@
// 璇锋眰璁剧疆鍙傛暟
function ajaxSetParam(param) {
- console.log(param);
+ //console.log(param);
var load = layer.load(1);
// 璇锋眰鍚庡彴
$.ajax({
type: 'post'
,async: true
,url: 'Fbs9100_setparamAction_action_updatePro'
- ,data: 'json='+JSON.stringify(param)
+ ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr // 娣诲姞鎿嶄綔璁板綍
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
@@ -813,9 +826,11 @@
}
var trIndex = getSetCurrIndex(data, tOptions.data);
+ //console.log(trIndex);
// 琚缃弬鏁扮殑鏈烘埧
for(var i=0; i<trIndex.length; i++) {
var _data = data[i];
+ console.log(_data);
var _trIndex = trIndex[i];
var _temp = {'doThings':''};
if(_data.num==1) {
@@ -982,7 +997,7 @@
layer.msg('鏆傛棤鏃犳硶鍚姩,璇峰厛璁剧疆鏀剧數鍙傛暟!');
return;
}
-
+ $('#setCurrIframe').data('addBattStr', addBattStr);
// 鏄剧ず闈㈡澘
layer.open({
type: 2
@@ -1059,12 +1074,14 @@
for(var i=0; i<setData.length; i++) {
var _setData = setData[i];
var setDevId = _setData.dev_id;
+ //console.log(setDevId);
// 閬嶅巻allData
for(var k=0; k<allData.length; k++) {
- var _allData = allData[i];
+ var _allData = allData[k];
var allDevId = _allData.FBSDeviceId;
if(setDevId == allDevId) {
rs.push(k);
+ break;
}
}
@@ -1077,8 +1094,10 @@
var BTS9100 = GLOBAL.BTS9100;
var workStates = BTS9100.workstates;
var alarmStates = BTS9100.alarmstates;
- function updateDevStatus() {
+ function updateDevStatus1() {
var battlist = tOptions.data;
+ var battIdList = updateDevStatusRq();
+ console.log(battIdList);
clearInterval(updateDevStatus.timer);
if(battlist.length > 0){
$.ajax({
@@ -1128,7 +1147,99 @@
},
});
}
- }
+ }
+
+
+ // 鑾峰彇璁惧瀹炴椂鐘舵�佺殑鍙傛暟
+ function updateDevStatus() {
+ var battIdList = updateDevStatusRq(); // 鑾峰彇鐢垫睜id鍒楄〃
+ // 鍒ゆ柇濡傛灉battIdList闀垮害涓�0涓嶆墽琛岃姹傚悗鍙�
+ if(battIdList.length == 0) {
+ return;
+ }
+ clearInterval(updateDevStatus.timer);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: 'post'
+ ,async:true
+ ,url: 'Fbs9100_stateAction_action_freshenDischarge'
+ ,data: 'json='+JSON.stringify(battIdList)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ //console.log(rs);
+ // 濡傛灉鏈夋煡璇㈢粨鏋�
+ if(rs.code == 1) {
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ _data = _data[0];
+ var str = ''; // 璁惧宸ヤ綔鐘舵��
+ var index = _data.dev_workstate; // 璁惧鐘舵��
+
+ // 鍐呴樆娴嬭瘯(宸ヤ綔鐘舵�佷负0, 鍐呴樆娴嬭瘯涓嶄负0)
+ if(_data.dev_workstate ==0 && _data.dev_res_test_state != 0) {
+ index = 3;
+ }
+ // 璁剧疆璁惧鐘舵�佸瓧绗︿覆
+ str = "鐘舵��:" + workStates[index]+
+ ",鍛婅:"+alarmStates[_data.dev_alarmstate]+
+ ",缁勭鐢靛帇(V):"+_data.dev_captest_groupvol+
+ ",鐢垫祦(A):"+_data.dev_captest_curr+
+ ",瀹归噺(AH):"+_data.dev_captest_cap;
+ // 璁剧疆璁惧鍐呴樆娴嬭瘯鐨勫瓧绗︿覆
+ if(index == 3){
+ str = "鐘舵��:"+workStates[index]+
+ ",缁勫彿:"+_data.dev_testgroupnum+
+ ",褰撳墠鍗曚綋缂栧彿:"+(_data.dev_restest_monindex+1)+
+ ",琚祴鍗曚綋鎬绘暟:"+_data.dev_restest_moncount;
+ }
+ // 鏋勯�犳洿鏂拌〃鏍兼暟鎹璞�
+ var temp = {
+ devStatus: str // 璁惧鐘舵��
+ ,testTime: formatSeconds(_data.dev_captest_timelong) // 娴嬭瘯鏃堕暱
+ ,signalNum: _data.dev_commcount
+ }
+
+ // 鏇存柊琛ㄦ牸
+ layuiTbl.updateTr(i, temp);
+ }
+ }
+ }
+ ,complete: function() {
+ // 杞鏌ョ湅鍐呭
+ updateDevStatus.timer = setTimeout(updateDevStatus, 4000);
+ }
+ });
+
+
+ }
+
+ // 鏋勯�犳煡璇㈣澶囧疄鏃剁姸鎬佺殑鍙傛暟
+ function updateDevStatusRq() {
+ var data = tOptions.data;
+ var rs = [];
+ // 閬嶅巻data鐨勫�兼瀯閫犲璞�
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {
+ BattGroupId: _data.BattGroupId
+ };
+
+ rs.push(tmp);
+ }
+
+ return rs;
+ }
+
+ // 鑾峰彇绛涢�夋潯浠剁殑瀛楃涓�
+ function getFilterStr(data) {
+ var rsString = '';
+ rsString += data.StationName;
+ rsString += '-'+data.MonVolStd+'V璁惧';
+ rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'鐢垫睜缁�1': '鐢垫睜缁�2');
+ return rsString;
+ }
});
</script>
--
Gitblit v1.9.1