From b8f449dca8e53bbd5c0e424befe07c8207c10032 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 11 十二月 2018 13:48:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 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 33f0d10..14af2d2 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,12 @@
<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=''
@@ -24,10 +30,11 @@
function creatBattView(index){
- var battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+index+'</h1>'+
+ 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='+'鐢垫睜缁�'+index +' />'+'</td>'+'</tr>'+'</tbody>'+'</table>'+'</div>';
+ ,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;
}
@@ -43,7 +50,15 @@
return selected;
}
- $(function(){creatAllView(4)});
+ 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">
@@ -340,31 +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");
--
Gitblit v1.9.1