From 4e01314d7af9b27128570a452da01fa9bfccc29d Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 27 十二月 2018 17:28:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 151 +++++++++++---------------------------------------
1 files changed, 34 insertions(+), 117 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index 29a9b7a..98df240 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -47,9 +47,6 @@
right: 0;
margin:0!important;
}
- #newbattnum-button{
- padding: 1em 1.9em;
- }
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -58,31 +55,18 @@
<!-- 澶撮儴鍐呭 -->
<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>
-
+ <a href="batt-unapproved-index.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" >
+ </fieldset>
</div>
<!-- 涓讳綋鍐呭 -->
<div data-role="main">
<!-- <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>
+ <input type="hidden" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+
<tr>
<td>FBS璁惧ID(閲嶈)</td>
<td>
@@ -95,12 +79,9 @@
<input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" />
</td>
</tr>
- <tr>
- <td>鐢垫睜缁処D</td>
- <td>
- <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
- </td>
- </tr>
+
+ <input type="hidden" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
+
<tr>
<td>鐪�</td>
<td>
@@ -122,46 +103,20 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
+ <input type="text" class="unable" class="unable" 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="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" />
-
-
-
-
+ <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" />
<input type="hidden" id="MonResStd" data-mini="true" />
<input type="hidden" id="MonSerStd" data-mini="true" />
<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
@@ -169,17 +124,17 @@
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
<td>
- <input type="text" id="Load_curr" data-mini="true" />
+ <input type="text" id="Load_curr" class="unable" data-mini="true" />
</td>
</tr>
- <input type="hidden" id="DisCurrMax" data-mini="true" />
+ <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
<tr>
<td>鍩虹珯鐢佃瘽鍙风爜</td>
<td>
- <input type="text" id="station_phone" data-mini="true" />
+ <input type="text" id="station_phone" class="unable" data-mini="true" />
</td>
</tr>
@@ -190,7 +145,7 @@
<tr>
<td>*瀹夎浜哄憳</td>
<td>
- <input type="text" id="install_user" data-mini="true" />
+ <input type="text" id="install_user" class="unable" data-mini="true" />
</td>
</tr>
</tbody>
@@ -230,8 +185,8 @@
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
- <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">纭畾</a></li>
- <li><a href="" id="cancel" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
+ <li><a href="batt-approve-index.html" target="_top" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">宸插鏍�</a></li>
+ <li><a href="batt-unapproved-index.html" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
</ul>
</div>
</div>
@@ -259,16 +214,16 @@
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 '+'id='+'battproducer'+index+'>'
+ '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
,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>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+'>'
+ ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'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+' class="unable" '+'>'
,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(index)+'</select>'
+ ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</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>';
+ ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' class="unable" '+' />'+'</tr>'
+ ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' class="unable" '+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;
}
function selectedNum(index){
@@ -276,22 +231,9 @@
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>';
}
- }
- 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 selected='',
@@ -321,14 +263,9 @@
var lixiandianyafazhi = [0,0,0,0];
$(function(){
creatAllView(temp.length).trigger('create');
- setchangedMonVolStd(temp.length);
- creatBa(temp.length).trigger('create');
+ setMonVolStd(temp.length);
});
-
-
-
-
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
@@ -401,17 +338,7 @@
function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
}
- 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;
@@ -633,16 +560,6 @@
}
return selected;
}
- $('#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 getSelected(id){
/* var s;
@@ -674,7 +591,7 @@
}*/
- function setchangedMonVolStd(suoyin){
+ function setMonVolStd(suoyin){
for(var u=0;u<suoyin;u++){
var id='';
id='#MonCount'+u;
--
Gitblit v1.9.1