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/ex-battinfo.jsp | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index c5fec0d..c0b02b5 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -77,15 +77,21 @@
</div>
</div>
</div>
+ <!-- 鏈烘埧闈㈡澘淇℃伅闈㈡澘淇℃伅 -->
+ <div id="homeInfoIframeData"></div>
+ <!-- 瀹℃牳鎿嶄綔鏍� -->
<script type="text/html" id="battGrouptools">
<a class="layui-btn layui-btn-xs" lay-event="adopt">瀹℃牳</a>
</script>
<script type="text/html" id="acceptBattGroupTools">
- {{# if(d.check_en !=2){ }}
- <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">楠屾敹</a>
+ {{# if(d.check_en ==0){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">寰呯敵璇�</a>
+ {{# }else if(d.check_en ==1) { }}
+ <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">宸查獙鏀�</a>
{{# }else { }}
<a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="accept">楠屾敹</a>
{{# } }}
+ <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="look">鏈烘埧鐜</a>
<a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="control">瀹炴椂鏌ヨ</a>
</script>
<script type="text/html" id="applyEn">
@@ -122,6 +128,7 @@
<script type="text/javascript" src="src/layui.js"></script>
<script type="text/javascript" src="pages/js/mylayui.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
+ <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
layui.use(['form', 'table', 'layer', 'element'], function() {
/* 椤甸潰瀵煎叆layui妯″潡 */
@@ -129,6 +136,7 @@
var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
var element = layui.element; // 鑾峰彇鍏冪礌鎿嶄綔妯″潡
+ var laytpl = layui.laytpl; // 鑾峰彇妯℃澘鎿嶄綔妯″潡
/* 鍒嗛〉淇℃伅妯″潡 */
var Page = new TblPage(); // 瀹炰緥鍖朤blPage瀵硅薄--楠屾敹鐨勭殑瀹℃牳淇℃伅
@@ -276,7 +284,7 @@
,{field:'apply_date', title:'鐢宠鏃ユ湡', align:'center', width: 260}
,{field:'confirm_name', title:'瀹℃牳浜�', align:'center', width: 120}
,{field:'check_uname', title:'楠屾敹浜�', align:'center', width: 120}
- ,{field:'doThings', fixed: 'right', title:'楠屾敹鎿嶄綔', align: 'center', toolbar: '#acceptBattGroupTools', width:180}
+ ,{field:'doThings', fixed: 'right', title:'楠屾敹鎿嶄綔', align: 'center', toolbar: '#acceptBattGroupTools', width:240}
]]
,data:[]
,limit: 10000
@@ -287,6 +295,8 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
+ // 鏇存柊琛ㄦ牸鐨勫璞�
+ var layuiTbl = new LayuiTbl(acceptOptions, layui, laytpl, table.cache.acceptTbl);
// 瀹℃壒鎿嶄綔鏍�
table.on('tool(pageTbl)', function(obj) {
@@ -311,6 +321,9 @@
break;
case 'control':
controlPage(obj.data);
+ break;
+ case 'look':
+ lookHomeInfo(obj.data);
break;
}
});
@@ -477,6 +490,26 @@
window.open(url);
}
+ // 鏌ョ湅鏈烘埧淇℃伅
+ function lookHomeInfo(data) {
+ var sid = data.StationId;
+ var tabC = [
+ {
+ type: 'env'
+ ,title: '鍩虹珯鐜鐭棰�'
+ ,tshow: ''
+ ,cshow: ''
+ }
+ ,{
+ type: 'envImg'
+ ,title: '鍩虹珯鐜鍥鹃泦'
+ ,tshow: 'layui-this'
+ ,cshow: 'layui-show'
+ }
+ ];
+ showHomeInfoIframe(sid, tabC);
+ }
+
// 鏌ヨ鍚庡彴鏁版嵁
search();
function search() {
@@ -617,7 +650,7 @@
,complete: function() {
layer.close(load);
// 鍚姩鑷姩鍒锋柊
- //updateAcceptSearch();
+ updateAcceptSearch();
}
});
}
@@ -661,10 +694,13 @@
acceptPage.setAll(0);
}
- $('#acceptNum').text(getAcceptHome(resData)); // 璁剧疆寰界珷
- acceptOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
- // 鐢熸垚琛ㄦ牸鏁版嵁
- table.reload('acceptTbl', acceptOptions);
+ // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
+ for(var i=0; i<resData.length; i++) {
+ var _resData = resData[i];
+ _resData.doThings = '';
+ layuiTbl.updateTr(i, _resData);
+ }
+
// 瀹炴椂鍥炶皟
updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
}
--
Gitblit v1.9.1