From 5aed493f469ca89a5c218e087cd2b93a10843b83 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期三, 12 十二月 2018 17:13:06 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-approved.html | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 00e7bf0..9389868 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -179,6 +179,76 @@
searchBattLife();
});
+
+ function getcreatArr(){
+ obj = {
+ apply_en : 1,
+ binf : {
+ page:Page,
+ }
+ }
+ return obj;
+ }
+ // 鏌ヨ鍐呭
+ function searchBattLife(){
+ var temp = JSON.stringify(getcreatArr());
+ console.info(temp);
+ arrTd = new Array();
+ var index = 0;
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!serchByInfo',
+ data: "json="+temp,
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ if(data.code!=0&&data.data.length>0){
+ data=data.data
+ console.info(data);
+ for(var i=0;i<data.length;i++){
+ arrTd[index++] = data[i].binf.StationId;
+ arrTd[index++] = data[i].binf.StationName1;
+ arrTd[index++] = data[i].binf.StationName2;
+ arrTd[index++] = data[i].binf.StationName5;
+ arrTd[index++] = data[i].binf.StationName3;
+ arrTd[index++] = data[i].binf.StationName4;
+ arrTd[index++] = data[i].binf.StationIp;
+ arrTd[index++] = data[i].binf.FBSDeviceId;
+ arrTd[index++] = data[i].binf.FbsDeviceIp;
+ arrTd[index++] = data[i].binf.FbsDeviceIp_YM;
+ arrTd[index++] = data[i].binf.FbsDeviceIp_WG;
+ arrTd[index++] = data[i].binf.FBSDeviceName;
+ arrTd[index++] = data[i].binf.GroupIndexInFBSDevice;
+ arrTd[index++] = data[i].binf.BattGroupId;
+ arrTd[index++] = data[i].binf.BattGroupNum;
+ arrTd[index++] = data[i].binf.BattGroupName;
+ arrTd[index++] = data[i].binf.FloatVolLevel;
+ arrTd[index++] = data[i].binf.OfflineVolLevel;
+ arrTd[index++] = data[i].binf.BattFloatCurrent;
+ arrTd[index++] = data[i].binf.MonCount;
+ arrTd[index++] = data[i].binf.MonCapStd;
+ arrTd[index++] = data[i].binf.MonVolStd;
+ arrTd[index++] = data[i].binf.MonResStd;
+ arrTd[index++] = data[i].binf.MonSerStd;
+ arrTd[index++] = data[i].binf.MonVolLowToAvg;
+ arrTd[index++] = data[i].binf.Load_curr;
+ arrTd[index++] = data[i].binf.DisCurrMax;
+ arrTd[index++] = data[i].binf.station_phone;
+ arrTd[index++] = data[i].binf.BattProducer;
+ arrTd[index++] = data[i].binf.BattModel;
+ arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);
+ arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
+ arrTd[index++] = data[i].binf.install_user;
+ arrTd[index++] = "";
+ arrTd[index++] = arrTd[i]='<a href="" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+ }
+ }
+ createTbl(tblCon, arrTh, arrTd);
+ }
+ });
+ }
+
function setcookiedit(index){
var arrcookie = new Array();
for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
@@ -213,13 +283,13 @@
setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
}
- // 鏌ヨ鍐呭
+/* // 鏌ヨ鍐呭
function searchBattLife(){
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- 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="" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
@@ -234,7 +304,8 @@
createTbl(tblCon, arrTh, arrTd);
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- }
+ //}
+
function getUpdateArr(temp){
var arr = new Array();
var obj = new Object();
--
Gitblit v1.9.1