From 4fa214f38cb5a19599655636a8ea4e25eaf496a3 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 15:10:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index cd8d13b..3e38315 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1053,7 +1053,7 @@
permits=<%=permits%>;
//console.info(json);
<% } %>
-
+ console.log(permits);
//鎷撴墤鍥剧姸鎬佸璞�
var mygraph = {
battstate:0,
@@ -4318,7 +4318,8 @@
function findHome() {
var tmp = {
StationName1:'',
- StationName2: ''
+ StationName2: '',
+ StationName5:''
};
// 鏌ヨ灏嗕俊鎭�
@@ -4333,6 +4334,7 @@
label: _data.StationName+'('+_data.StationId+')',
province: _data.StationName1,
city: _data.StationName2,
+ county: _data.StationName5,
home: _data.StationName,
homeid: _data.StationId,
battid: undefined
--
Gitblit v1.9.1