From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/js/base.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 7ff1c73..924f582 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -617,7 +617,7 @@
 	$.post("Battalarm_dataAction!serchRealTime",null,function(data){
 		model=eval("("+data.result+")");
 		if(model.code==1){
-			$('#batt_alarm_num').text(model.sum);
+			$('#batt_alarm_num .num').text(model.sum);
 			if(totalAlm_num<model.sum){				
 				createEleWarning(model.sum-totalAlm_num);
 			}

--
Gitblit v1.9.1