From 398be7e48387b49ac209dd5ed5fe7a135f268e5c Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 28 十二月 2018 17:38:35 +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 | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 4b2c858..0087fc0 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -144,14 +144,21 @@
</div>
<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="batchSetCurr">鎵归噺璁剧疆鏀剧數鍙傛暟</button>
- <button class="layui-btn layui-btn-sm" id="batchSetSys">鎵归噺璁剧疆绯荤粺鍙傛暟</button>
- <button class="layui-btn layui-btn-sm" id="batchSetSys">鎵归噺鍚姩鏀剧數娴嬭瘯</button>
</div>
</div>
<!-- 琛ㄦ牸鍐呭 -->
<table id="pageTbl" lay-filter="pageTbl"></table>
</div>
</div>
+ <script type="text/html" id="setStatus">
+ {{# if(d.setCurr == 1){ }}
+ <button class="layui-btn layui-btn-sm layui-btn-warm">璁剧疆鏀剧數鍙傛暟鎴愬姛</button>
+ {{# }else if(d.setCurr == 2){ }}
+ <button class="layui-btn layui-btn-sm layui-btn-danger">璁剧疆鏀剧數鍙傛暟澶辫触</button>
+ {{# }else { }}
+ <button class="layui-btn layui-btn-sm layui-btn-normal">鏈缃斁鐢靛弬鏁�</button>
+ {{# } }}
+ </script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
@@ -395,26 +402,20 @@
,cellMinWidth: 80
,cols: [[
{type:'checkbox',fixed: 'left'}
- ,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 360}
+ ,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
,{field:'FBSDeviceName', title:'FBS璁惧鍚嶇О', align:'center', width: 160}
,{field:'GroupIndexInFBSDevice', title:'FBS璁惧绱㈠紩', align:'center', width: 160}
+ ,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
- ,{field:'BattGroupNum', title:'鏈烘埧鍐呯數姹犵粍缂栧彿', align:'center', width: 160}
,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
- ,{field:'FloatVolLevel', title:'娴厖鐢靛帇闃�鍊�', align:'center', width: 160}
- ,{field:'OfflineVolLevel', title:'绂荤嚎鐢靛帇闃�鍊�', align:'center', width: 160}
- ,{field:'BattFloatCurrent', title:'娴厖闃�鍊�', align:'center', width: 100}
,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
,{field:'MonResStd', title:'鏍囩О鍗曚綋鍐呴樆', align:'center', width: 140}
,{field:'MonSerStd', title:'鏍囩О鍗曚綋鐢靛', align:'center', width: 140}
- ,{field:'MonVolLowToAvg', title:'鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�', align:'center', width: 140}
,{field:'Load_curr', title:'璐熻浇鐢垫祦', align:'center', width: 140}
,{field:'DisCurrMax', title:'鏈�澶ф牳瀹圭數娴�', align:'center', width: 140}
- ,{field:'station_phone', title:'鍩虹珯鎵嬫満鍙风爜', align:'center', width: 140}
- ,{field:'BattProducer', title:'鐢垫睜鍝佺墝', align:'center', width: 140}
- ,{field:'BattModel', title:'鐢垫睜鍨嬪彿', align:'center', width: 260}
+ ,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160}
]]
,data:[]
,limit: 20
@@ -427,9 +428,6 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
-
- // 鏌ヨ鍚庡彴鏁版嵁
-
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#batchAdd').click(function() {
@@ -455,25 +453,24 @@
,data: 'json='+JSON.stringify(temp)
,dataType: 'json'
,success: function(res) {
- console.log(res);
+ // console.log(res);
var rs = JSON.parse(res.result);
+ var data = [];
if(rs.code == 1) {
- var data = rs.data;
- console.log(data);
- tOptions.data = data;
- // 鐢熸垚琛ㄦ牸鏁版嵁
- table.render(tOptions);
+ data = rs.data;
}else {
layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
}
+
+ tOptions.data = data;
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(tOptions);
}
,complete:function() {
layer.close(load);
}
});
}
-
-
// 鐐瑰嚮娣诲姞鏋勯�犳煡璇�
function structAddData() {
@@ -513,6 +510,26 @@
}
return rs;
}
+
+ // 鐐瑰嚮鎵归噺璁剧疆鏀剧數鐢垫祦鍙傛暟
+ $('#batchSetCurr').click(function() {
+ var checkStatus = table.checkStatus('pageTbl');
+ var data = checkStatus.data;
+ if(data.length == 0) {
+ layer.msg('璇烽�夋嫨瑕佽缃殑鏈烘埧');
+ return;
+ }
+ // console.log(data);
+ // 璁剧疆鏀剧數鍙傛暟
+ getDisCurrParam(data);
+ });
+
+
+ // 鑾峰彇鏀剧數鍙傛暟
+ function getDisCurrParam(data) {
+ console.log(data);
+ var data = GetHourRate();
+ }
});
</script>
</body>
--
Gitblit v1.9.1