From def60f975af368a585a0132a7afa07b45448c031 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 14:07:04 +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 | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index aecdb7c..5e5e0ec 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -673,7 +673,7 @@
var _data = data[i];
tOptions.data.push(_data);
}
- // console.log(tOptions.data);
+ //console.log(tOptions.data);
// 鐢熸垚琛ㄦ牸鏁版嵁
if(data.length != 0) {
table.render(tOptions);
@@ -1077,8 +1077,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,6 +1130,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