From c6457657e21adb5d6728e30a0a1adea58412d6cd Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 29 十一月 2018 11:41:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/ele-param.html | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 insertions(+), 26 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param.html b/gx_tieta/WebRoot/mobil/ele-param.html
index b1221f2..386bb72 100644
--- a/gx_tieta/WebRoot/mobil/ele-param.html
+++ b/gx_tieta/WebRoot/mobil/ele-param.html
@@ -85,8 +85,8 @@
}
.operat-but{
margin: 0;
- padding-top: 0.7em;
- padding-bottom: 0.7em;
+ padding-top: 0.1em;
+ padding-bottom: 0.1em;
}
</style>
<link rel="stylesheet" href="css/fgpanel.css">
@@ -152,9 +152,9 @@
</div>
<div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">
<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
- <a href="batt-infor-conf-temp.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a>
+ <a href="" id="edit" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a>
- <a href="batt-infor-delete.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
+ <a href="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
</div>
</div>
</body>
@@ -173,13 +173,15 @@
var arr=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
var tblCon = $('.tbl-container');
var Page = {
- pageSize:10, //姣忛〉鐨勮鏁�
+ pageSize:20, //姣忛〉鐨勮鏁�
pageCurr:1, //褰撳墠椤电爜鏁�
pageAll:0,
};
$('document').ready(function(){panel.show();});
-
+ $("#edit").click(function(){
+ window.location.href="batt-infor-conf-temp.html";
+ });
var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','閰嶇疆鎿嶄綔'];
dataArr = [];
var startTime = "1980-01-01";
@@ -199,44 +201,78 @@
function searchBattLife(){
var temp = createSearchParam();
var json = JSON.stringify(temp);
+ console.info(json);
arrTd = new Array();
var load;
- /*if() {
- load = layer.load(1);
- }*/
$.ajax({
type:"post",
- url:"",
+ url:"BattInfAction!searchInform",
async:true,
- datatype:'json',
+ datatype:'text',
data:"json="+json,
success:function(data){
//console.info(data);
- //var data = JSON.parse(data.result);
+ var data = JSON.parse(data.result);
//layer.close(load);
+ console.info(data);
if(data.code==1&&data.data.length>0){
data=data.data;
var index = 0;
var ArryTb= new Array();
for(i=0;i<data.length;i++){
- arrTd[index++]=data[i].deviceId;
- arrTd[index++]=data[i].stationName;
- arrTd[index++]=data[i].real_cap;
-
- //arrTd[index++]=data[i].is_out_stand;
+ arrTd.push(data[i].StationId); //鏈烘埧缂栧彿
+ arrTd.push(data[i].StationName1); // 鐪�
+ arrTd.push(data[i].StationName2); // 甯�
+ arrTd.push(data[i].StationName5); // 鍖�/鍘�
+ arrTd.push(data[i].StationName3); //鏈烘埧鍚嶇О
+ arrTd.push(data[i].StationName4); //璁惧鍚嶇О
+ arrTd.push(data[i].StationIp); //鏈烘埧ip
+ arrTd.push(data[i].FBSDeviceId); //FBS璁惧ID
+ arrTd.push(data[i].FbsDeviceIp); //FBS璁惧IP
+ arrTd.push(data[i].FbsDeviceIp_YM); //瀛愮綉鎺╃爜
+ arrTd.push(data[i].FbsDeviceIp_WG); //缃戝叧
+ arrTd.push(data[i].FBSDeviceName); //FBS璁惧鍚嶇О
+ arrTd.push(data[i].GroupIndexInFBSDevice); //FBS璁惧绱㈠紩
+ arrTd.push(data[i].BattGroupId); //鐢垫睜缁処D
+ arrTd.push(data[i].BattGroupNum); //鏈烘埧鍐呯數姹犵粍缂栧彿
+ arrTd.push(data[i].BattGroupName); //鐢垫睜缁勫悕绉�
+ arrTd.push(data[i].FloatVolLevel); //娴厖鐢靛帇闃�鍊�
+ arrTd.push(data[i].OfflineVolLevel); //绂荤嚎鐢靛帇闃�鍊�
+ arrTd.push(data[i].BattFloatCurrent); //娴厖闃�鍊�
+ arrTd.push(data[i].MonCount); //鍗曚綋鏁伴噺
+ arrTd.push(data[i].MonCapStd); //鏍囩О瀹归噺
+ arrTd.push(data[i].MonVolStd); //鏍囩О鍗曚綋鐢靛帇
+ arrTd.push(data[i].MonResStd); //鏍囩О鍗曚綋鍐呴樆
+ arrTd.push(data[i].MonSerStd); //鏍囩О鍗曚綋鐢靛
+ arrTd.push(data[i].MonVolLowToAvg); //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ arrTd.push(data[i].Load_curr); //璐熻浇鐢垫祦
+ arrTd.push(data[i].DisCurrMax); //鏈�澶ф牳瀹圭數娴�
+ arrTd.push(data[i].station_phone); //鍩虹珯鎵嬫満鍙风爜
+
+
+ arrTd.push(data[i].BattProducer); //鐢垫睜鍝佺墝
+ arrTd.push(data[i].BattModel); //鐢垫睜鍨嬪彿
+ arrTd.push(data[i].BattProductDate.substr(0,10)); //鐢垫睜鐢熶骇鏃ユ湡
+ arrTd.push(data[i].BattInUseDate.substr(0,10)); //鎶曞叆浣跨敤鏃ユ湡
+ arrTd.push(data[i].install_user); // 璁惧瀹夎浜哄憳
+ /* arrTd.push("");
+ arrTd.push("");
+ arrTd.push(model.data[i].StationId_ex); //鎶曞叆浣跨敤鏃ユ湡 */
+ arrTd.push('<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >淇敼鎴栧垹闄�</a>');
+ Page.pageAll = data[i].num;
}
- Page.pageAll = data[data.length-1].page.pageAll;
+
}else{
Page.pageAll = 0;
}
- setPage();
- //console.info(Page.pageAll);
+ setPage();
createTbl(tblCon, arrTh, arrTd);
}
});
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- for(i=0;i<340;i++){
+ /*for(i=0;i<340;i++){
if(i%34==33){
//<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
arrTd[i]='<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >淇敼鎴栧垹闄�</a>';
@@ -448,11 +484,12 @@
function createSearchParam(){
var temp = {
page:Page,
- stationName1:$('#mainteArea').val(),
- stationName2:$('#city').val(),
- stationName5: $('#country').val(),
- stationName:$('#homeName').val(),
-
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#country').val(),
+ StationName:$('#homeName').val(),
+ },
};
console.info(temp);
return temp;
--
Gitblit v1.9.1