From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 489 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 324 insertions(+), 165 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index d8cdde1..4891500 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -33,14 +33,15 @@
padding-right: 8.5em;
}
.hbg{
- background-color:#ddd9;
+ background-color:#ddd;
}
#battdata {
- background-color:#dddddd54
+ background-color:#eee;
}
.ui-select .ui-btn select{
width:77%;
}
+ table tr td{width:1000em;padding-right:1em;}
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -58,30 +59,15 @@
<!-- <div class="set-option"> -->
<table class="layout-set">
<tbody>
- <tr>
- <td>鏈烘埧缂栧彿</td>
- <td>
- <input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>FBS璁惧ID(閲嶈)</td>
- <td>
- <input type="text" id="FBSDeviceId" class="unable" data-mini="true" />
- </td>
- </tr>
- <tr>
- <td>FBS璁惧IP(閲嶈)</td>
- <td>
- <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
- </td>
- </tr>
- <tr>
- <td>鐢垫睜缁処D</td>
- <td>
- <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
- </td>
- </tr>
+
+ <input type="hidden" type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+
+ <input type="hidden" type="text" id="FBSDeviceId" class="unable" data-mini="true" />
+
+ <input type="hidden" type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
+
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
+
<tr>
<td>*鐪�</td>
<td>
@@ -104,7 +90,7 @@
<tr>
<td>*鍖哄幙</td>
<td>
- <select id="county" data-mini="true">
+ <select id="county" data-mini="true">
<option value="">鍏ㄩ儴</option>
</select>
</td>
@@ -112,41 +98,33 @@
<tr>
<td>*鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
-
+ <textarea id="homeName" data-mini="true"></textarea>
</td>
</tr>
-
-
+
<input type="hidden" id="StationName4" data-mini="true" />
-
- <input type="hidden" id="StationIp" 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="BattFloatCurrent" class="unable" data-mini="true" />
- <tr>
+ <!-- <tr>
<td>*鍗曚綋鏁伴噺</td>
<td>
- <!-- <input type="text" id="MonCount" data-mini="true" /> -->
+ <input type="text" id="MonCount" data-mini="true" />
<fieldset data-role="controlgroup" data-type="horizontal">
<label for="four">4 涓�</label>
@@ -173,12 +151,21 @@
</select>
</fieldset>
</td>
- </tr>
+ </tr> -->
<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="fuchongfazhi0" data-mini="true" />
+
+ <input type="hidden" id="fuchongfazhi1" data-mini="true" />
+
+ <input type="hidden" id="lixiandianyafazhi0" data-mini="true" />
+
+ <input type="hidden" id="lixiandianyafazhi1" data-mini="true" />
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
<td>
@@ -187,6 +174,7 @@
</tr>
<input type="hidden" id="DisCurrMax" data-mini="true" />
+ <input type="hidden" id="judgeBatt" data-mini="true" />
<tr>
@@ -197,6 +185,7 @@
</tr>
<input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01 00:00:00" />
+
<input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01 00:00:00" />
<tr>
@@ -209,31 +198,7 @@
</table>
<!-- </div> -->
<div id="battdata">
- <!-- <div>
- <h1 class="hbg">鐢垫睜缁�1</h1>
- <table class="layout-set">
- <tbody>
- <tr>
- <td>璁惧绱㈠紩</td>
- <td>
- <fieldset data-role="controlgroup" data-type="horizontal">
- <select>
- <option value="">0</option>
- <option value="mon">1</option>
- <option value="mon">2</option>
- <option value="mon">3</option>
-
- </select>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td>鐢垫睜缁勫悕绉�</td>
- <td><input type="text" id="" data-mini="true" /></td>
- </tr>
- </tbody>
- </table>
- </div> -->
+
</div>
@@ -271,51 +236,81 @@
function creatBattView(index){
var count=index+1
,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
- '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" id="battproducer" data-type="horizontal">'+'<select>'
+ '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+'id='+'battproducer'+index+'>'
,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
- ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>'
- ,battNum='<tr>'+'<td>'+'鐢垫睜鏁伴噺'+'</td>'+'<td>'+'<input type="text" '+'id='+'battnum'+index+' data-mini="true"'+'value='+'鐢垫睜鏁伴噺'+count+' />'+'</td>'+'</tr>'
- ,nomCap='<tr>'+'<td>'+'鏍囩О瀹归噺'+'</td>'+'<td>'+'<input type="text" '+'id='+'nomCap'+index+' data-mini="true"'+'value='+'鏍囩О瀹归噺'+count+' />'+'</td>'+'</tr>'
+ ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>'
+
+ ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+'>'
+ ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
+
+ ,MonVolStd='<tr>'+'<td>'+'*鏍囩О鍗曚綋鐢靛帇(V)'+'</td>'+'<td>'+'<input type="text" '+'id='+'MonVolStd'+index+' data-mini="true"'+' class="unable" '+'/>'+'</td>'+'</tr>'
+ ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+'>'+creatMonCapOpt()+'</select>'
+ +'</fieldset>'+'</td>'+'</tr>'
,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' />'+'</tr>'
,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
- return battTitle+battBrand+battType+battNum+nomCap+battIndex+battName;
+ return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;
}
+
+
+ function selectedNum(index){
+ var selected='';
+ return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
+ }
- function selectedIndex(index){
+ function selectedIndex(index){
+ /* var selected='',
+ i=0;
+ selected+= '<option '+'value='+'鐞嗗＋'+'>'+'鐞嗗＋'+'</option>';
+ selected+= '<option '+'value='+'鍦ｉ槼'+'>'+'鍦ｉ槼'+'</option>';
+ selected+= '<option '+'value='+'鍙岀櫥'+'>'+'鍙岀櫥'+'</option>';
+ selected+= '<option '+'value='+'SENRY'+'>'+'SENRY'+'</option>';
+ selected+= '<option '+'value='+'鍗楅兘'+'>'+'鍗楅兘'+'</option>';
+ selected+= '<option '+'value='+'鐖遍粯鐢�'+'>'+'鐖遍粯鐢�'+'</option>';
+ selected+= '<option '+'value='+'绉戝＋杈�'+'>'+'绉戝＋杈�'+'</option>';
+ selected+= '<option '+'value='+'閾舵嘲'+'>'+' 閾舵嘲'+'</option>';
+ selected+= '<option '+'value='+'涓版棩'+'>'+' 涓版棩'+'</option>';
+ selected+= '<option '+'value='+'涓叴鑳芥淳'+'>'+' 涓叴鑳芥淳'+'</option>';
+ selected+= '<option '+'value='+'鍏夊畤'+'>'+' 鍏夊畤'+'</option>';
+ selected+= '<option '+'value='+'鑹捐鏂崕杈�'+'>'+'鑹捐鏂崕杈�'+'</option>';
+ selected+= '<option '+'value='+'闆勯煬'+'>'+' 闆勯煬'+'</option>';
+ selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
+ selected+= '<option '+'value='+'鏂囬殕'+'>'+' 鏂囬殕'+'</option>';
+ selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
+ selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>';
+ selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>';
+ selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>';
+ selected+= '<option '+'value='+'鐑界伀'+'>'+' 鐑界伀'+'</option>';*/
+ var battproducer = getCookie("producer");
+ battproducer = JSON.parse(battproducer);
var selected='',
i=0;
- selected+= '<option '+'value='+'鐞嗗＋'+'>'+'鐞嗗＋'+'</option>';
- selected+= '<option '+'value='+'鍦ｉ槼'+'>'+'鍦ｉ槼'+'</option>';
- selected+= '<option '+'value='+'鍙岀櫥'+'>'+'鍙岀櫥'+'</option>';
- selected+= '<option '+'value='+'SENRY'+'>'+'SENRY'+'</option>';
- selected+= '<option '+'value='+'鍗楅兘'+'>'+'鍗楅兘'+'</option>';
- selected+= '<option '+'value='+'鐖遍粯鐢�'+'>'+'鐖遍粯鐢�'+'</option>';
- selected+= '<option '+'value='+'绉戝＋杈�'+'>'+'绉戝＋杈�'+'</option>';
- selected+= '<option '+'value='+'閾舵嘲'+'>'+' 閾舵嘲'+'</option>';
- selected+= '<option '+'value='+'涓版棩'+'>'+' 涓版棩'+'</option>';
- selected+= '<option '+'value='+'涓叴鑳芥淳'+'>'+' 涓叴鑳芥淳'+'</option>';
- selected+= '<option '+'value='+'鍏夊畤'+'>'+' 鍏夊畤'+'</option>';
- selected+= '<option '+'value='+'鑹捐鏂崕杈�'+'>'+'鑹捐鏂崕杈�'+'</option>';
- selected+= '<option '+'value='+'闆勯煬'+'>'+' 闆勯煬'+'</option>';
- selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
- selected+= '<option '+'value='+'鏂囬殕'+'>'+' 鏂囬殕'+'</option>';
- selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
- selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>';
- selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>';
- selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>';
+ for(var i=1;i<battproducer.length;i++){
+ console.info(battproducer[i]);
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
return selected;
}
var temp = getCookie("eleparm");
+ var test=getCookie("eleparm2newbatt");
+ //jifangname = JSON.parse(jifangname);
+ console.info(test);
//console.info(temp);
temp=JSON.parse(temp);
console.info(temp);
- console.info(temp[30]);
- console.info(temp[33]);
- console.info(temp[34]);
- var suoyin = temp[33];
-
- $(function(){creatAllView(suoyin).trigger('create')});
+ //console.info(temp[30]);
+ //console.info(temp[33]);
+ //console.info(temp[34]);
+ var suoyin = temp[33];//鐢垫睜缁勪釜鏁�
+ var Page = {
+ pageSize:20, //姣忛〉鐨勮鏁�
+ pageCurr:1, //褰撳墠椤电爜鏁�
+ pageAll:0,
+ };
+ $(function(){
+ creatAllView(suoyin).trigger('create');
+ creatMonCapOpt(suoyin);
+ });
//椤甸潰鍔犺浇鏃舵煡璇㈢渷
@@ -392,7 +387,7 @@
//console.info(data);
//console.info(data.code);
if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#country");
+ var $Ostation_name1=$("#county");
$Ostation_name1.text("");
var arr = new Array();
for(var i=0;i<data.data.length;i++)
@@ -425,7 +420,7 @@
binf:{
StationName1:$('#mainteArea').val(),
StationName2:$('#city').val(),
- StationName5: $('#country').val(),
+ StationName5: $('#county').val(),
StationName:$('#homeName').val(),
},
};
@@ -436,10 +431,7 @@
$(function () {
- //setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
- creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
+ //creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
installstartdata(temp);
});
@@ -477,8 +469,10 @@
console.info(dev_id);
if(ptn.test(dev_id)) {
var value = Number(RegExp.$1);
- // console.log(value);
+ console.info(value);
+ console.info(Math.floor(value/256));
var intNum = prefixInteger(Math.floor(value/256), 3);
+ console.info(intNum);
var resNum = prefixInteger(value%256, 3);
ip = '127.000.'+intNum+'.'+resNum;
}else {
@@ -488,14 +482,17 @@
return ip;
}
// 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
- function setFloatAndoutLine(monnum) {
- var vol = $('#MonVolStd').val();
- //var monnum = $('#MonCount').val();
+ function setFloatAndoutLine(index) {
+ var monvolstd = "#MonVolStd"+index;
+ var MonCount = "#MonCount" +index;
+ var vol = $(monvolstd).val();
+ var monnum = $(MonCount).val();
var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
- $('#BattFloatCurrent').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
- $('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
+ $("#fuchongfazhi"+index).val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $("#lixiandianyafazhi"+index).val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
+ console.info(vol);
}
/* $('#MonVolStd').change(function(){
@@ -504,10 +501,12 @@
$('#MonCount').change(function(){
setFloatAndoutLine();
})*/
- function prefixInteger(num, length) {
+ /* function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
+ }*/
+ function prefixInteger(num, length) {
+ return (Array(length).join('0') + num).slice(-length);
}
-
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
var data = {
@@ -529,7 +528,7 @@
,BattGroupName: '鐢垫睜缁�1'
,FloatVolLevel: 54
,OfflineVolLevel: 42.9
- ,BattFloatCurrent: 10
+ ,BattFloatCurrent: 5
,MonCount: 24
,MonCapStd: 300
,MonVolStd: 2
@@ -546,6 +545,7 @@
,install_user: 'test'
};
console.info(data.StationId);
+ setMonVolStd(temp.length);
creatgroupid();
document.getElementById("StationId").value = data.StationId;
// document.getElementById("mainteArea").value = data.StationName1;
@@ -567,8 +567,8 @@
document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
//document.getElementById("MonCount").value = data.MonCount;
- document.getElementById("MonCapStd").value = data.MonCapStd;
- document.getElementById("MonVolStd").value = data.MonVolStd;
+ /* document.getElementById("MonCapStd").value = data.MonCapStd;
+ document.getElementById("MonVolStd").value = data.MonVolStd; */
document.getElementById("MonResStd").value = data.MonResStd;
document.getElementById("MonSerStd").value = data.MonSerStd;
document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
@@ -582,11 +582,10 @@
//setTimes($("#startTestrecord"),data.productDate);
//setTimes($("#endTestrecord"),data.useDate);
document.getElementById("install_user").value = data.install_user;
-
- //setFloatAndoutLine();
+ setFloatAndoutLine(1);
+ //setFloatAndoutLine();
}
-
function getUpdateArr(){
mon=$('#MonVolStd').val();
var moncount = 0;
@@ -598,10 +597,10 @@
var arr = new Array();
for(var i=0;i<suoyin;i++){
- setFloatAndoutLine(moncount);
+ setFloatAndoutLine(i);
var battString = "#battname"+i;
var battModel = "#batttype"+i;
- var battproducer ="#battproducer"+i;
+ //var battproducer ="#battproducer"+i;
var id = $('fieldset div div input[data-cacheval=\'true\']').val();
var inputVal = $(id).val();
//var input =$(four).option()
@@ -616,7 +615,7 @@
StationName1 : $("#mainteArea").val(), // 鐪�
StationName2 : $("#city").val(), // 甯�
StationName5 : $("#county").val(), // 鍖�/鍘�
- homeName : $("#homeName").val(), // 鏈烘埧鍚嶇О
+ StationName3 : $("#homeName").val(), // 鏈烘埧鍚嶇О
StationName4 : $("#StationName4").val(), // 璁惧鍚嶇О
StationIp : $("#StationIp").val(), //鏈烘埧ip
FBSDeviceId : $("#FBSDeviceId").val(), //璁惧id
@@ -628,12 +627,12 @@
BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d
BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
BattGroupName : $(battString).val(),
- FloatVolLevel : $("#FloatVolLevel").val(), //娴厖鐢靛帇闃�鍊�
- OfflineVolLevel : $("#OfflineVolLevel").val(), //绂荤嚎鐢靛帇闃�鍊�
+ FloatVolLevel : $("#fuchongfazhi"+i).val(), //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : $("#lixiandianyafazhi"+i).val(), //绂荤嚎鐢靛帇闃�鍊�
BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊�
- MonCount : moncount, //鍗曚綋鏁伴噺
- MonCapStd : $("#MonCapStd").val(), //鏍囩О瀹归噺
- MonVolStd : $("#MonVolStd").val(), //鏍囩О鐢靛帇
+ MonCount :$("#MonCount"+i).val(), //鍗曚綋鏁伴噺
+ MonCapStd : $("#MonCapStd"+i).val(), //鏍囩О瀹归噺
+ MonVolStd : $("#MonVolStd"+i).val(), //鏍囩О鐢靛帇
MonResStd : $("#MonResStd").val(), //鏍囩О鍐呴樆
MonSerStd : $("#MonSerStd").val(), //鏍囩О鐢靛
MonVolLowToAvg : $("#MonVolLowToAvg").val(), //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
@@ -642,10 +641,10 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : battproducer, //鐢垫睜鍝佺墝
+ BattProducer : $("#battproducer"+i).find("option:selected").val(), //鐢垫睜鍝佺墝
BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
- BattProductDate : $("#startTestrecord").val()+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
- BattInUseDate : $("#endTestrecord").val()+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
install_user : $("#install_user").val(), //瀹夎浜哄憳
}
}
@@ -654,7 +653,7 @@
console.info(arr);
return arr;
}
-
+
</script>
<script type="text/javascript">
$(function(){
@@ -665,12 +664,10 @@
$("#sure").click(function(){
if(nullOrn()){
creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
- addBattnew(); //鎻愪氦
-
+ JudegeBattIn();//鎻愪氦鍓嶉獙璇佽鐢垫睜缁勫湪BATTINF琛ㄤ腑鏄惁宸插瓨鍦�
+ //addBattnew(); //鎻愪氦
}else{
} //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
- //function backpage(){window.location.href="ele-param1.html";}
- // setTimeout(backpage,500);
});
$("#cancel").click(function(){
window.location.href="ele-param2.html";
@@ -678,17 +675,41 @@
});
function nullOrn(){
- // if($("#BattFloatCurrent").val()&&$("#MonCapStd").val()){
- return true;
- //}else{
- //alert("*椤逛负蹇呭～椤癸紝涓嶈兘涓虹┖锛岃閲嶆柊杈撳叆");
- //return false;
- // }
+ console.info($("#homeName").val());
+ console.info($("#station_phone").val());
+ if($("#homeName").val!=""&&$("#station_phone").val()!=""&&$("#install_user").val()!=""){
+ return true;
+ }else{
+ alert("璇峰～鍐�*鍐呭");
+ }
+ }
+ function JudegeBattIn(){
+ var battinff ={
+ StationName: ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
+ }
+ console.info(battinff);
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: '../BattInfAction!judgeBatt',
+ data: "json="+JSON.stringify(battinff),
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ console.info(data);
+ if(data.code!=1){
+ addBattnew()
+ }else{
+ alert("璇ユ満鎴垮凡瀛樺湪锛岃杩斿洖淇敼椤甸潰淇敼骞堕噸鏂版彁浜�");
+ SearchParam();
+ }
+ }
+ });
}
function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
- console.info(getUpdateArr());
+ console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
$.ajax({
@@ -702,38 +723,176 @@
console.info(data);
if(data.code==1){
alert("娣诲姞鎴愬姛");
- window.location.href="batt-unapproved.html";
+ window.location.href="batt-unapproved-index.html"
}else{
alert("娣诲姞澶辫触");
- window.location.href="batt-unapproved.html";
+ window.location.href="batt-unapproved-index.html";
}
}
});
}
+ function SearchParam(){
+ var temp = {
+ page:Page,
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#county').val(),
+ StationName: ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
+ },
+ };
+ console.info(temp);
+ searchBattLife(temp);
+ }
+ // 鏌ヨ鍐呭
+ function searchBattLife(temp){
+ //var temp = createSearchParam();
+ var json = JSON.stringify(temp);
+ var num =new Array();
+ var groupId = new Array();
+ var groupName = new Array();
+ var arrdata = new Array();
+ console.info(json);
+ arrTd = new Array();
+ var load;
+ $.ajax({
+ type:"post",
+ url:"BattInfAction!searchInform",
+ async:true,
+ datatype:'text',
+ data:"json="+json,
+ success:function(data){
+ console.info(data);
+ 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(var i=0;i<data.length;i++){
+ arrdata.push(data[i]);//瀛樺偍鏁版嵁
+ }
+ seteditparm(0,arrdata);
+ window.location.href="batt-edit2.html";
+ }else{
+ Page.pageAll = 0;
+ }
+ //createTbl(tblCon, arrTh, arrTd);
+ //getEditButIndex(0);
+ }
+ });
+ }
+
+ function seteditparm(index,arrdata){
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ console.info(arrdata);
+ var arr= creatYanshouObj(arrdata,index);
+ return arr;
+ }else{
+ alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+ }
+ }
- $('input:radio[name="battnum"]').click(function(){
- var $this=$(this)
- , $mon=$('#MonVolStd') ;
- if ($this.attr("checked")) {
-銆�銆�銆�銆�銆�銆� if($this.val()==4){
- $mon.val("12");
-
- };
- if($this.val()==24){$mon.val("2");}
-銆�銆�銆�銆�}
- });
-
- function creatMonCapOpt(){
- var k,optionStr='',allString;
- for(var i=1;i<11;i++){
- k=i*50;
- optionStr+='<option'+' value='+k+'>'+k+'</option>';
- }
- allString=optionStr+'<option'+' value='+1000+'>'+1000+'</option>'
- $("#MonCapStd").html(allString);
+ function creatYanshouObj(arrdata,index){
+ console.info(arrdata[0]);
+ console.info(index);
+ var StationId = arrdata[index].StationId;
+ //console.info(StationId);
+ var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
+ for(var i=0;i<arrdata.length;i++){//涓�娆￠獙鏀惰鏈烘埧涓嬬殑鎵�鏈夌數姹犵粍鏋勫缓瀵硅薄 銆�
+ if(StationId == arrdata[i].StationId){
+ var obj = {
+ binf:{
+ StationId : arrdata[i].StationId, // 鏈烘埧缂栧彿
+ StationName : (arrdata[i].StationName1+"-"+ arrdata[i].StationName2+"-"+arrdata[i].StationName5+"-"+arrdata[i].StationName3), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 :arrdata[i].StationName1, // 鐪�
+ StationName2 : arrdata[i].StationName2, // 甯�
+ StationName5 : arrdata[i].StationName5, // 鍖�/鍘�
+ StationName3 : arrdata[i].StationName3, // 鏈烘埧鍚嶇О
+ StationName4 : arrdata[i].StationName4, // 璁惧鍚嶇О
+ StationIp :arrdata[i].StationIp, //鏈烘埧ip
+ FBSDeviceId : arrdata[i].FBSDeviceId, //璁惧id
+ FbsDeviceIp : arrdata[i].FbsDeviceIp, //璁惧ip
+ FbsDeviceIp_YM : arrdata[i].FbsDeviceIp_YM, // 璁惧鎺╃爜
+ FbsDeviceIp_WG : arrdata[i].FbsDeviceIp_WG , // 缃戝叧
+ FBSDeviceName : arrdata[i].FBSDeviceName, //璁惧鍚嶇О
+ GroupIndexInFBSDevice : arrdata[i].GroupIndexInFBSDevice, //fbs璁惧绱㈠紩
+ BattGroupId : arrdata[i].BattGroupId, //鐢垫睜缁刬d
+ BattGroupNum : arrdata[i].BattGroupNum , //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName :arrdata[i].BattGroupName, //鐢垫睜缁勭储寮�
+ FloatVolLevel : arrdata[i].FloatVolLevel, //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : arrdata[i].OfflineVolLevel, //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : arrdata[i].BattFloatCurrent, //娴厖鐢垫祦闃�鍊�
+ MonCount : arrdata[i].MonCount, //鍗曚綋鏁伴噺
+ MonCapStd : arrdata[i].MonCapStd, //鏍囩О瀹归噺
+ MonVolStd : arrdata[i].MonVolStd, //鏍囩О鐢靛帇
+ MonResStd : arrdata[i].MonResStd, //鏍囩О鍐呴樆
+ MonSerStd : arrdata[i].MonSerStd, //鏍囩О鐢靛
+ MonVolLowToAvg : arrdata[i].MonVolLowToAvg, //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : arrdata[i].Load_curr, //璐熻浇鐢垫祦
+ DisCurrMax : arrdata[i].DisCurrMax, //鏈�澶ф牳瀹圭數娴�
+ station_phone : arrdata[i].station_phone, //鍩虹珯鍙风爜
+
+ BattProducer : arrdata[i].BattProducer, //鐢垫睜鍝佺墝
+ BattModel : arrdata[i].BattModel, //鐢垫睜鍨嬪彿
+ BattProductDate : arrdata[i].BattProductDate, //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : arrdata[i].BattInUseDate, //鐢垫睜浣跨敤鏃ユ湡
+ install_user : arrdata[i].install_user, //瀹夎浜哄憳
+ }
+ }
+ arr.push(obj);
+ }
+ }
+ console.info(arr);
+ //applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+ var json=window.JSON.stringify(arr);
+ setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ return arr;
+ }
+
+ function creatMonCapOpt(suoyin){
+ var k,optionStr='',allString
+ for(var i=1;i<11;i++){
+ k=i*50;
+ //optionStr+='<option'+' value='+k+'>'+k+'</option>';
+ optionStr+='<option'+' value='+k+'>'+k+'</option>';
+ }
+ return allString=optionStr+'<option'+' selected = selected '+' value='+1000+'>'+1000+'</option>';
}
- creatMonCapOpt();
+
+ function getRadioValue(na){
+ var str='input[name='+na+']:checked'
+ return $(str).val();
+ }
+ function setRadioSeleted(v){
+ var str='input:radio[value='+v+']';
+ return $(str).attr('checked','true');
+ }
+
+ function setchangedMonVolStd(suoyin){
+ for(var u=0;u<suoyin;u++){
+ var id='';
+ id='#MonCount'+u;
+ (function(u){
+ var vol='#MonVolStd'+u;
+ $(document).on("change", id, function () {
+ if($(this).find("option:selected").val()==4){$(vol).val(12);}
+ if($(this).find("option:selected").val()==24){$(vol).val(2);}
+ })
+ })(u)
+ }
+ }
+ setchangedMonVolStd(suoyin);
+ function setMonVolStd(index){
+ for(var i=0;i<index;i++){
+ var s='#MonVolStd'+i;
+ $(s).val(12);
+ }
+ }
+
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
鎿嶄綔澶辫触
--
Gitblit v1.9.1