From c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 10 一月 2019 09:09:15 +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-temp.html | 123 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
index 236ae9f..327889b 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>鐢垫睜缁勪俊鎭厤缃ā鏉�</title>
+ <title>鐢垫睜缁勫畨瑁呮彁浜ょ敵璇�</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
@@ -11,6 +11,55 @@
<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="css/tbl.css">
<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+ <script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+ <script type="text/javascript" src="js/tbl.js"></script>
+ <script type="text/javascript" src="mobilJs/base.js"></script>
+ <script type="text/javascript">
+ function creatAllView(num){
+ var allString=''
+ ,i=0;
+ if(num>4){return false}
+ for(i=0;i<num;i++){
+ allString+=creatBattView(i);
+ }
+ $("#battdata").html(allString);
+ }
+
+
+ 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>'
+ ,allOption=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
+ ,battName='<tr>'+'<td>'+'鐢垫睜缁勫悕绉�'+'</td>'+'<td>'+'<input type="text" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' />'+'</td>'+'</tr>'+'</tbody>'+'</table>'+'</div>';
+ return battTitle+allOption+battName;
+
+ }
+
+ 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>';
+
+ }
+
+ return selected;
+ }
+ var temp = getCookie("eleparm");
+ //console.info(temp);
+ temp=JSON.parse(temp);
+ console.info(temp);
+ console.info(temp[30]);
+ console.info(temp[33]);
+ var suoyin = temp[33];
+
+ $(function(){creatAllView(suoyin)});
+ </script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<style type="text/css">
@@ -29,6 +78,18 @@
background-color: #dddddd38!important;
color: #bdbdbdc4!important;
}
+ .ui-btn-icon-right {
+ padding-right: 8.5em;
+ }
+ .hbg{
+ background-color:#ddd9;
+ }
+ #battdata {
+ background-color:#dddddd54
+ }
+ .ui-select .ui-btn select{
+ width:77%;
+ }
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -37,7 +98,7 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
- <a href="ele-param.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="ele-param1.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>
</div>
@@ -247,6 +308,34 @@
</tbody>
</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>
+
</div>
@@ -266,30 +355,15 @@
</div>
</body>
-<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
-<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
-<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
-<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
-<script type="text/javascript" src="js/tbl.js"></script>
-<script type="text/javascript" src="mobilJs/base.js"></script>
+
<script type="text/javascript">
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
+ installstartdata(temp);
});
- var temp = getCookie("eleparm");
- //console.info(temp);
- temp=JSON.parse(temp);
- console.info(temp);
- console.info(temp[30]);
- console.info(temp[33]);
- installstartdata(temp);
- if(temp[33]&&temp[33]=="new"){
-
- }else{
-
- }
+
function installstartdata(temp){
//$("#StationId").value=temp[0];
//var t=document.getElementById("station_name1");
@@ -387,11 +461,11 @@
}else{
editParm();
}
- function backpage(){window.location.href="ele-param.html";}
- setTimeout(backpage,3000);
+ // function backpage(){window.location.href="ele-param1.html";}
+ // setTimeout(backpage,500);
});
$("#cancel").click(function(){
- window.location.href="ele-param.html";
+ window.location.href="ele-param1.html";
});
});
function editParm(){
@@ -441,6 +515,9 @@
});
}
+
+
+
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
鎿嶄綔澶辫触
--
Gitblit v1.9.1