From f5d074139f55ca0d507430fd074508b056e588c9 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.9>
Date: 星期五, 21 十二月 2018 10:25:19 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/ele-param2.html | 8 ++++----
gx_tieta/WebRoot/mobil/batt-edit.html | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-edit.html b/gx_tieta/WebRoot/mobil/batt-edit.html
index 9421b51..2478666 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit.html
@@ -105,25 +105,25 @@
<tr>
<td>鐪�</td>
<td>
- <input type="text" id="station_name1" data-mini="true" />
+ <input type="text" id="station_name1"class="unable" data-mini="true" />
</td>
</tr>
<tr>
<td>鍩庡競</td>
<td>
- <input type="text" id="city" data-mini="true" />
+ <input type="text" id="city" class="unable"data-mini="true" />
</td>
</tr>
<tr>
<td>鍖哄幙</td>
<td>
- <input type="text" id="county" data-mini="true" />
+ <input type="text" id="county" class="unable"data-mini="true" />
</td>
</tr>
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="StationName3" data-mini="true" />
+ <input type="text" id="StationName3"class="unable" data-mini="true" />
</td>
</tr>
<tr>
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 70baf96..69c72b5 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -69,7 +69,7 @@
.abs{
position: fixed;
width:100%;
- height:4.5em;
+ height:8em;
overflow: hidden;
z-index:999;
}
@@ -78,7 +78,7 @@
}
.mt7{
- margin-top:7em;
+ margin-top:8em;
}
</style>
</head>
@@ -241,8 +241,8 @@
- // 鏈烘埧瀹氫綅闈㈡澘
- $('#homeLocation').on('click', function() {
+ //
+ $('#homeLocation').off('click').on('click.cjj', function() {
var homeInfo = $(this).data('homeInfo');
console.warn(homeInfo);
searchBattLife();
--
Gitblit v1.9.1