From f99e01a5e62998ea3ccdd3e74c51bc6a0ca68bb9 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 17:39:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 184 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 172 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 465f274..efa9644 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){ }}
- <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">
@@ -96,10 +102,12 @@
{{# } }}
</script>
<script type="text/html" id="acceptEn">
- {{# if(d.check_en){ }}
+ {{# if(d.check_en == 1){ }}
<a class="layui-btn layui-btn-xs">宸查獙鏀�</a>
+ {{# }else if(d.check_en == 2){ }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs">宸茬敵璇烽獙鏀�</a>
{{# }else{ }}
- <a class="layui-btn layui-btn-danger layui-btn-xs">寰呴獙鏀�</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs">寰呯敵璇烽獙鏀�</a>
{{# } }}
</script>
<script type="text/html" id="produceTime">
@@ -120,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妯″潡 */
@@ -127,6 +136,7 @@
var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
var element = layui.element; // 鑾峰彇鍏冪礌鎿嶄綔妯″潡
+ var laytpl = layui.laytpl; // 鑾峰彇妯℃澘鎿嶄綔妯″潡
/* 鍒嗛〉淇℃伅妯″潡 */
var Page = new TblPage(); // 瀹炰緥鍖朤blPage瀵硅薄--楠屾敹鐨勭殑瀹℃牳淇℃伅
@@ -212,7 +222,7 @@
,{field:'apply_name', title:'鐢宠浜�', align:'center', width: 120}
,{field:'apply_en', title:'鐢宠鐘舵��', align:'center', templet: '#applyEn',width: 120}
,{field:'apply_date', title:'鐢宠鏃ユ湡', align:'center', width: 260}
- ,{fixed: 'right', title:'瀹℃壒鎿嶄綔', align: 'center', toolbar: '#battGrouptools', width:120}
+ ,{field:'doThings', fixed: 'right', title:'瀹℃壒鎿嶄綔', align: 'center', toolbar: '#battGrouptools', width:120}
]]
,data:[]
,limit: 10000
@@ -267,10 +277,14 @@
,{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}
- ,{fixed: 'right', title:'楠屾敹鎿嶄綔', align: 'center', toolbar: '#acceptBattGroupTools', width:180}
+ ,{field:'check_uname', title:'楠屾敹浜�', align:'center', width: 120}
+ ,{field:'doThings', fixed: 'right', title:'楠屾敹鎿嶄綔', align: 'center', toolbar: '#acceptBattGroupTools', width:240}
]]
,data:[]
,limit: 10000
@@ -281,6 +295,8 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
+ // 鏇存柊琛ㄦ牸鐨勫璞�
+ var layuiTbl = new LayuiTbl(acceptOptions, layui, laytpl, table.cache.acceptTbl);
// 瀹℃壒鎿嶄綔鏍�
table.on('tool(pageTbl)', function(obj) {
@@ -305,6 +321,9 @@
break;
case 'control':
controlPage(obj.data);
+ break;
+ case 'look':
+ lookHomeInfo(obj.data);
break;
}
});
@@ -398,6 +417,7 @@
function acceptBattGroup(data) {
// 鏋勯�犻獙鏀堕�氳繃鐨勬満鎴跨殑淇℃伅
var temp = [createAcceptParam(data)];
+ console.log(temp);
// 鏄惁鍗寸‘璁ら獙鏀�
layer.confirm('鏄惁纭楠屾敹', {icon: 3, title: '鎻愮ず'}, function(index) {
layer.close(index);
@@ -412,8 +432,14 @@
var temp = {};
temp.binf = {};
Object.keys(data).forEach(function(key) {
- if(key == 'num') {
+ if(key == 'num') { // 涓婚敭
temp.num = data[key];
+ }else if(key == 'latitude'){ // 绾害
+ temp.latitude = data[key];
+ }else if(key == 'longitude'){ // 缁忓害
+ temp.longitude = data[key];
+ }else if(key == 'address') { // 鍦板潃
+ temp.address = data[key];
}else {
temp.binf[key] = data[key];
}
@@ -455,13 +481,33 @@
// 璺宠浆鍒板疄鏃堕〉闈�
function controlPage(data) {
- console.log(data);
+ // console.log(data);
var home = data.StationName;
var province = data.StationName1;
var city = data.StationName2;
var county = data.StationName5;
var url = skipUrl('control.jsp',province,city,county,home);
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);
}
// 鏌ヨ鍚庡彴鏁版嵁
@@ -482,7 +528,7 @@
var resData = [];
if(rs.code == 1) {
var data = rs.data;
- //console.log(data);
+ // console.log(data);
// 閬嶅巻鏁版嵁鐨勫��
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -490,6 +536,8 @@
resData.push(_tmp);
Page.setAll(_data.apply_note);
}
+ }else {
+ Page.setAll(0);
}
pagePage.setVal(); // 璁剧疆鍒嗛〉淇℃伅
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
@@ -501,6 +549,8 @@
}
,complete: function() {
layer.close(load);
+ // 鍚姩鑷姩鍒锋柊
+ updateSearch();
}
});
}
@@ -515,6 +565,54 @@
};
return temp;
}
+
+ // 鏇存柊瀹℃煡琛ㄦ牸
+ function updateSearch() {
+ var temp = createSearchParam();
+ clearInterval(updateSearch.timer);
+ // 鏌ヨ鍚庡彴
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: "Battinf_applyAction!serchByCondition"
+ ,data: "json="+JSON.stringify(temp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ //console.log(res);
+ var rs = JSON.parse(res.result);
+ var resData = [];
+ var isUpdateTbl = false;
+ if(rs.code == 1) {
+ var data = rs.data;
+ // console.log(data);
+ // 閬嶅巻鏁版嵁鐨勫��
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = formaterResData(_data);
+
+ if(_data.apply_note != Page.all) {
+ resData.push(_tmp);
+ Page.setAll(_data.apply_note);
+ isUpdateTbl = true;
+ }
+ }
+ }else {
+ Page.setAll(0);
+ }
+ // console.log(isUpdateTbl);
+ if(isUpdateTbl) {
+ $('#applyNum').text(Page.all); // 璁剧疆寰界珷
+ tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
+ table.render(tOptions);
+ }
+
+ // 瀹炴椂鍥炶皟
+ updateSearch.timer = setTimeout(updateSearch, 4000);
+ }
+ });
+ }
+
+
// 鏌ヨ寰呴獙鏀剁殑鏈烘埧
acceptSearch();
@@ -535,7 +633,7 @@
var resData = [];
if(rs.code == 1) {
var data = rs.data;
- // console.log(data);
+ //console.log(data);
// 閬嶅巻鏁版嵁鐨勫��
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -543,17 +641,22 @@
resData.push(_tmp);
acceptPage.setAll(_data.apply_note);
}
+ // console.log(resData);
+ }else {
+ acceptPage.setAll(0);
}
pagePage.setVal(); // 璁剧疆鍒嗛〉淇℃伅
- $('#acceptNum').text(acceptPage.all); // 璁剧疆寰界珷
+ $('#acceptNum').text(getAcceptHome(resData)); // 璁剧疆寰界珷
acceptOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
-
+ // console.log(table);
}
,complete: function() {
layer.close(load);
+ // 鍚姩鑷姩鍒锋柊
+ updateAcceptSearch();
}
});
}
@@ -568,6 +671,48 @@
};
return temp;
}
+
+ // 鏇存柊楠屾敹琛ㄦ牸
+ function updateAcceptSearch() {
+ var temp = acceptSearchParam();
+ clearInterval(updateAcceptSearch.timer);
+ // 鏌ヨ鍚庡彴
+ $.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);
+ acceptPage.setAll(_data.apply_note);
+ }
+ //console.log(resData);
+ }else {
+ acceptPage.setAll(0);
+ }
+
+ // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
+ for(var i=0; i<resData.length; i++) {
+ var _resData = resData[i];
+ _resData.doThings = '';
+ layuiTbl.updateTr(i, _resData);
+ }
+
+ // 瀹炴椂鍥炶皟
+ updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
+ }
+ });
+ }
+
// 鏋勯�犵粨鏋滈泦
function formaterResData(data) {
@@ -587,6 +732,21 @@
return temp;
}
+
+ // 鑾峰彇寰呴獙鏀剁殑鏈烘埧
+ function getAcceptHome(data) {
+ // 閬嶅巻data
+ var num = 0;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ // 鍒ゆ柇鏄惁琚獙鏀�
+ if(_data.check_en != 1) {
+ num++;
+ }
+ }
+
+ return num;
+ }
});
</script>
</body>
--
Gitblit v1.9.1