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/iframe/setcurr.html | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/setcurr.html b/gx_tieta/WebRoot/iframe/setcurr.html
index 29513e9..ae6cc35 100644
--- a/gx_tieta/WebRoot/iframe/setcurr.html
+++ b/gx_tieta/WebRoot/iframe/setcurr.html
@@ -36,6 +36,13 @@
<button class="layui-btn layui-btn-sm layui-btn-normal">鏈缃�</button>
{{# } }}
</script>
+ <script type="text/html" id="BattGroupNum">
+ {{# if(d.BattGroupNum == 1) { }}
+ 鐢垫睜缁�1
+ {{# }else { }}
+ 鐢垫睜缁�2
+ {{# } }}
+ </script>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
@@ -51,8 +58,8 @@
var table = layui.table;
var setCurr = parent.$('#setCurrIframe').data('setCurr');
-
- console.log(setCurr);
+ var addBattStr = parent.$('#setCurrIframe').data('addBattStr');
+ //console.log(setCurr);
// 琛ㄦ牸妯″潡
var tOptions = {
elem: '#pageTbl'
@@ -63,7 +70,7 @@
{type:'checkbox',fixed: 'left'}
,{field:'dev_id', title:'璁惧ID', align:'center', width: 140}
,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 480}
- ,{field:'BattGroupNum', title:'鐢垫睜缁勭储寮�', align:'center', width: 140}
+ ,{field:'BattGroupNum', title:'鐢垫睜缁勫悕绉�', templet:'#BattGroupNum', align:'center', width: 140}
,{field:'DisCurr', title:'鏀剧數鐢垫祦锛圓锛�', align:'center', width: 160}
,{field:'DisCap', title:'鏀剧數瀹归噺锛圓H锛�', align:'center', width: 160}
,{field:'DisTime', title:'鏀剧數鏃堕暱锛堝垎閽燂級', align:'center', width: 160}
@@ -133,7 +140,7 @@
type: 'post'
,async: true
,url: 'Fbs9100_setparamAction_action_updatePro_dis'
- ,data: 'json='+JSON.stringify(param)
+ ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
--
Gitblit v1.9.1