From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-edit2.html | 165 ++++++++++++++++++++----------------------------------
1 files changed, 61 insertions(+), 104 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index 686e3ad..e6a930b 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -26,17 +26,17 @@
white-space: nowrap;
}
.uncheck{
- background-color: #dddddd38!important;
- color: #bdbdbdc4!important;
+ background-color: #ddd!important;
+ color: #000!important;
}
.ui-btn-icon-right {
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%;
@@ -47,9 +47,7 @@
right: 0;
margin:0!important;
}
- #newbattnum-button{
- padding: 1em 1.9em;
- }
+
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -60,16 +58,7 @@
<div data-role="header" data-position="fixed">
<a href="ele-param2.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>
<h1>淇敼鐢垫睜缁勪俊鎭厤缃�</h1>
- <fieldset data-role="controlgroup" class="ptr0" >
-
-
- <select id="newbattnum" data-mini="true">
- <option value=0>鏂板缓鐢垫睜缁�</option>
-
- </select>
-
-
- </fieldset>
+
</div>
<!-- 涓讳綋鍐呭 -->
@@ -84,8 +73,9 @@
<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" />
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId0" class="uncheck" data-mini="true" />
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId1" class="uncheck" data-mini="true" />
<td>鐪�</td>
<td>
<input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
@@ -106,40 +96,26 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
-
+ <textarea id="homeName" class="unable" 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="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" />
@@ -155,9 +131,7 @@
<label for="twentyfour">24涓�</label>
<input type="radio" name="battnum" id="twentyfour" value="24">
</fieldset>
-
-
-
+
</td>
</tr>
<tr>
@@ -180,6 +154,10 @@
<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>
@@ -192,7 +170,7 @@
<tr>
- <td>鍩虹珯鐢佃瘽鍙风爜</td>
+ <td>*鍩虹珯鐢佃瘽鍙风爜</td>
<td>
<input type="text" id="station_phone" data-mini="true" />
</td>
@@ -271,6 +249,7 @@
}
+
function creatBattView(index){
var count=index+1
,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
@@ -297,24 +276,15 @@
}
}
- function creatBa(a){
- var battnum=4-a,
- opstring='';
- if(a>4&&battnum<=0){return false;}
- for(var i=0;i<=battnum;i++){
-
- opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
- }
- console.warn(opstring+'ttt');
- return $('#newbattnum').html(opstring);
- }
-
+
function selectedIndex(index){
+ var battproducer = getCookie("producer");
+ battproducer = JSON.parse(battproducer);
+ console.info(battproducer);
var selected='',
i=0;
- var battproducer = ["鐞嗗＋","鍦ｉ槼","鍙岀櫥","SENRY","鍗楅兘","鐖遍粯鐢�","绉戝＋杈�","閾舵嘲","涓版棩","涓叴鑳芥淳","鍏夊畤",
- "鑹捐鏂崕杈�","闆勯煬","椋庡竼","鏂囬殕","涓北"];
+ //onsole.info(inde)
selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';
for(var i=0;i<battproducer.length;i++){
if(temp[index].binf.BattProducer!=battproducer[i]){
@@ -330,8 +300,8 @@
console.info(temp);
var moncount = 0;
var tempgroupid = new Array() ;
- var fuchongfazhi = [0,0,0,0];
- var lixiandianyafazhi = [0,0,0,0];
+ //var fuchongfazhi = [0,0,0,0];
+ //var lixiandianyafazhi = [0,0,0,0];
for(var i=0;i<temp.length;i++){
tempgroupid.push(temp[i].binf.BattGroupId);
}
@@ -341,18 +311,12 @@
creatAllView(temp.length).trigger('create');
//creatMonCapOpt(temp.length);
setchangedMonVolStd(temp.length);
- creatBa(temp.length).trigger('create');
});
-
-
-
-
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
+ //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
installstartdata(temp);
});
@@ -374,7 +338,7 @@
//console.info(dev_id);
document.getElementById("FBSDeviceId").value = dev_id;
var ip = getDevIp(dev_id);
- //console.info(ip);
+ console.info(ip);
document.getElementById("FbsDeviceIp").value = ip;
}else{
alert("groupid鐢熸垚澶辫触");
@@ -410,10 +374,8 @@
var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
- //$('#BattFloatCurrent').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
- //$('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
- fuchongfazhi[index] = chargeVol;
- lixiandianyafazhi[index] = outlineVol;
+ $("#fuchongfazhi"+index).val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $("#lixiandianyafazhi"+index).val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
console.info(vol);
}
@@ -421,21 +383,13 @@
return (Array(length).join('0') + num).slice(-length);
}
- function creatBa(a){
- var battnum=4-a,
- opstring='';
- if(a>4&&battnum<=0){return false;}
- for(var i=0;i<=battnum;i++){
-
- opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
- }
- console.warn(opstring+'ttt');
- return $('#newbattnum').html(opstring);
- }
+
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
data=temp[0].binf;
setMonVolStd(temp.length);
+ //creatgroupid();
+ var ip = getDevIp(data.FBSDeviceId);
document.getElementById("StationId").value = data.StationId;
document.getElementById("mainteArea").value = data.StationName1;
document.getElementById("city").value = data.StationName2; //甯�
@@ -443,18 +397,19 @@
document.getElementById("homeName").value = data.StationName3; //鏈烘埧鍚嶇О
document.getElementById("StationName4").value = data.StationName4; //璁惧鍚嶇О
document.getElementById("StationIp").value = data.StationIp; //璁惧IP
- document.getElementById("FBSDeviceId").value = data.FBSDeviceId;
- document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
+ document.getElementById("FBSDeviceId").value = data.FBSDeviceId;
+ document.getElementById("FbsDeviceIp").value = ip;
document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
- 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("FloatVolLevel").value = data.FloatVolLevel;
+ //document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
+ //document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
+ document.getElementById("BattFloatCurrent").value = 5;
//document.getElementById("MonCount").value = data.MonCount;
//document.getElementById("MonCapStd").value = data.MonCapStd;
document.getElementById("MonResStd").value = data.MonResStd;
@@ -472,6 +427,8 @@
document.getElementById("install_user").value = data.install_user;
for(var i=0;i<temp.length;i++){
data=temp[i].binf;
+ console.info(data.BattGroupId);
+ document.getElementById("BattGroupId"+i).value = data.BattGroupId;
document.getElementById("MonCapStd"+i).value = data.MonCapStd;
document.getElementById("MonVolStd"+i).value = data.MonVolStd;
console.info(data.MonCount);
@@ -491,7 +448,6 @@
function getUpdateArr(){
mon=$('#MonVolStd').val();
-
var arr = new Array();
for(var i=0;i<temp.length;i++){
@@ -522,11 +478,11 @@
FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(), // 缃戝叧
FBSDeviceName : $("#FBSDeviceName").val(), //璁惧鍚嶇О
GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
- BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d
+ BattGroupId : $("#BattGroupId"+i).val(), //鐢垫睜缁刬d
BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
BattGroupName : $(battString).val(),
- FloatVolLevel : fuchongfazhi[i], //娴厖鐢靛帇闃�鍊�
- OfflineVolLevel : lixiandianyafazhi[i], //绂荤嚎鐢靛帇闃�鍊�
+ FloatVolLevel : $("#fuchongfazhi"+i).val(), //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : $("#lixiandianyafazhi"+i).val(), //绂荤嚎鐢靛帇闃�鍊�
BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊�
MonCount :$("#MonCount"+i).val(), //鍗曚綋鏁伴噺
MonCapStd : $("#MonCapStd"+i).val(), //鏍囩О瀹归噺
@@ -574,10 +530,18 @@
});
function nullOrn(){
+ console.info($("#homeName").val());
+ console.info($("#station_phone").val());
+ if($("#homeName").val!=""&&$("#station_phone").val()!=""&&$("#install_user").val()!=""){
return true;
+ }else{
+ alert("璇峰～鍐�*鍐呭");
+ }
}
- function editBatt(){//
+
+ function editBatt(){
+ //creatgroupid(); //id锛宨p
console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
@@ -596,15 +560,15 @@
var model =data;
if(model.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"
}
},
error:function(){
alert("淇敼鐢垫睜缁勫け璐�!");
- //window.location.href="batt-unapproved.html"
+ //window.location.href="batt-unapproved.html" 璇︽儏鍒楄〃
}
});
}
@@ -628,14 +592,7 @@
- $('#newbattnum').change(function(){
- var numbattnum = parseInt($('#newbattnum').val());
- var index =parseInt(tempindex.length);
- addbattnum=Math.floor((numbattnum)+(tempindex.length));
- console.warn(addbattnum);
- creatAllView(addbattnum).trigger('create');
- creatBattGroupId(addbattnum);
- });
+
/*function creatMonCapOpt(suoyin){
var optionStr,allString;
--
Gitblit v1.9.1