From 36dcc192d70e52978e78c9b6e6cebec62a20fa51 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 10 一月 2019 15:13:55 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/setcurr.html | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/setcurr.html b/gx_tieta/WebRoot/iframe/setcurr.html
index 951acf5..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>
@@ -52,7 +59,7 @@
var setCurr = parent.$('#setCurrIframe').data('setCurr');
var addBattStr = parent.$('#setCurrIframe').data('addBattStr');
- console.log(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}
--
Gitblit v1.9.1