From f99e01a5e62998ea3ccdd3e74c51bc6a0ca68bb9 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 17:39:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/endure.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/endure.html b/gx_tieta/WebRoot/mobil/endure.html
index ab2d81b..719dc96 100644
--- a/gx_tieta/WebRoot/mobil/endure.html
+++ b/gx_tieta/WebRoot/mobil/endure.html
@@ -62,7 +62,7 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
<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>
- <h1>鐢垫睜缁勭画鑸兘鍔涘巻鍙叉煡璇�</h1>
+ <h1>鐢垫睜缁埅鑳藉姏鍘嗗彶鏌ヨ</h1>
<a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">绛涢��</a>
</div>
<!-- 涓讳綋鍐呭 -->
@@ -466,8 +466,8 @@
//鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
function findserchByBattGroupNamebystationname(){
- var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
-
+ var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
+
var data = {
StationName1: $("#mainteArea").val(),
StationName2:$("#city").val(),
--
Gitblit v1.9.1