From 4be62c8c88eba0e3474890abf868fc88a0b61865 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@192.168.10.3>
Date: 星期四, 27 十二月 2018 17:58:54 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-approved1.html | 86 +++++++-----------------------------------
1 files changed, 15 insertions(+), 71 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index d765458..5c78db4 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -122,7 +122,9 @@
<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" />
@@ -134,7 +136,9 @@
<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>
@@ -270,13 +274,7 @@
}
return $('#newbattnum').html(selected);
}
-
- /* $("#sure").on('click',function(){
- console.info($('#newbattnum').val());
- setcookieCreat($('#newbattnum').val());
- window.location.href="batt-infor-conf-temp1.html";
- });*/
-
+
function creatBattView(index){
var count=index+1
,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
@@ -293,12 +291,11 @@
return battTitle+battBrand+battType+battNum+battNumOpt+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>';
}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>';
}
}
@@ -315,7 +312,7 @@
}
return selected;
}
- var temp = getCookie("eleparm");
+ var temp = getCookie("eleparm1");
temp=JSON.parse(temp);
var arr = temp;
@@ -326,7 +323,7 @@
//console.info(temp);
console.info(arrdata);
var json = JSON.stringify(arrdata);
- setCookie("eleparm",json);
+ setCookie("batt",json);
window.location.href="control.html";
}
// 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘
@@ -373,8 +370,8 @@
var lixiandianyafazhi = [0,0,0,0];
battnumber();
$(function(){
- creatAllView(temp.length).trigger('create');
- setMonVolStd(temp.length);
+ creatAllView(temp.length).trigger('create');
+ setMonVolStd(temp.length);
});
$(function () {
@@ -383,51 +380,6 @@
installstartdata(temp);
});
-
- function creatgroupid(){
- var dev_id ='';
- $.ajax({
- type: 'post'
- ,async: true
- ,url: 'BattInfAction!searchmaxdev_id'
- ,data: null
- ,dataType: 'json'
- ,success:function(res) {
- console.info(res);
- var data = JSON.parse(res.result);
- console.info(data);
- if(data.length!=0){
- data = data.data;
- dev_id = data;
- //console.info(dev_id);
- document.getElementById("FBSDeviceId").value = dev_id;
- var ip = getDevIp(dev_id);
- //console.info(ip);
- document.getElementById("FbsDeviceIp").value = ip;
- }else{
- alert("groupid鐢熸垚澶辫触");
- }
- }
-
- });
- }
- // 鏍规嵁璁惧id璁＄畻璁惧ip
- function getDevIp(dev_id) {
- var ptn = /^91([0-9]{7})$/;
- var ip = '';
- console.info(dev_id);
- if(ptn.test(dev_id)) {
- var value = Number(RegExp.$1);
- // console.log(value);
- var intNum = prefixInteger(Math.floor(value/256), 3);
- var resNum = prefixInteger(value%256, 3);
- ip = '127.000.'+intNum+'.'+resNum;
- }else {
- ip = '璁惧ID鏍煎紡涓嶆纭�';
- }
- console.info(ip);
- return ip;
- }
function applyendyanshou(arr){ //鐢宠楠屾敹
var temp = JSON.stringify(arr);
@@ -463,11 +415,7 @@
console.info(vol);
}
-
- function prefixInteger(num, length) {
- return (num/Math.pow(3,length)).toFixed(length).substr(2);
- }
-
+
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
data=temp[0].binf;
@@ -638,7 +586,7 @@
$("#sure").click(function(){
console.info($('#newbattnum').val());
setcookieCreat($('#newbattnum').val());
- window.location.href="batt-infor-conf-temp1.html";
+ //window.location.href="control.html";
});
});
@@ -750,10 +698,7 @@
k=i*50;
//optionStr+='<option'+' value='+k+'>'+k+'</option>';
- optionStr+='<option'+' value='+k+'>'+k+'</option>';
-
-
-
+ optionStr+='<option'+' value='+k+'>'+k+'</option>';
}
allString=optionStr+'<option'+' selected=selected '+' value='+1000+'>'+1000+'</option>'
return allString;
@@ -778,8 +723,7 @@
for(var i=0;i<index;i++){
var s='#MonVolStd'+i;
$(s).val(12);
- }
-
+ }
}
/* 鎿嶄綔鎴愬姛
--
Gitblit v1.9.1