From 4b8935412d026ae29a104d1a799c6b15e2641381 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期五, 07 十二月 2018 14:47:45 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param1.jsp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index c5523e4..9437d58 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -496,7 +496,8 @@
function delBattGroup(obj) {
//console.log(obj);
var data = obj.data;
- var content = '鏄惁纭鍒犻櫎<span style="font-weight: bold; color: #FF5722">'+data.StationName3+'</span>'
+ var content = '鏄惁纭鍒犻櫎<span style="font-weight: bold; color: #FF5722">'+data.StationName3+
+ '-'+data.BattGroupName+'</span>'
layer.confirm(content,{
icon: 2
,title: '鎻愮ず'
--
Gitblit v1.9.1