From 2f967bc373b23a48ff986a965155361a70bd2eb0 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期五, 04 一月 2019 15:40:25 +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 | 553 +++++++++++++++++++++---------------------------------
1 files changed, 218 insertions(+), 335 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index b0e55d7..20a59c3 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -33,10 +33,10 @@
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%;
@@ -58,32 +58,17 @@
<!-- <div class="set-option"> -->
<table class="layout-set">
<tbody>
+
+ <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>
- <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>
- <tr>
- <td>鐪�</td>
+ <td>*鐪�</td>
<td>
<select id="mainteArea" data-mini="true">
<option value="">鍏ㄩ儴</option>
@@ -94,7 +79,7 @@
</td>
</tr>
<tr>
- <td>鍩庡競</td>
+ <td>*鍩庡競</td>
<td>
<select id="city" data-mini="true">
<option value="">鍏ㄩ儴</option>
@@ -102,58 +87,44 @@
</td>
</tr>
<tr>
- <td>鍖哄幙</td>
+ <td>*鍖哄幙</td>
<td>
- <select id="country" data-mini="true">
+ <select id="county" data-mini="true">
<option value="">鍏ㄩ儴</option>
</select>
</td>
</tr>
<tr>
- <td>鏈烘埧鍚嶇О</td>
+ <td>*鏈烘埧鍚嶇О</td>
<td>
<input type="text" id="homeName" data-mini="true">
</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>
@@ -162,12 +133,11 @@
<input type="radio" name="battnum" id="twentyfour" value="24">
</fieldset>
-
-
+
</td>
</tr>
<tr>
- <td>鏍囩О鍗曚綋鐢靛帇(V)</td>
+ <td>*鏍囩О鍗曚綋鐢靛帇(V)</td>
<td>
<input type="text" id="MonVolStd" class="unable" data-mini="true" />
</td>
@@ -181,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>
@@ -198,15 +177,15 @@
<tr>
- <td>鍩虹珯鐢佃瘽鍙风爜</td>
+ <td>*鍩虹珯鐢佃瘽鍙风爜</td>
<td>
<input type="text" id="station_phone" data-mini="true" />
</td>
</tr>
- <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01" />
+ <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" />
+ <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01 00:00:00" />
<tr>
<td>*瀹夎浜哄憳</td>
@@ -218,31 +197,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>
@@ -280,26 +235,50 @@
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" 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;
- for(i=0;i<4;i++){
- if(i==index){selected+='<option '+'value='+i+' selected'+'>'+'鐢垫睜鍝佺墝'+i+'</option>';continue;}
- selected+='<option value='+i+'>'+'鐢垫睜鍝佺墝'+i+'</option>';
-
- }
-
+ 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>';
return selected;
}
var temp = getCookie("eleparm");
@@ -310,8 +289,12 @@
console.info(temp[33]);
console.info(temp[34]);
var suoyin = temp[33];
-
- $(function(){creatAllView(suoyin).trigger('create')});
+ var fuchongfazhi = [0,0,0,0];
+ var lixiandianyafazhi = [0,0,0,0];
+ $(function(){
+ creatAllView(suoyin).trigger('create');
+ creatMonCapOpt(suoyin);
+ });
//椤甸潰鍔犺浇鏃舵煡璇㈢渷
@@ -322,19 +305,12 @@
var $Ostation_name1=$("#mainteArea");
$Ostation_name1.text("");
var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
+ for(var i=0;i<data.data.length;i++)
{
- if(i == 0){
- arr.push({
- val:"",
- txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName1,
- txt:data.data[i-1].StationName1,
- });
- }
+ arr.push({
+ val:data.data[i].StationName1,
+ txt:data.data[i].StationName1,
+ });
}
updataSel($Ostation_name1, arr);
}
@@ -362,19 +338,12 @@
var $Ostation_name1=$("#city");
$Ostation_name1.text("");
var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName2,
- txt:data.data[i-1].StationName2,
- });
- }
+ for(var i=0;i<data.data.length;i++)
+ {
+ arr.push({
+ val:data.data[i].StationName2,
+ txt:data.data[i].StationName2,
+ });
}
updataSel($Ostation_name1, arr);
}
@@ -402,22 +371,15 @@
//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++)
+ for(var i=0;i<data.data.length;i++)
{
- if(i == 0){
- arr.push({
- val:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName5,
- txt:data.data[i-1].StationName5,
- });
- }
+ arr.push({
+ val:data.data[i].StationName5,
+ txt:data.data[i].StationName5,
+ });
}
updataSel($Ostation_name1, arr);
}
@@ -442,7 +404,7 @@
binf:{
StationName1:$('#mainteArea').val(),
StationName2:$('#city').val(),
- StationName5: $('#country').val(),
+ StationName5: $('#county').val(),
StationName:$('#homeName').val(),
},
};
@@ -455,13 +417,8 @@
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
- console.info()
- if(temp[34]!="edit")
- {
- //console.warn("sssss")
- creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D
- }else{
- }
+
+ //creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
installstartdata(temp);
});
@@ -499,8 +456,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 {
@@ -510,29 +469,33 @@
return ip;
}
// 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
- function setFloatAndoutLine() {
- 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(){
+ /* $('#MonVolStd').change(function(){
setFloatAndoutLine();
});
$('#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){
-
+ function installstartdata(temp){
var data = {
StationId: '4011100'
,StationName1: '骞胯タ鐪�'
@@ -552,7 +515,7 @@
,BattGroupName: '鐢垫睜缁�1'
,FloatVolLevel: 54
,OfflineVolLevel: 42.9
- ,BattFloatCurrent: 10
+ ,BattFloatCurrent: 5
,MonCount: 24
,MonCapStd: 300
,MonVolStd: 2
@@ -566,10 +529,10 @@
,BattModel: ''
,productDate: '2018-09-18 00:00:00'
,useDate: '2018-09-18 00:00:00'
- ,install_user: '鍛靛懙'
+ ,install_user: 'test'
};
console.info(data.StationId);
- if(temp[34]!="edit"){
+ setMonVolStd(temp.length);
creatgroupid();
document.getElementById("StationId").value = data.StationId;
// document.getElementById("mainteArea").value = data.StationName1;
@@ -579,7 +542,7 @@
document.getElementById("StationName4").value = data.StationName4; //璁惧鍚嶇О
document.getElementById("StationIp").value = data.StationIp; //璁惧IP
//document.getElementById("FBSDeviceId").value = dev_id;
- document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
+ // document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
@@ -587,70 +550,48 @@
document.getElementById("BattGroupId").value = data.BattGroupId;
document.getElementById("BattGroupNum").value = data.BattGroupNum;
//document.getElementById("BattGroupName").value = temp[15];
- // document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
- // 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("FloatVolLevel").value = data.FloatVolLevel;
+ 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("MonResStd").value = data.MonResStd;
document.getElementById("MonSerStd").value = data.MonSerStd;
document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
- // document.getElementById("Load_curr").value = data.Load_curr;
+ document.getElementById("Load_curr").value = data.Load_curr;
document.getElementById("DisCurrMax").value = data.DisCurrMax;
- // document.getElementById("station_phone").value = data.station_phone;
- // document.getElementById("BattProducer").value = data.BattProducer;
- // document.getElementById("BattModel").value = data.BattModel;
- //document.getElementById("startTestrecord").value = temp[30];
- //document.getElementById("endTestrecord").value = temp[31];
+ document.getElementById("station_phone").value = data.station_phone;
+ //document.getElementById("BattProducer").value = data.BattProducer;
+ //document.getElementById("BattModel").value = data.BattModel;
+ document.getElementById("startTestrecord").value = data.productDate;
+ document.getElementById("endTestrecord").value = data.useDate;
//setTimes($("#startTestrecord"),data.productDate);
//setTimes($("#endTestrecord"),data.useDate);
- // document.getElementById("install_user").value = data.install_user;
- }else{
- document.getElementById("StationId").value = temp[0];
- document.getElementById("mainteArea").value = temp[1];
- document.getElementById("city").value = temp[2]; //甯�
- document.getElementById("county").value = temp[3]; //鍖哄幙
- document.getElementById("homeName").value = temp[4]; //鏈烘埧鍚嶇О
- document.getElementById("StationName4").value = temp[5]; //璁惧鍚嶇О
- document.getElementById("StationIp").value = temp[6]; //璁惧IP
- document.getElementById("FBSDeviceId").value = temp[7];
- document.getElementById("FbsDeviceIp").value = temp[8];
- document.getElementById("FbsDeviceIp_YM").value = temp[9];
- document.getElementById("FbsDeviceIp_WG").value = temp[10];
- document.getElementById("FBSDeviceName").value = temp[11];
- //document.getElementById("GroupIndexInFBSDevice").value = temp[12];
- document.getElementById("BattGroupId").value = temp[13];
- document.getElementById("BattGroupNum").value = suoyin;
- //document.getElementById("BattGroupName").value = temp[15];
- document.getElementById("FloatVolLevel").value = temp[16];
- document.getElementById("OfflineVolLevel").value = temp[17];
- document.getElementById("BattFloatCurrent").value = temp[18];
- document.getElementById("MonCount").value = temp[19];
- document.getElementById("MonCapStd").value = temp[20];
- document.getElementById("MonVolStd").value = temp[21];
- document.getElementById("MonResStd").value = temp[22];
- document.getElementById("MonSerStd").value = temp[23];
- document.getElementById("MonVolLowToAvg").value = temp[24];
- document.getElementById("Load_curr").value = temp[25];
- document.getElementById("DisCurrMax").value = temp[26];
- document.getElementById("station_phone").value = temp[27];
- document.getElementById("BattProducer").value = temp[28];
- document.getElementById("BattModel").value = temp[29];
- //document.getElementById("startTestrecord").value = temp[30];
- //document.getElementById("endTestrecord").value = temp[31];
- setTimes($("#startTestrecord"),temp[30]);
- setTimes($("#endTestrecord"),temp[31]);
- document.getElementById("install_user").value = temp[32];
- }
- setFloatAndoutLine();
+ document.getElementById("install_user").value = data.install_user;
+ setFloatAndoutLine(1);
+ //setFloatAndoutLine();
}
- // 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
function getUpdateArr(){
+ mon=$('#MonVolStd').val();
+ var moncount = 0;
+ if(mon==12){
+ moncount=4;
+ }else if(mon==2){
+ moncount==24;
+ }
var arr = new Array();
+
for(var i=0;i<suoyin;i++){
+ setFloatAndoutLine(i);
var battString = "#battname"+i;
+ var battModel = "#batttype"+i;
+ //var battproducer ="#battproducer"+i;
+ var id = $('fieldset div div input[data-cacheval=\'true\']').val();
+ var inputVal = $(id).val();
+ //var input =$(four).option()
+ console.info(inputVal)
var index = String(i);
console.info(battString);
var obj = {
@@ -661,7 +602,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
@@ -673,12 +614,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").val(), //鍗曚綋鏁伴噺
- 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(), //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
@@ -687,10 +628,10 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : $("#BattProducer").val(), //鐢垫睜鍝佺墝
- BattModel : $("#BattModel").val(), //鐢垫睜鍨嬪彿
- BattProductDate : $("#startTestrecord").val()+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
- BattInUseDate : $("#endTestrecord").val()+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ BattProducer : $("#battproducer"+i).find("option:selected").val(), //鐢垫睜鍝佺墝
+ BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
+ BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
install_user : $("#install_user").val(), //瀹夎浜哄憳
}
}
@@ -699,71 +640,19 @@
console.info(arr);
return arr;
}
-
- function getUpdateArredit(){
- var arr = new Array();
- for(var i=0;i<suoyin;i++){
- var battString = "#battname"+i;
- var index = String(i);
- console.info(battString);
- var obj = {
- StationId : $("#StationId").val(), // 鏈烘埧缂栧彿
- StationName : ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
- StationName1 : $("#mainteArea").val(), // 鐪�
- StationName2 : $("#city").val(), // 甯�
- StationName5 : $("#county").val(), // 鍖�/鍘�
- homeName : $("#homeName").val(), // 鏈烘埧鍚嶇О
- StationName4 : $("#StationName4").val(), // 璁惧鍚嶇О
- StationIp : $("#StationIp").val(), //鏈烘埧ip
- FBSDeviceId : $("#FBSDeviceId").val(), //璁惧id
- FbsDeviceIp : $("#FbsDeviceIp").val(), //璁惧ip
- FbsDeviceIp_YM : $("#FbsDeviceIp_YM").val(), // 璁惧鎺╃爜
- FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(), // 缃戝叧
- FBSDeviceName : $("#FBSDeviceName").val(), //璁惧鍚嶇О
- GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
- BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d
- BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
- BattGroupName : $(battString).val(),
- FloatVolLevel : $("#FloatVolLevel").val(), //娴厖鐢靛帇闃�鍊�
- OfflineVolLevel : $("#OfflineVolLevel").val(), //绂荤嚎鐢靛帇闃�鍊�
- BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊�
- MonCount : $("#MonCount").val(), //鍗曚綋鏁伴噺
- MonCapStd : $("#MonCapStd").val(), //鏍囩О瀹归噺
- MonVolStd : $("#MonVolStd").val(), //鏍囩О鐢靛帇
- MonResStd : $("#MonResStd").val(), //鏍囩О鍐呴樆
- MonSerStd : $("#MonSerStd").val(), //鏍囩О鐢靛
- MonVolLowToAvg : $("#MonVolLowToAvg").val(), //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
-
- Load_curr : $("#Load_curr").val(), //璐熻浇鐢垫祦
- DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
- station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
-
- BattProducer : $("#BattProducer").val(), //鐢垫睜鍝佺墝
- BattModel : $("#BattModel").val(), //鐢垫睜鍨嬪彿
- BattProductDate : $("#startTestrecord").val()+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
- BattInUseDate : $("#endTestrecord").val()+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
- install_user : $("#install_user").val(), //瀹夎浜哄憳
- }
- arr.push(obj);
- }
- console.info(arr);
- return arr;
- }
+
</script>
<script type="text/javascript">
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$(function(){
- alert(333);
+ // alert(333);
})
$("#sure").click(function(){
- if(nullOrn()){
- if(temp[34]!="edit"){
- creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
- addBattnew(); //鎻愪氦
- }else{
- addBattnew();
- }
+ if(nullOrn()){
+ creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
+ addBattnew(); //鎻愪氦
+
}else{
} //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
//function backpage(){window.location.href="ele-param1.html";}
@@ -775,16 +664,17 @@
});
function nullOrn(){
- if($("#BattFloatCurrent").val()&&$("#MonCount").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 addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
+ console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
$.ajax({
@@ -798,64 +688,57 @@
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";
}
}
});
}
-
- //淇敼鐢垫睜缁勶紝娣诲姞鍒癇ATTINF
- function editBatt(){
- var parm = getUpdateArredit();
- console.info(parm);
- $.ajax({
- type: "post",
- url: "BattInfAction!update",
- async:true,
- dataType:'text',
- data:"json="+JSON.stringify(parm),
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- console.info(model);
- if(model.code ==1){
- alert("淇敼鎴愬姛");
- }else{
- alert("淇敼澶辫触!");
- }
- },
- error:function(){
- 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 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