From eeb0546f66c233f7e5d24c018fda7227a80c391b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 21 十二月 2018 10:38:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/equipwarn.html |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/equipwarn.html b/gx_tieta/WebRoot/mobil/equipwarn.html
index 79b2137..f47b736 100644
--- a/gx_tieta/WebRoot/mobil/equipwarn.html
+++ b/gx_tieta/WebRoot/mobil/equipwarn.html
@@ -183,7 +183,7 @@
             		
             		arr[index++]=data[i].dev_ip ;                        //璁惧IP
             		arr[index++]=data[i].stationName;                  	//鏈烘埧鍚�
-            		arr[index++]=data[i].alm_type;                      //鍛婅浜嬩欢
+            		arr[index++]=getAlarmTypeByAlmType(data[i].alm_type);                      //鍛婅浜嬩欢
             		arr[index++]=getAlarmLevel(data[i].alm_level);      //鍛婅绛夌骇
             		arr[index++]=data[i].alm_is_confirmed==0?"鍚�":"鏄�";  //鍛婅纭
             		if(data[i].alm_is_confirmed==1){
@@ -278,7 +278,24 @@
 		return "";
 	};
 
-	
+	//鑾峰彇璁惧鐨勫憡璀︾被鍨�
+	function getAlarmTypeByAlmType(alm_type){
+		if(alm_type>0){
+			switch(alm_type){
+				case 618501:return "缁х數鍣↘1鍛婅";
+				case 618502:return "閫氳鍛婅";
+				case 618503:return "璁惧杩囨俯鍛婅";
+				case 618504:return "浜屾瀬绠1鍛婅";
+				case 119023:return "缁埅涓嶈冻鍛婅";
+				case 119024:return "鍩虹珯鍋滅數鍛婅";
+				case 119025:return "鍩虹珯鍙戠數鍛婅";
+				case 119026:return "鍩虹珯鎺夌珯鍛婅";
+				case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
+				case 119028:return "璁惧楂樻俯鍛婅";
+			}
+		}
+		return "閫氫俊鏁呴殰";
+	}
 	
 	
 	

--
Gitblit v1.9.1