From 2a9de532798b7ba80ae0e0e9caeb16aa1b76e145 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期五, 21 十二月 2018 09:27:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/equiphistwarn.html | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/equiphistwarn.html b/gx_tieta/WebRoot/mobil/equiphistwarn.html
index bd81cf1..b911856 100644
--- a/gx_tieta/WebRoot/mobil/equiphistwarn.html
+++ b/gx_tieta/WebRoot/mobil/equiphistwarn.html
@@ -152,7 +152,7 @@
$.post("Batt_devalarm_data_historyAction!serchByCondition","json="+json,function(data){
data=data.result;
model=eval("("+data+")");
- //console.info(data);
+ console.info(data);
if(model.code==1){
var dev_no = (Page.pageCurr-1)*Page.pageSize+1;
for(var i=0;i<model.data.length;i++){
@@ -161,7 +161,7 @@
newArrTd.push(model.data[i].dev_name); //璁惧鍚嶇О
newArrTd.push(model.data[i].dev_ip); //璁惧ip
newArrTd.push(model.data[i].stationName); //鏈烘埧鍚嶇О
- newArrTd.push("閫氳鏁呴殰"); //閫氳鏁呴殰
+ newArrTd.push(getAlarmTypeByAlmType(model.data[i].alm_type)); //閫氳鏁呴殰
newArrTd.push(getAlarmLevel(model.data[i].alm_level)); //鍛婅绛夌骇
if(model.data[i].alm_is_confirmed == 1){
newArrTd.push('鏄�');
@@ -413,6 +413,25 @@
}
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 "閫氫俊鏁呴殰";
+ }
</script>
</div>
</body>
--
Gitblit v1.9.1