From b8b791df46b97c724e5f2dd0319bb6f527aecd62 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期五, 30 十一月 2018 10:34:28 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 351d3e4..44efa8f 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -2543,7 +2543,7 @@
// 鏄剧ず鍖哄煙鐨勫浘鏍�
bmap.setDots(allStation);
bmap.queryInRect(map, createMapDot);
- updateStation(setRect);
+ updateStation();
// 鏇存柊灏忓伐鍏锋悳绱㈡満鎴垮姛鑳�
updateSearchSource(allStation);
@@ -3007,6 +3007,8 @@
//console.info(allStation);
console.info(allStation);
var temp = getStationMap(allStation, mk.point);
+ console.info(temp);
+ temp.StationName = temp.title;
if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.title+"'鐨勪綅缃俊鎭悧锛�")){
if(temp != undefined){
var json = JSON.stringify(temp);
@@ -3723,6 +3725,11 @@
type: 1
});
$(this).prop('checked', false);
+ }else if(num == 0) {
+ layerMsg = layer.msg("鑷冲皯閫夋嫨涓�涓紒", {
+ type: 1
+ });
+ $(this).prop('checked', true);
}
});
--
Gitblit v1.9.1