From 089ee1c06afa3d18c8313bea961594dad2b66e98 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.30>
Date: 星期六, 17 十一月 2018 10:52:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 5ea308b..192efa0 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -4438,7 +4438,7 @@
{txt: '鏈烘埧鍘嗗彶浜嬩欢鏌ヨ', cla:'target', data: {target: 'batt-state-statistical.jsp'}},
];
// 缁欒〃鏍兼坊鍔犺嚜宸辩殑鍙抽敭鑿滃崟
- $('#contai').on('mousedown','.ele-circle',function(e){
+ $('#contai').on('mousedown','.ele-circle canvas',function(e){
var batt = getBatt();
if (e.which == 3) {
var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
@@ -4457,6 +4457,7 @@
var county = batt.StationName5;
var home = batt.StationName;
var battid = batt.BattGroupId;
+
// 瀹炵幇璺宠浆
window.open(skipUrl(pageName, province, city, county, home, battid));
});
--
Gitblit v1.9.1