From 4f39b4da8aae5c905cb35f32a2112db2c488e07f Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期六, 05 一月 2019 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/eleHistoryWarn.jsp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index a6e81a4..0095f5b 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -586,7 +586,7 @@
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
- createOptions($select, optsList, true);
+ createOptions($select, optsList, false);
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
@@ -645,7 +645,7 @@
createOptions($select, optsList, true);
$select.find('option').eq(0).val(0);
- searchHistalm(); // 鏌ヨ鍘嗗彶鍛婅
+ //searchHistalm(); // 鏌ヨ鍘嗗彶鍛婅
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
--
Gitblit v1.9.1