From fc70632d2e2f2799d5710862e562197ebf2e2fb0 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@192.168.10.3>
Date: 星期四, 27 十二月 2018 15:55:28 +0800
Subject: [PATCH] 已审核实时数据
---
gx_tieta/WebRoot/mobil/ele-param2.html | 6 -
gx_tieta/WebRoot/mobil/batt-approved1.html | 148 ++++++++++++++++++++++++-------------------------
2 files changed, 74 insertions(+), 80 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 7a18bac..d765458 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -57,13 +57,9 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
- <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>
+ <a href="batt-approve-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 data-role="controlgroup" class="ptr0" >
</fieldset>
</div>
@@ -117,46 +113,26 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
-
+ <input type="text" id="homeName" class="unable" 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="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="MonResStd" data-mini="true" />
<input type="hidden" id="MonSerStd" data-mini="true" />
<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
@@ -164,17 +140,15 @@
<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" />
-
-
+ </tr>
+ <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>
@@ -185,28 +159,28 @@
<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>
<tr>
<td>*閫氳璁℃暟</td>
<td>
- <input type="text" id="tongxunnumber" data-mini="true" />
+ <input type="text" id="tongxunnumber" class="unable" data-mini="true" />
</td>
</tr>
<tr>
<td>*涓㈠寘鐜�</td>
<td>
- <input type="text" id="diubaonumber" data-mini="true" />
+ <input type="text" id="diubaonumber" class="unable" data-mini="true" />
</td>
</tr>
<tr>
<td>*鏄惁楠屾敹</td>
<td>
- <input type="text" id="check_en" data-mini="true" />
+ <input type="text" id="check_en" class="unable" data-mini="true" />
</td>
</tr>
</tbody>
@@ -247,10 +221,25 @@
<div data-role="navbar">
<ul>
<li><a href="" id="applyyanshou"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="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="delete" data-role="button">瀹炴椂鏁版嵁</a></li>
+ <li><a href="#yourPopup" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="delete" data-role="button">瀹炴椂鏁版嵁</a></li>
</ul>
</div>
- </div>
+ </div>
+ <div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
+ <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
+ <h1>閫夋嫨鏌ョ湅鐢垫睜缁�</h1>
+ <fieldset data-role="controlgroup" >
+ <select id="newbattnum" data-mini="true">
+ <option value="1">鐢垫睜缁�1</option>
+
+ </select>
+ </fieldset>
+
+ <div data-role="controlgroup" data-type="horizontal" class="mt6">
+ <a href="" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check pl5" >纭畾</a>
+ <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete pl5" >鍙栨秷</a>
+ </div>
+ </div>
<div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
<a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a>
@@ -265,7 +254,7 @@
<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
function creatAllView(num){
- var allString=''
+ var allString=''
,i=0;
if(num>4){return false}
for(i=0;i<num;i++){
@@ -274,27 +263,33 @@
return $("#battdata").html(allString);
}
- $("#applyyanshou").on('click',function(){
-
- })
+ function battnumber(){
+ var selected=''
+ for(var i=1;i<=temp.length;i++){
+ selected+= '<option '+'value='+i+'>'+"鐢垫睜缁�"+i+'</option>';
+ }
+ return $('#newbattnum').html(selected);
+ }
- $("#shishishuju").on('click',function(){
-
- })
-
- function creatBattView(index){
+ /* $("#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>'+
- '<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){
@@ -307,7 +302,6 @@
}
}
-
function selectedIndex(index){
var selected='',
i=0;
@@ -325,6 +319,16 @@
temp=JSON.parse(temp);
var arr = temp;
+ function setcookieCreat(i){
+ var index=Math.ceil(i-1);
+ arrdata = temp[index].binf;
+ //console.info(index);
+ //console.info(temp);
+ console.info(arrdata);
+ var json = JSON.stringify(arrdata);
+ setCookie("eleparm",json);
+ window.location.href="control.html";
+ }
// 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘
$("#applyyanshou").on('click',function(){
console.info(temp);
@@ -367,6 +371,7 @@
var moncount = 0;
var fuchongfazhi = [0,0,0,0];
var lixiandianyafazhi = [0,0,0,0];
+ battnumber();
$(function(){
creatAllView(temp.length).trigger('create');
setMonVolStd(temp.length);
@@ -630,22 +635,13 @@
<script type="text/javascript">
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
- $(function(){
-
- })
- $("#sure").click(function(){
- if(nullOrn()){
- editBatt();
- }else{
- } //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
- //function backpage(){window.location.href="ele-param1.html";}
- // setTimeout(backpage,500);
+ $("#sure").click(function(){
+ console.info($('#newbattnum').val());
+ setcookieCreat($('#newbattnum').val());
+ window.location.href="batt-infor-conf-temp1.html";
+ });
});
- $("#cancel").click(function(){
- window.location.href="ele-param2.html";
- });
- });
-
+
function nullOrn(){
return true;
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 36f1b16..16c3da1 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -203,14 +203,12 @@
<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
<h1>閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�</h1>
<fieldset data-role="controlgroup" >
-
-
+
<select id="newbattnum" data-mini="true">
<option value="1">鏂板缓1涓數姹犵粍</option>
<option value="2">鏂板缓2涓數姹犵粍</option>
</select>
-
-
+
</fieldset>
<div data-role="controlgroup" data-type="horizontal" class="mt6">
--
Gitblit v1.9.1