From ac7e8dab32688a34e3ebe797a502d5a1200de9f1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 27 十二月 2018 13:58:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batch-set-curr.jsp | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 4b2c858..830c3f4 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -152,6 +152,15 @@
<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>
@@ -415,6 +424,7 @@
,{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 +437,6 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
-
- // 鏌ヨ鍚庡彴鏁版嵁
-
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#batchAdd').click(function() {
@@ -455,25 +462,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 +519,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