From 8cb69e21ae105a3209528767d1d54eeff357b95c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 10:19:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-fault-manage.jsp | 45 ++++++++++++++-------------------------------
1 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 2e14351..a4d3d1f 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -117,9 +117,6 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
-
-
-
$(document).ready(function(){
console.info(1111);
tOptions.data=getData(100,0);
@@ -133,16 +130,9 @@
for(i=0;i<a;i++){
arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
}
- return arr
+ return arr
}
-
-
-
-
-
-
-
-
+
$(document).on('click','.addbtn',function(){
searchStationHistRecord();
});
@@ -151,28 +141,21 @@
//$('#detailsOpts').data('data', param);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '<span style="font-weight:bold">>>闂娣诲姞</span>',
+ area: ['600px', '400px'],
+ fixed: false, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/batt-fault-manage-add.html'
+ });
- // 鏄剧ず闈㈡澘
- layer.open({
- type: 2,
- title: '<span style="font-weight:bold">>>闂娣诲姞</span>',
- area: ['600px', '400px'],
- fixed: false, //涓嶅浐瀹�
- maxmin: true,
- content: 'iframe/batt-fault-manage-add.html'
- });
-
- }
-
-
-
-
-
+ }
});
-
-
-
+
</script>
</body>
--
Gitblit v1.9.1