From 280e3e54636f44e8c1d0b2268189e6b0ad03ce78 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 10:15:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
gx_tieta/WebRoot/charge-test.jsp | 2
2 files changed, 158 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 5d4d833..6dd72f4 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -4172,7 +4172,7 @@
function getBattStr() {
var battInfo = getBattinfById();
//console.info(battInfo);
- var battStr = battInfo.StationName+'-'+battInfo.BattGroupName;
+ var battStr = battInfo.StationName+'-'+battInfo.BattGroupName+'-鏍囩О瀹归噺'+battInfo.MonCapStd+'AH';
$('#address_infor').text(battStr);
}
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 3c203fa..7bec57f 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -45,6 +45,7 @@
<ul class="layui-tab-title">
<li class="layui-this">寰呭鏍�<span class="layui-badge" id="applyNum">0</span></li>
<li>寰呴獙鏀�<span class="layui-badge" id="acceptNum">0</span></li>
+ <li>宸查獙鏀�<span class="layui-badge" id="acceptedNum">0</span></li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -54,6 +55,10 @@
<div class="layui-tab-item">
<!-- 琛ㄦ牸鍐呭 -->
<table id="acceptTbl" lay-filter="acceptTbl"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!-- 琛ㄦ牸鍐呭 -->
+ <table id="acceptedTbl" lay-filter="acceptedTbl"></table>
</div>
</div>
</div>
@@ -91,6 +96,10 @@
{{# }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="acceptedBattGroupTools">
<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>
@@ -145,6 +154,9 @@
var acceptPage = new TblPage(); // 瀹炰緥鍖朤blPage瀵硅薄--寰呴獙鏀剁殑鍒嗛〉淇℃伅
acceptPage.set(1, 0, 20); // 鍒濆鍖栧��
+ var acceptedPage = new TblPage(); // 瀹炰緥鍖朤blPage瀵硅薄--宸查獙鏀剁殑鍒嗛〉淇℃伅
+ acceptedPage.set(1, 0, 20); // 鍒濆鍊�
+
// 椤甸潰dom瀵硅薄
var pagePage = new PagePage({
search: $('#paging .search') // 鏌ヨ
@@ -168,10 +180,13 @@
// console.log(data.index); //寰楀埌褰撳墠Tab鐨勬墍鍦ㄤ笅鏍�
// console.log(data.elem); //寰楀埌褰撳墠鐨凾ab澶у鍣�
tabsIndex = data.index; // 鏍囪瘑鏄剧ず鐨勯�夐」鍗″唴瀹�
- if(tabsIndex) {
+ console.log(tabsIndex);
+ if(tabsIndex == 0) {
+ pagePage.init(Page, search); // 寰呭鏍�
+ }else if(tabsIndex == 1){
pagePage.init(acceptPage, acceptSearch); // 寰呴獙鏀�
- }else {
- pagePage.init(Page, search); // 寰呭鏍�
+ }else if(tabsIndex == 2) {
+ pagePage.init(acceptedPage, acceptedSearch); // 宸查獙鏀�
}
$(window).resize();
});
@@ -295,6 +310,69 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
+
+ // 寰呴獙鏀剁殑琛ㄦ牸
+ var acceptedOptions = {
+ elem: '#acceptedTbl'
+ ,toolbar: false
+ ,defaultToolbar: []
+ ,cellMinWidth: 80
+ ,cols: [[
+ {type:'checkbox',fixed: 'left'}
+ ,{field:'StationId', title:'鏈烘埧缂栧彿', align:'center', width: 120}
+ ,{field:'StationName1', title:'鐪�', align:'center', width: 100}
+ ,{field:'StationName2', title:'甯�', align:'center', width: 100}
+ ,{field:'StationName5', title:'鍖哄幙', align:'center', width: 100}
+ ,{field:'StationName3', title:'鏈烘埧鍚嶇О', align:'center', width: 360}
+ ,{field:'StationName4', title:'璁惧鍚嶇О', align:'center', width: 150}
+ ,{field:'StationIp', title:'鏈烘埧ip', align:'center', width: 160}
+ ,{field: 'FBSDeviceId', title: 'FBS璁惧ID锛堥噸瑕侊級', align: 'center', width: 160}
+ ,{field:'FbsDeviceIp', title:'FBS璁惧IP锛堥噸瑕侊級', align:'center', width: 160}
+ ,{field:'FbsDeviceIp_YM', title:'瀛愮綉鎺╃爜', align:'center', width: 160}
+ ,{field:'FbsDeviceIp_WG', title:'缃戝叧', align:'center', width: 160}
+ ,{field:'FBSDeviceName', title:'FBS璁惧鍚嶇О', align:'center', width: 160}
+ ,{field:'GroupIndexInFBSDevice', title:'FBS璁惧绱㈠紩', 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:'productDate', title:'鐢垫睜鐢熶骇鏃ユ湡', templet: '#produceTime', align:'center', width: 140}
+ ,{field:'useDate', title:'鎶曞叆浣跨敤鏃ユ湡', templet: '#useTime', align:'center', width: 140}
+ ,{field:'isInstall', title:'瀹夎鐘舵��', templet: '#isInstall', align:'center', width: 140}
+ ,{field:'install_user', title:'璁惧瀹夎浜哄憳', align:'center', width: 260}
+ ,{field:'check_en', title:'楠屾敹鐘舵��', templet: '#acceptEn',align:'center', width: 120}
+ ,{field:'latitude', title:'缁忓害', align:'center', width: 150}
+ ,{field:'longitude', title:'绾害', align:'center', width: 150}
+ ,{field:'address', title:'鍦板潃', align:'center', width: 230}
+ ,{field:'apply_name', title:'鐢宠浜�', align:'center', width: 120}
+ ,{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: '#acceptedBattGroupTools', width:200}
+ ]]
+ ,data:[]
+ ,limit: 10000
+ ,page: false
+ ,height: 'full-235'
+ };
+
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(acceptedOptions);
+
+
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(acceptOptions, layui, laytpl, table.cache.acceptTbl);
@@ -328,6 +406,21 @@
}
});
+
+ // 宸查獙鏀舵搷浣滄爮
+ table.on('tool(acceptedTbl)', function(obj) {
+ switch(obj.event) {
+ case 'accept':
+ acceptBattGroup(obj.data);
+ break;
+ case 'control':
+ controlPage(obj.data);
+ break;
+ case 'look':
+ lookHomeInfo(obj.data);
+ break;
+ }
+ });
// 鎵归噺鐢宠
$('#exBattGroups').click(function() {
@@ -417,7 +510,7 @@
function acceptBattGroup(data) {
// 鏋勯�犻獙鏀堕�氳繃鐨勬満鎴跨殑淇℃伅
var temp = [createAcceptParam(data)];
- console.log(temp);
+ // console.log(temp);
// 鏄惁鍗寸‘璁ら獙鏀�
layer.confirm('鏄惁纭楠屾敹', {icon: 3, title: '鎻愮ず'}, function(index) {
layer.close(index);
@@ -466,6 +559,9 @@
// 鏌ヨ寰呴獙鏀跺悗鍙版暟鎹�
acceptSearch();
+
+ // 鏌ヨ宸查獙鏀舵満鎴跨殑淇℃伅
+ acceptedSearch();
}else {
layer.msg('纭楠屾敹澶辫触锛�');
}
@@ -559,6 +655,7 @@
function createSearchParam() {
var temp = {
apply_en: 0
+ ,check_en: 100
,binf: {
page: Page.getPage()
}
@@ -647,7 +744,7 @@
acceptPage.setAll(0);
}
pagePage.setVal(); // 璁剧疆鍒嗛〉淇℃伅
- $('#acceptNum').text(getAcceptHome(resData)); // 璁剧疆寰界珷
+ $('#acceptNum').text(acceptPage.all); // 璁剧疆寰界珷
acceptOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -662,10 +759,11 @@
});
}
- // 鏋勯�犻獙鏀剁殑鏌ヨ鏉′欢
+ // 鏋勯�犲緟楠屾敹鐨勬煡璇㈡潯浠�
function acceptSearchParam() {
var temp = {
apply_en: 1
+ ,check_en: 0
,binf: {
page: acceptPage.getPage()
}
@@ -673,6 +771,59 @@
return temp;
}
+ // 鏌ヨ宸查獙鏀剁殑鏈烘埧
+ acceptedSearch();
+ function acceptedSearch(temp, newLoad) {
+ var load = layer.load(1);
+ var temp = acceptedSearchParam();
+ //console.log(temp);
+ // 鏌ヨ鍚庡彴
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: "Battinf_applyAction!serchByCondition"
+ ,data: "json="+JSON.stringify(temp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ var resData = [];
+ if(rs.code == 1) {
+ var data = rs.data;
+ // 閬嶅巻鏁版嵁鐨勫��
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = formaterResData(_data);
+ resData.push(_tmp);
+ acceptedPage.setAll(_data.apply_note);
+ }
+ }else {
+ acceptedPage.setAll(0);
+ }
+ pagePage.setVal(); // 璁剧疆鍒嗛〉淇℃伅
+ $('#acceptedNum').text(acceptedPage.all); // 璁剧疆寰界珷
+ acceptedOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
+
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(acceptedOptions);
+ }
+ ,complete: function() {
+ layer.close(load);
+ }
+ });
+ }
+
+ // 鏋勯�犲緟楠屾敹鐨勬煡璇㈡潯浠�
+ function acceptedSearchParam() {
+ var temp = {
+ apply_en: 1
+ ,check_en: 1
+ ,binf: {
+ page: acceptedPage.getPage()
+ }
+ };
+ return temp;
+ }
+
// 鏇存柊楠屾敹琛ㄦ牸
function updateAcceptSearch() {
var temp = acceptSearchParam();
--
Gitblit v1.9.1