From 7d8b9a16166d39e70bf3576bf77a48b7d7c93db1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 16:57:37 +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 | 16 ++++-
gx_tieta/WebRoot/mobil/mobilJs/base.js | 9 ++
gx_tieta/WebRoot/mobil/batt-infor-conf-delete.html | 96 ++++++++++++++++++++++++++++++++
gx_tieta/WebRoot/mobil/ele-param.html | 18 +++++-
4 files changed, 131 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-delete.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-delete.html
new file mode 100644
index 0000000..dc639ff
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-delete.html
@@ -0,0 +1,96 @@
+<!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">
+ <h1>鍒犻櫎鎿嶄綔鍗遍櫓锛�</h1>
+ <h1>鍚庢灉鍙兘涓ラ噸锛�</h1>
+ <h1>璇蜂笁鎬濊�屽悗琛岋紒</h1>
+ </div>
+
+ <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>
+ </ul>
+ </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>
+ <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純鍒犻櫎</a>
+ </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");
+ $("#sure").click(function(){
+ function backpage(){window.location.href="ele-param.html";}
+ setTimeout(backpage,3000);
+ });
+ $("#cancel").click(function(){
+ window.location.href="ele-param.html";
+ });
+ });
+ /* 鎿嶄綔鎴愬姛
+ $('#changeSuc').popup('open');
+ 鎿嶄綔澶辫触
+ $('#changeErr').popup('open'); */
+ </script>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
index 1b9f8c8..5008a3a 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
@@ -254,14 +254,14 @@
<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="" 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="" 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>
</ul>
</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="" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a>
- <a href="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a>
+ <a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a>
+ <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a>
</div>
</div>
</body>
@@ -283,8 +283,16 @@
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$("#sure").click(function(){
- window.location.href="index.html";
+ function backpage(){window.location.href="ele-param.html";}
+ setTimeout(backpage,3000);
+ });
+ $("#cancel").click(function(){
+ window.location.href="ele-param.html";
});
});
+ /* 鎿嶄綔鎴愬姛
+ $('#changeSuc').popup('open');
+ 鎿嶄綔澶辫触
+ $('#changeErr').popup('open'); */
</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 386bb72..bd12799 100644
--- a/gx_tieta/WebRoot/mobil/ele-param.html
+++ b/gx_tieta/WebRoot/mobil/ele-param.html
@@ -154,7 +154,7 @@
<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="" id="edit" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a>
- <a href="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
+ <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
</div>
</div>
</body>
@@ -167,7 +167,11 @@
<script type="text/javascript" src="mobilJs/base.js"></script>
<script type="text/javascript" src="js/panel.js"></script>
- <script type="text/javascript">
+ <script type="text/javascript">
+ /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
+ function getButIndex(t){
+ console.warn($(t).attr("but-index"));
+ }
$('document').ready(function(){panel.show();});
var arr=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
@@ -181,6 +185,9 @@
$('document').ready(function(){panel.show();});
$("#edit").click(function(){
window.location.href="batt-infor-conf-temp.html";
+ });
+ $("#delete").click(function(){
+ window.location.href="batt-infor-conf-delete.html";
});
var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','閰嶇疆鎿嶄綔'];
dataArr = [];
@@ -259,7 +266,7 @@
/* arrTd.push("");
arrTd.push("");
arrTd.push(model.data[i].StationId_ex); //鎶曞叆浣跨敤鏃ユ湡 */
- arrTd.push('<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >淇敼鎴栧垹闄�</a>');
+ arrTd.push('<a onclick="getButIndex(this)" href="#myPopup" id="butt" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼鎴栧垹闄�</a>');
Page.pageAll = data[i].num;
}
@@ -270,6 +277,9 @@
createTbl(tblCon, arrTh, arrTd);
}
});
+
+
+
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
/*for(i=0;i<340;i++){
@@ -547,5 +557,7 @@
}
}
+
+
</script>
</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/mobilJs/base.js b/gx_tieta/WebRoot/mobil/mobilJs/base.js
index efd1b77..faa16f1 100644
--- a/gx_tieta/WebRoot/mobil/mobilJs/base.js
+++ b/gx_tieta/WebRoot/mobil/mobilJs/base.js
@@ -327,7 +327,14 @@
// 鏌ヨ鍐呭涓虹┖
var searchNull = $('<div data-role="popup" data-theme="b" id="searchNull" class="ui-content">'+
'<p>鏌ヨ鏁版嵁鍐呭涓虹┖锛侊紒锛�</p>'+'</div>');
- container.append(searchNull).trigger("create");
+ container.append(searchNull).trigger("create");
+ //鎿嶄綔鎴愬姛
+ var changeSuc = $('<div data-role="popup" data-theme="b" id="changeSuc" class="ui-content">'+
+ '<p>鎿嶄綔鎴愬姛锛侊紒锛�</p>'+'</div>');
+ container.append(searchNull).trigger("create");
+ var changeErr = $('<div data-role="popup" data-theme="b" id="changeErr" class="ui-content">'+
+ '<p>鎿嶄綔澶辫触锛侊紒锛�</p>'+'</div>');
+ container.append(searchNull).trigger("create");
}
--
Gitblit v1.9.1