From bd0ed3754ae7fbe9ca732c396395292104c5e947 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期三, 02 一月 2019 12:33:36 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-approved1.html | 92 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 33 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 2ac7815..1c7d0ff 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -112,29 +112,29 @@
</tr>
- <input type="hidden" id="StationName4" data-mini="true" />
-
- <input type="hidden" id="StationIp" data-mini="true" />
-
- <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
-
- <input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/>
-
- <input type="hidden" id="FBSDeviceName" data-mini="true" />
-
- <input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
-
- <input type="hidden" id="FloatVolLevel" data-mini="true" />
-
- <input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
+ <input type="hidden" id="StationName4" data-mini="true" />
+
+ <input type="hidden" id="StationIp" data-mini="true" />
+
+ <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
- <input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
+ <input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/>
+
+ <input type="hidden" id="FBSDeviceName" data-mini="true" />
+
+ <input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
- <input type="hidden" id="MonResStd" data-mini="true" />
-
- <input type="hidden" id="MonSerStd" data-mini="true" />
-
- <input type="hidden" id="MonVolLowToAvg" data-mini="true" />
+ <input type="hidden" id="FloatVolLevel" data-mini="true" />
+
+ <input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
+
+ <input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
+
+ <input type="hidden" id="MonResStd" data-mini="true" />
+
+ <input type="hidden" id="MonSerStd" data-mini="true" />
+
+ <input type="hidden" id="MonVolLowToAvg" data-mini="true" />
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
@@ -292,11 +292,11 @@
return battTitle+battBrand+battType+battNum+MonVolStd+nomCap+battIndex+battName;
}
function selectedNum(index){
- var selected='';
+ var selected='';
if(temp[index].binf.MonCount==4){
- return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
+ return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
}else{
- return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
+ return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
}
}
@@ -322,8 +322,6 @@
console.info(i)
//var index=Math.ceil(i-1);
arrdata = temp[i].binf;
- //console.info(index);
- //console.info(temp);
console.info(arrdata);
var json = JSON.stringify(arrdata);
setCookie("batt",json);
@@ -369,8 +367,8 @@
console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
var moncount = 0;
- var fuchongfazhi = [0,0,0,0];
- var lixiandianyafazhi = [0,0,0,0];
+ //var fuchongfazhi = [0,0,0,0];
+ //var lixiandianyafazhi = [0,0,0,0];
battnumber();
$(function(){
creatAllView(temp.length).trigger('create');
@@ -380,16 +378,44 @@
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
-
- installstartdata(temp);
- diubao();
+
+ installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
+ diubao();//鍒濆涓㈠寘鐜�
+ updateinstalldata(temp);//瀹炴椂鏇存柊楠屾敹鐘舵��
timeer = window.setTimeout(function() {
- diubao();
+ diubao();
+ updateinstalldata(temp);
}, 4000); //涓㈠寘鐜囷紝閫氫俊璁℃暟锛�4绉掑埛鏂�1娆°��
//4绉掑埛鏂颁竴娆￠〉闈�
});
+ function updateinstalldata(temp){
+ //console.info(temp);
+ var data=temp[0].binf.StationId;
+ var _data ={ binf:{
+ StationId:data
+ }
+ }
+ data=JSON.stringify(_data);
+ //console.info(data);
+ $.ajax({ //鐢宠楠屾敹
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!serchById',
+ data: "json="+data,
+ dataType: 'json',
+ success:function(data) {
+
+ data = JSON.parse(data.result);
+ console.info(data);
+ if(data.code==1&&data.data.length>0){
+ data = data.data;
+ //console.info(data[0].check_en);
+ document.getElementById("check_en").value = yanshou(data[0].check_en);
+ }
+ }
+ });
+ }
function applyendyanshou(arr){ //鐢宠楠屾敹
var temp = JSON.stringify(arr);
$.ajax({ //鐢宠楠屾敹
--
Gitblit v1.9.1