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/bat-set-test.jsp | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index 8d3efec..abb69c7 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>鐢垫睜鍙傛暟璁剧疆</title>
+ <title><s:text name="Batch_batt_param_set"/></title> <!-- 鎵归噺鐢垫睜鍙傛暟璁剧疆 -->
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -59,7 +59,7 @@
<div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
<!-- 鏉′欢绛涢�� -->
<div class="layui-page-filter">
- <div class="page-filter-header layui-page-filter-fweight">鐢垫睜鍙傛暟璁剧疆</div>
+ <div class="page-filter-header layui-page-filter-fweight"><s:text name="Batch_batt_param_set"/></div>
<div class="page-filter-content">
<table>
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
@@ -120,8 +120,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>
@@ -163,6 +163,8 @@
<button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>娣诲姞璁惧</button>
<button class="layui-btn layui-btn-sm" id="sysSet">鎵归噺璁剧疆鐢垫睜鍙傛暟</button>
<button class="layui-btn layui-btn-sm" id="batchRead">鎵归噺璇诲彇鐢垫睜鍙傛暟</button>
+ <span class="mrl8">閫変腑涓暟/鎬绘暟锛�</span>
+ <button class="layui-btn layui-btn-sm" id="qNumber">0/0</button>
</div>
</div>
<!-- 琛ㄦ牸鍐呭 -->
@@ -172,6 +174,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) { }}
@@ -588,6 +591,16 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+ // 缁熻宸查�変腑涓暟鍜屾坊鍔犲埌琛ㄦ牸涓暟鎹殑涓暟
+ var quantNum = new QuantNumber($('#qNumber'));
+
+ // 琛ㄦ牸澶嶉�夋鐐瑰嚮鐩戞祴
+ table.on('checkbox(pageTbl)', function(obj){
+ var checkStatus = table.checkStatus('pageTbl'); //idTest 鍗充负鍩虹鍙傛暟 id 瀵瑰簲鐨勫��
+ var checkData = checkStatus.data; // 琚�変腑鐨勬暟鎹�
+ quantNum.setMol(checkData.length);
+ });
+
// 鐐瑰嚮琛ㄦ牸涓悓姝ョ殑鎸夐挳
$('.layui-page-content').on('click', '.layui-table-header .fa', function() {
var title = $(this).attr('title');
@@ -804,28 +817,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);
// 璇锋眰鍚庡彴
@@ -833,7 +872,7 @@
type: 'post'
,async: true
,url: 'Fbs9100_battparamAction_action_updatePro'
- ,data: 'json='+JSON.stringify(params)
+ ,data: 'json='+JSON.stringify(params)+'&json_msg='+addBattStr
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
@@ -877,7 +916,6 @@
});
}
-
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
$('#batchAdd').click(function() {
@@ -906,13 +944,25 @@
var rs = JSON.parse(res.result);
//console.log(rs);
var data = [];
+ addBattStr = ''; // 鍒濆鍖栧瓧绗︿覆
if(rs.code == 1) {
data = rs.data;
data = formatSearchData(data);
}else {
- layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+ layer.msg('娌℃湁鍙缃殑鏈烘埧!');
}
+ // 濡傛灉鏈夋坊鍔犵殑鏁版嵁
+ if(data.length !=0) {
+ if(addBattStr.length == 0) { // 瀛楃涓查暱搴︿负0
+ addBattStr += getFilterStr(temp);
+ }else {
+ addBattStr += ','+getFilterStr(temp);
+ }
+ }
+
tOptions.data = data;
+ // 缁熻娣诲姞鍒拌〃鏍间腑鐨勪釜鏁�
+ quantNum.set(0, data.length);
//console.log(data);
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
@@ -965,6 +1015,7 @@
// 澶勭悊娣诲姞鏈烘埧淇℃伅鐨勭粨鏋�
function formatSearchData(data) {
+ console.log(data);
var rs = [];
// 閬嶅巻data鐨�
for(var i=0; i<data.length; i++) {
@@ -977,7 +1028,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; // 璁惧鐗堟湰鍙�
@@ -1067,11 +1118,44 @@
tmp.FloatChargeVol = _data.FloatChargeVol; // 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
tmp.FloatChargeCurr = _data.FloatChargeCurr; // 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
tmp.OnlineVolLow = _data.OnlineVolLow; // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ tmp.readStatus = _data.readStatus; // 璇诲彇鐘舵��
// 灏嗘暟鎹斁鍒拌繑鍥炵殑缁撴灉闆嗕腑
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;
+ }
+
+ // 鏍规嵁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>
--
Gitblit v1.9.1