From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/batch-set-curr.jsp | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 5e5e0ec..711c159 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>
@@ -537,13 +537,12 @@
,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
- ,{field:'devStatus', title:'璁惧鐘舵��', templet: '#devStatus', align:'center', width: 600}
+ ,{field:'devStatus', title:'璁惧鐘舵��', templet: '#devStatus', align:'center', width: 700}
,{field:'testTime', title:'宸叉祴鏃堕暱', templet: '#testTime', align:'center', width: 140}
,{field:'signalNum', title:'閫氫俊璁℃暟', templet: '#signalNum', align:'center', width: 140}
,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
- ,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
+ ,{field:'Load_curr', title:'璐熻浇鐢垫祦', align:'center', width: 100}
,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
- ,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160}
]]
,data:[]
@@ -565,6 +564,7 @@
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
+
$('#batchAdd').click(function() {
var structData = structAddData();
// 鍒ゆ柇鏄惁閫夋嫨瑕佹坊鍔犵殑鍐呭
@@ -578,7 +578,8 @@
});
-
+ // 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
+ var addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勮澶�
function searchChargeDev(callback, cParam, isCallback) {
var rq = structAddData(); // 鑾峰彇鏌ヨ鏉′欢
@@ -589,6 +590,8 @@
devType = preDevType;
// 璁惧绫诲瀷鐨勬潯浠舵敼鍙樻竻绌鸿〃鏍�
tOptions.data = [];
+ // 娓呯┖瀛楃涓�
+ addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勫唴瀹�
$.ajax({
type: 'post'
@@ -667,6 +670,15 @@
var data = [];
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++) {
@@ -790,14 +802,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 +825,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) {
@@ -840,7 +854,7 @@
// 鏋勯�犳壒閲忚缃斁鐢靛弬鏁扮殑鏂规硶
function getSetCurrParam(data, ratio) {
- //console.log(data);
+ // console.log(data);
var rs = [];
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -982,7 +996,7 @@
layer.msg('鏆傛棤鏃犳硶鍚姩,璇峰厛璁剧疆鏀剧數鍙傛暟!');
return;
}
-
+ $('#setCurrIframe').data('addBattStr', addBattStr);
// 鏄剧ず闈㈡澘
layer.open({
type: 2
@@ -1059,12 +1073,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;
}
}
@@ -1164,12 +1180,14 @@
if(_data.dev_workstate ==0 && _data.dev_res_test_state != 0) {
index = 3;
}
+ var monCap = _data.dev_captest_cap==0?_data.dev_captest_cap:_data.dev_captest_cap.toFixed(1);
// 璁剧疆璁惧鐘舵�佸瓧绗︿覆
str = "鐘舵��:" + workStates[index]+
",鍛婅:"+alarmStates[_data.dev_alarmstate]+
",缁勭鐢靛帇(V):"+_data.dev_captest_groupvol+
+ ",鍦ㄧ嚎鐢靛帇(V):"+_data.dev_captest_onlinevol+
",鐢垫祦(A):"+_data.dev_captest_curr+
- ",瀹归噺(AH):"+_data.dev_captest_cap;
+ ",瀹归噺(AH):"+monCap;
// 璁剧疆璁惧鍐呴樆娴嬭瘯鐨勫瓧绗︿覆
if(index == 3){
str = "鐘舵��:"+workStates[index]+
@@ -1213,7 +1231,16 @@
}
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