From a6628f076ca6b331e626e8d3cb6a3c41c52ec808 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 10:38:00 +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-conf-temp.html | 283 +++++++++++++++++++++++++++++++++++++++++++++++
gx_tieta/WebRoot/mobil/ele-param.html | 33 ++++
2 files changed, 311 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
new file mode 100644
index 0000000..41ed7af
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
@@ -0,0 +1,283 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <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">
+ <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+ <link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+ <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 type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+ <style type="text/css">
+
+ table {
+ margin-top:.5em;
+ border-collapse:separate;
+ border-spacing:0 .5em;
+ }
+
+ tbody tr td{
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+ }
+ .uncheck{
+ background-color: #dddddd38!important;
+ color: #bdbdbdc4!important;
+ }
+ </style>
+ <link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+ <div data-role="page">
+
+ <!-- 澶撮儴鍐呭 -->
+ <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>
+ <h1>鐢垫睜缁勪俊鎭厤缃ā鏉�</h1>
+
+ </div>
+ <!-- 涓讳綋鍐呭 -->
+ <div data-role="main">
+ <!-- <div class="set-option"> -->
+ <table class="layout-set">
+ <tbody>
+ <tr>
+ <td>鏈烘埧缂栧彿</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鐪�</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鍩庡競</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鍖哄幙</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏈烘埧鍚嶇О</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>璁惧鍚嶇О</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏈烘埧IP</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>FBS璁惧ID(閲嶈)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>FBS璁惧IP(閲嶈)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>瀛愮綉鎺╃爜</td>
+ <td>
+ <input type="text" id="" class="unable" data-mini="true" value="456"/>
+ </td>
+ </tr>
+ <tr>
+ <td>缃戝叧</td>
+ <td>
+ <input type="text" id="" class="unable" data-mini="true" value="456"/>
+ </td>
+ </tr>
+ <tr>
+ <td>FBS璁惧鍚嶇О</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>FBS鐢垫睜绱㈠紩(0-3)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鐢垫睜缁処D</td>
+ <td>
+ <input type="text" readonly unselectable="on" value="123" id="" class="uncheck" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏈烘埧鍐呯數姹犵粍缂栧彿</td>
+ <td>
+ <input type="text" readonly unselectable="on" value="123" id="" class="uncheck" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鐢垫睜缁勫悕绉�</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>娴厖鐢靛帇闃�鍊�(V)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>绂荤嚎鐢靛帇闃�鍊�(V)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>娴厖鐢垫祦闃�鍊�(A)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鍗曚綋鏁伴噺</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏍囩О瀹归噺(AH)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏍囩О鍗曚綋鐢靛帇(V)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏍囩О鍗曚綋鍐呴樆(m惟)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏍囩О鍗曚綋鐢靛</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>璐熻浇鐢垫祦(A)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鏈�澶ф牳瀹圭數娴�(A)</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鍩虹珯鍙风爜</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鐢垫睜鍝佺墝</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鐢垫睜鍨嬪彿</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鐢垫睜鐢熶骇鏃ユ湡</td>
+ <td>
+ <input id="startTestrecord" type="text" name="appDate" class="appDatefir" value="2000-01-01" />
+ </td>
+ </tr>
+ <tr>
+ <td>鎶曞叆浣跨敤鏃ユ湡 </td>
+ <td>
+ <input id="endTestrecord" type="text" name="appDate" class="appDatesec" value="2017-01-01" />
+ </td>
+ </tr>
+ <tr>
+ <td>瀹夎浜哄憳</td>
+ <td>
+ <input type="text" id="" data-mini="true" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!-- </div> -->
+
+ </div>
+
+ <div data-role="footer" data-position="fixed" data-theme="a">
+ <div data-role="navbar">
+ <ul>
+ <li><a href="" target="_top" data-role="button" data-icon="check" data-transition="slide">纭畾</a></li>
+ <li><a href="" target="_top" data-role="button" data-icon="delete" data-transition="slide">鍙栨秷</a></li>
+ </ul>
+ </div>
+ </div>
+
+ </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'));
+
+ });
+</script>
+ <script type="text/javascript">
+ $(function(){
+ $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
+ });
+ </script>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/ele-param.html b/gx_tieta/WebRoot/mobil/ele-param.html
index 09abe58..b1221f2 100644
--- a/gx_tieta/WebRoot/mobil/ele-param.html
+++ b/gx_tieta/WebRoot/mobil/ele-param.html
@@ -80,6 +80,14 @@
text-overflow:ellipsis;
white-space: nowrap;
}
+ .bg-line{
+ background-color:#ddd;
+ }
+ .operat-but{
+ margin: 0;
+ padding-top: 0.7em;
+ padding-bottom: 0.7em;
+ }
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -138,11 +146,16 @@
<div data-role="navbar">
<ul>
<li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">棣栭〉</a></li>
- <li><a href="" target="_top" data-role="button" data-icon="grid" data-transition="slide">鏂板缓</a></li>
+ <li><a href="batt-infor-conf-temp.html" target="_top" data-role="button" data-icon="plus" data-transition="slide">鏂板缓</a></li>
</ul>
</div>
</div>
-
+ <div data-role="popup" id="myPopup" 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="batt-infor-conf-temp.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a>
+
+ <a href="batt-infor-delete.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
+ </div>
</div>
</body>
@@ -167,7 +180,7 @@
$('document').ready(function(){panel.show();});
- var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳'];
+ var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','閰嶇疆鎿嶄綔'];
dataArr = [];
var startTime = "1980-01-01";
var endTime = new Date().format('yyyy-MM-dd');
@@ -199,7 +212,7 @@
data:"json="+json,
success:function(data){
//console.info(data);
- var data = JSON.parse(data.result);
+ //var data = JSON.parse(data.result);
//layer.close(load);
if(data.code==1&&data.data.length>0){
data=data.data;
@@ -222,11 +235,21 @@
}
});
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- for(i=0;i<100;i++){
+
+ for(i=0;i<340;i++){
+ if(i%34==33){
+ //<a href="count-report.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>
+ arrTd[i]='<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >淇敼鎴栧垹闄�</a>';
+ console.warn(i);
+ continue;
+
+ }
+
arrTd[i]=i*10;
}
createTbl(tblCon, arrTh, arrTd);
+
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
}
--
Gitblit v1.9.1