From 2b2f80d07c341860e149bc6be8127c70e4d2e15e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 10:09:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batch-set-curr.jsp | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 208 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index fe2d1bd..3f3015e 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -558,6 +558,11 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+ // 璁惧绫诲瀷
+ var devType = 0; // 1U:12 2U:2
+ // 鏌ヨ姝ｅ湪鏀剧數鐨勮澶�
+ searchChargeDev(search, {}, false);
+
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
$('#batchAdd').click(function() {
@@ -569,8 +574,82 @@
}
$('#setCurrIframe').data('setCurr', []);
// 寮瑰嚭璁剧疆閫夋嫨绛涢�夋潯浠�
- search(structData);
+ searchChargeDev(search, structData, true);
});
+
+
+
+ // 鏌ヨ姝ｅ湪鏀剧數鐨勮澶�
+ function searchChargeDev(callback, cParam, isCallback) {
+ var rq = structAddData(); // 鑾峰彇鏌ヨ鏉′欢
+ var preDevType = $('#sysType').val();
+ // 鍒ゆ柇褰撳墠璁惧鐨勭被鍨嬫槸鍚﹀拰涓婁竴娆′竴鑷�
+ if(preDevType != devType) {
+ var loading = layer.load(1);
+ devType = preDevType;
+ // 璁惧绫诲瀷鐨勬潯浠舵敼鍙樻竻绌鸿〃鏍�
+ tOptions.data = [];
+ // 鏌ヨ姝ｅ湪鏀剧數鐨勫唴瀹�
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'Fbs9100_stateAction_action_seachDischarge'
+ ,data: 'json='+JSON.stringify(rq)
+ ,dataType: 'json'
+ ,success:function(res) {
+ var rs = JSON.parse(res.result);
+ var rsData = [];
+ //console.log(rs);
+ if(rs.code == 1) {
+ data = rs.data;
+ var tmps = [];
+ for(var i=0; i<data.length; i++) {
+ var _tmp = {};
+ var _data = data[i];
+ _tmp.FBSDeviceId = _data.dev_id; // 璁惧ID
+ _tmp.StationName = _data.stationName; // 鏈烘埧鍚嶇О
+ _tmp.BattGroupId = _data.battgroupid; // 鏈烘埧ID
+ _tmp.BattGroupName = _data.note; // 鐢垫睜缁勫悕绉�
+ _tmp.StationName9 = _data.dev_version; // 璁惧鐗堟湰鍙�
+ _tmp.GroupIndexInFBSDevice = _data.dev_testgroupnum-1; // 鐢垫睜缁勭储寮�
+ _tmp.MonCount = _data.moncount; // 鍗曚綋鏁伴噺
+ _tmp.MonCapStd = _data.moncapstd; // 鏍囩О瀹归噺
+ _tmp.MonVolStd = _data.monvolstd; // 鏍囩О鐢靛帇
+ tmps.push(_tmp);
+ }
+ rsData = tmps;
+ }
+ //console.log(rsData);
+ tOptions.data = rsData;
+
+ table.render(tOptions);
+ // 鍒ゆ柇鏄惁鎵цcallback鍑芥暟
+ if(isCallback) {
+ callback(cParam);
+ }else {
+ updateDevStatus();
+ }
+ }
+ ,complete: function() {
+ layer.close(loading);
+ }
+ });
+
+ }else {
+ // 璁惧绫诲瀷鐨勬潯浠舵病鏈夊彂鐢熷彉鍖栵紝鍚戣〃鏍兼坊鍔犳暟鎹�
+ callback(cParam);
+ }
+
+ }
+
+ // 鏋勯�犳煡璇㈡鍦ㄦ斁鐢电殑璁惧鐨勬潯浠�
+ function searchChargeDevRq() {
+ var temp = {
+ MonVolStd: $('#sysType').val()
+ };
+
+ return temp;
+ }
// 鏍规嵁鏌ヨ鏉′欢鏌ヨ鍐呭
function search(temp) {
@@ -587,20 +666,50 @@
var rs = JSON.parse(res.result);
var data = [];
if(rs.code == 1) {
- data = rs.data;
- }else {
- layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+ data = getFilterData(rs.data, tOptions.data);
}
- console.log(data);
- tOptions.data = data;
+ // 灏嗘暟鎹坊鍔犲埌琛ㄦ牸涓�
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ tOptions.data.push(_data);
+ }
+ //console.log(tOptions.data);
// 鐢熸垚琛ㄦ牸鏁版嵁
- table.render(tOptions);
+ if(data.length != 0) {
+ table.render(tOptions);
+ }
updateDevStatus();
+
}
,complete:function() {
layer.close(load);
}
});
+ }
+
+ // 鏍规嵁璁惧瀵规暟鎹繘琛岀瓫閫�
+ function getFilterData(data, all) {
+ var rs = [];
+ // 閬嶅巻data鐨勫��
+ for(var i=0; i<data.length; i++) {
+ var isExist = false;
+ var _data = data[i];
+ // 閬嶅巻all
+ for(var k=0; k<all.length;k++) {
+ var _all = all[k];
+ // 鍒ゆ柇璁惧id鏄惁宸茬粡琚坊鍔�
+ if(_data.FBSDeviceId == _all.FBSDeviceId) {
+ isExist = true;
+ break;
+ }
+ }
+ // 濡傛灉涓嶅瓨鍦ㄦ坊鍔犳暟鎹�
+ if(!isExist) {
+ rs.push(_data);
+ }
+ }
+
+ return rs; // 杩斿洖缁撴灉闆�
}
// 鐐瑰嚮娣诲姞鏋勯�犳煡璇�
@@ -704,9 +813,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) {
@@ -950,12 +1061,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;
}
}
@@ -968,8 +1081,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({
@@ -981,6 +1096,7 @@
dataType: 'json',
success: function(res){
var rs = JSON.parse(res.result);
+ console.log(rs);
if(rs.code == 1) {
var data = rs.data;
// console.log(data);
@@ -1018,6 +1134,89 @@
},
});
}
+ }
+
+
+ // 鑾峰彇璁惧瀹炴椂鐘舵�佺殑鍙傛暟
+ 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;
}
});
--
Gitblit v1.9.1