From 010e1bb8410ce794c62fe2696134d2c6f6eefbb3 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期五, 11 一月 2019 19:33:11 +0800
Subject: [PATCH] 批量电池参数设置读取失败过滤添加
---
gx_tieta/WebRoot/bat-set-test.jsp | 75 +++++++++++++++---
gx_tieta/WebRoot/iframe/bat-set-test.html | 151 +++++++++++++++++++++++++++++++++++++
2 files changed, 213 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index e0c2d12..bea238d 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -172,6 +172,7 @@
<!-- 瀛樺偍set-curr.html鐨勪俊鎭� -->
<div id="setCurrIframe"></div>
<div id="setCurrBtn"></div>
+ <div id="batSetTest"></div>
<!-- 璁惧宸ヤ綔鐘舵�� -->
<script type="text/html" id="devStatus">
{{# if(d.devStatus) { }}
@@ -804,30 +805,54 @@
return;
}
- var data = getCheckedData(cData); // 鏍煎紡鍖栬閫変腑琛屾暟鎹�
- var keyIds= getKeyId(cData); // 鑾峰彇鏍囪瘑绗�
- var rsData = [];
- for(var i=0; i<data.length; i++) {
- var _data = data[i];
- _data.op_cmd = battParam.set;
- _data.num = 0;
- rsData.push(_data);
+ let goodAndBadHome = getGoodAndBadHome(cData);
+ let goodHome = goodAndBadHome.good;
+ // 鍒ゆ柇goodHome
+ if(goodHome.length == 0) {
+ layer.msg('璇烽�夋嫨璇诲彇鎴愬姛鐨勬満鎴�');
+ return;
}
- // 鎵归噺璁剧疆
- batchSetBattParams(rsData, keyIds);
+ // 璁剧疆鍐呭
+ $('#batSetTest').data('goodAndBadHome', goodAndBadHome);
+ // 鎵撳紑闈㈡澘
+ layer.open({
+ type: 2
+ ,title: '鐢垫睜鍙傛暟璁剧疆鎻愮ず'
+ ,area: ['1200px', '500px']
+ ,content: 'iframe/bat-set-test.html'
+ ,btn:['纭畾', '鍙栨秷']
+ ,yes: function(sysSetTestIndex) {
+ var keyIds= getKeyId(goodHome); // 鑾峰彇鏍囪瘑绗�
+ var rsData = [];
+ for(var i=0; i<goodHome.length; i++) {
+ var _data = goodHome[i];
+ _data.op_cmd = battParam.set;
+ _data.num = 0;
+ rsData.push(_data);
+ }
+
+ // 鎵归噺璁剧疆
+ batchSetBattParams(rsData, keyIds, sysSetTestIndex);
+ }
+ });
+
+ var data = getCheckedData(cData); // 鏍煎紡鍖栬閫変腑琛屾暟鎹�
+ var keyIds= getKeyId(cData); // 鑾峰彇鏍囪瘑绗�
+
});
// 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
var addBattStr = '';
// 鎵归噺璁剧疆鏀剧數鍙傛暟
- function batchSetBattParams(params, keys) {
+ function batchSetBattParams(params, keys, sIndex) {
// 鍒ゆ柇data鐨勫�兼槸鍚︿负绌�
if(params.length == 0) {
layer.msg('璇烽�夋嫨瑕佹壒閲忚缃殑鏈烘埧锛�');
}
// 鍒ゆ柇鏄惁鎵归噺璁剧疆
layer.confirm('鏄惁纭鎵归噺璁剧疆鐢垫睜鍙傛暟', {icon: 3, title: '鎵归噺璁剧疆鎻愰啋'}, function(index) {
+ layer.close(sIndex);
layer.close(index);
var loading = layer.load(1);
// 璇锋眰鍚庡彴
@@ -878,7 +903,6 @@
});
});
}
-
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
@@ -977,6 +1001,7 @@
// 澶勭悊娣诲姞鏈烘埧淇℃伅鐨勭粨鏋�
function formatSearchData(data) {
+ console.log(data);
var rs = [];
// 閬嶅巻data鐨�
for(var i=0; i<data.length; i++) {
@@ -989,7 +1014,7 @@
tmp.key_id = i;
tmp.dev_id = obj.dev_id; // 璁惧ID
tmp.dev_ip = obj.dev_ip; // 璁惧IP
- tmp.StationName = obj.StationName; // 鏈烘埧鍚嶇О
+ tmp.StationName = _data.StationName; // 鏈烘埧鍚嶇О
tmp.GroupConnType = 0; // 鐢垫睜缁勮繛鎺ョ被鍨�
tmp.StationName9 = _data.StationName9; // 璁惧鐗堟湰鍙�
@@ -1079,6 +1104,7 @@
tmp.FloatChargeVol = _data.FloatChargeVol; // 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
tmp.FloatChargeCurr = _data.FloatChargeCurr; // 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
tmp.OnlineVolLow = _data.OnlineVolLow; // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ tmp.readStatus = _data.readStatus; // 璇诲彇鐘舵��
// 灏嗘暟鎹斁鍒拌繑鍥炵殑缁撴灉闆嗕腑
rs.push(tmp);
}
@@ -1093,6 +1119,29 @@
rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'鐢垫睜缁�1': '鐢垫睜缁�2');
return rsString;
}
+
+ // 鏍规嵁readStatus鐨勫�艰缃數姹犲弬鏁扮殑鍊煎尯鍒嗗彲璁剧疆鍙傛暟鐨勬満鎴夸俊鎭�/涓嶅彲璁剧疆鍙傛暟鐨勬満鎴�
+ function getGoodAndBadHome(data) {
+ let rs = {
+ good: []
+ ,bad: []
+ };
+
+ // 閬嶅巻data鐨勫��
+ for(var i=0; i<data.length; i++) {
+ let _data = data[i];
+ let status = _data.readStatus;
+ if(status) {
+ rs.good.push(_data);
+ }else {
+ rs.bad.push(_data);
+ }
+ }
+
+ return rs;
+ }
+
+
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/iframe/bat-set-test.html b/gx_tieta/WebRoot/iframe/bat-set-test.html
new file mode 100644
index 0000000..26626f1
--- /dev/null
+++ b/gx_tieta/WebRoot/iframe/bat-set-test.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="X-UA-Compatible" content="ie=edge">
+ <title>鐢垫睜鍙傛暟璁剧疆</title>
+ <link rel="stylesheet" href="../src/css/layui.css">
+ <link rel="stylesheet" href="../pages/css/mylayui.css">
+ <style>
+ html,body{
+ min-width: 400px;
+ }
+ body.homeinfo-tab .layui-tab {
+ margin: 0;
+ }
+ body.homeinfo-tab .layui-tab-card{
+ border: none;
+ }
+ body.homeinfo-tab .layui-tab-content {
+ padding: 0;
+ }
+
+ </style>
+</head>
+<body class="homeinfo-tab">
+ <div class="layui-tab layui-tab-card" lay-filter="homeInfo">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍙缃満鎴�<span class="layui-badge" id="goodHomeNum">0</span></li>
+ <li>涓嶅彲璁剧疆鏈烘埧<span class="layui-badge" id="badHomeNum">0</span></li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table id="pageTblGood" lay-filter="pageTblGood"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table id="pageTblBad" lay-filter="pageTblBad"></table>
+ </div>
+ </div>
+ </div>
+ <!-- 璇诲彇鐘舵�� -->
+ <script type="text/html" id="readStatus">
+ {{# if(d.readStatus == 1){ }}
+ <button class="layui-btn layui-btn-sm layui-btn-normal">璇诲彇鎴愬姛</button>
+ {{# }else { }}
+ <button class="layui-btn layui-btn-sm layui-btn-danger">璇诲彇澶辫触</button>
+ {{# } }}
+ </script>
+ <script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
+ <script type="text/javascript" src="../src/layui.js"></script>
+ <script type="text/javascript">
+ layui.use(['table', 'element'], function() {
+ let table = layui.table; // 鑾峰彇table妯″潡
+ let element = layui.element; // 鑾峰彇element妯″潡
+
+ // 鍒囨崲閫夋嫨鍗�
+ element.on('tab(homeInfo)', function(elem){
+ $(window).resize();
+ });
+
+ // 鍙缃満鎴胯〃鏍肩殑閰嶇疆椤�
+ let goodTblOpts = {
+ elem: '#pageTblGood'
+ ,toolbar: false
+ ,defaultToolbar: []
+ ,cellMinWidth: 80
+ ,cols: [[
+ {field:'dev_id', title:'璁惧ID', align:'center', width: 160}
+ ,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
+ ,{field:'STD_CAP', title:'鐢垫睜鏍囩О瀹归噺锛圓H锛�', templet: '#STD_CAP', align:'center', width: 220}
+ ,{field:'STD_RES', title:'鐢垫睜鏍囩О鍐呴樆锛坲惟锛�', templet: '#STD_RES', align:'center', width: 220}
+ ,{field:'BattGroupCount', title:'鐢垫睜缁勭粍鏁�', templet: '#BattGroupCount', align:'center', width: 180}
+ ,{field:'EachGroupBattCount', title:'姣忕粍鐢垫睜鍗曚綋鏁伴噺', templet: '#EachGroupBattCount', align:'center', width: 220}
+ ,{field:'MonomerVol', title:'鍗曚綋鏍囩О鐢靛帇锛圴锛�', templet: '#MonomerVol', align:'center', width: 220}
+ ,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 180}
+ ,{field:'GroupVol', title:'鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�', align:'center', width: 220}
+ ,{field:'BattTemp', title:'鐢垫睜鏍囩О娓╁害锛堚剝锛� ', templet: '#BattTemp', align:'center', width: 220}
+ ,{field:'FloatChargeVol', title:'鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛� ', templet: '#FloatChargeVol', align:'center', width: 220}
+ ,{field:'FloatChargeCurr', title:'鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛� ', templet: '#FloatChargeCurr', align:'center', width: 220}
+ ,{field:'OnlineVolLow', title:'鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛� ', templet: '#OnlineVolLow', align:'center', width: 220}
+ ,{field:'GroupConnType', title:'鐢垫睜缁勮繛鎺ョ被鍨�', templet: '#GroupConnType', align:'center', width: 220}
+ ,{field:'readStatus', fixed:'right', title:'璇诲彇鐘舵��', templet: '#readStatus', align:'center', width: 120}
+ ]]
+ ,data:[]
+ ,limit: 10000
+ ,page: false
+ ,height: 'full-45'
+ };
+
+ let badTblOpts = {
+ elem: '#pageTblBad'
+ ,toolbar: false
+ ,defaultToolbar: []
+ ,cellMinWidth: 80
+ ,cols: [[
+ {field:'dev_id', title:'璁惧ID', align:'center', width: 160}
+ ,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
+ ,{field:'STD_CAP', title:'鐢垫睜鏍囩О瀹归噺锛圓H锛�', templet: '#STD_CAP', align:'center', width: 220}
+ ,{field:'STD_RES', title:'鐢垫睜鏍囩О鍐呴樆锛坲惟锛�', templet: '#STD_RES', align:'center', width: 220}
+ ,{field:'BattGroupCount', title:'鐢垫睜缁勭粍鏁�', templet: '#BattGroupCount', align:'center', width: 180}
+ ,{field:'EachGroupBattCount', title:'姣忕粍鐢垫睜鍗曚綋鏁伴噺', templet: '#EachGroupBattCount', align:'center', width: 220}
+ ,{field:'MonomerVol', title:'鍗曚綋鏍囩О鐢靛帇锛圴锛�', templet: '#MonomerVol', align:'center', width: 220}
+ ,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 180}
+ ,{field:'GroupVol', title:'鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�', align:'center', width: 220}
+ ,{field:'BattTemp', title:'鐢垫睜鏍囩О娓╁害锛堚剝锛� ', templet: '#BattTemp', align:'center', width: 220}
+ ,{field:'FloatChargeVol', title:'鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛� ', templet: '#FloatChargeVol', align:'center', width: 220}
+ ,{field:'FloatChargeCurr', title:'鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛� ', templet: '#FloatChargeCurr', align:'center', width: 220}
+ ,{field:'OnlineVolLow', title:'鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛� ', templet: '#OnlineVolLow', align:'center', width: 220}
+ ,{field:'GroupConnType', title:'鐢垫睜缁勮繛鎺ョ被鍨�', templet: '#GroupConnType', align:'center', width: 220}
+ ,{field:'readStatus', fixed:'right', title:'璇诲彇鐘舵��', templet: '#readStatus', align:'center', width: 120}
+ ]]
+ ,data:[]
+ ,limit: 10000
+ ,page: false
+ ,height: 'full-45'
+ };
+
+ // 娓叉煋琛ㄦ牸鍙缃満鎴跨殑琛ㄦ牸
+ table.render(goodTblOpts);
+
+ // 娓叉煋涓嶅彲璁剧疆鏈烘埧鐨勮〃鏍�
+ table.render(badTblOpts);
+
+ let goodAndBadHome = parent.$('#batSetTest').data('goodAndBadHome');
+ goodAndBadHome = goodAndBadHome?goodAndBadHome:{good:[], bad:[]};
+ //console.log(goodAndBadHome);
+ // 璁剧疆good鐨勫��
+ for(let i=0, len=goodAndBadHome.good.length; i<len; i++) {
+ let _good = goodAndBadHome.good[i];
+ goodTblOpts.data.push(_good);
+ }
+
+ // 璁剧疆涓嶅彲浠ヨ缃満鎴跨殑涓暟
+ $('#goodHomeNum').text(goodTblOpts.data.length);
+ // 娓叉煋琛ㄦ牸鍙缃満鎴跨殑琛ㄦ牸
+ table.render(goodTblOpts);
+
+ // 璁剧疆bad鐨勫��
+ for(let i=0, len=goodAndBadHome.bad.length; i<len; i++) {
+ let _bad = goodAndBadHome.bad[i];
+ badTblOpts.data.push(_bad);
+ }
+
+ // 璁剧疆涓嶅彲浠ヨ缃満鎴跨殑涓暟
+ $('#badHomeNum').text(badTblOpts.data.length);
+ // 娓叉煋涓嶅彲璁剧疆鏈烘埧鐨勮〃鏍�
+ table.render(badTblOpts);
+ });
+ </script>
+</body>
+</html>
--
Gitblit v1.9.1