From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 2371c9b..6d70783 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3977,6 +3977,9 @@
treeView.ele.on('click', '.home', function() {
var home = $(this).data('attr');
var tmp = {
+ StationName1: home.StationName1,
+ StationName2: home.StationName2,
+ StationName: home.StationName,
StationId: home.StationId
};
fourth(treeView, $(this).parent(), tmp);
@@ -3990,7 +3993,7 @@
BattGroupId = eleGroup.BattGroupId;
// 瀵笲TS9611鍋氱壒娈婄殑澶勭悊
var batt = getBatt();
- console.info(batt);
+ //console.info(batt);
$('#eleCircleBtn').removeClass('hide');
if(regEquipType(batt.FBSDeviceId, globalPattern.BTSSreen)) {
var isAct = $('#eleCircleBtn').hasClass('action');
--
Gitblit v1.9.1