From 6e68fc715eeb60c8cc7f969dd4c0afec1e7beddc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期三, 17 十月 2018 10:18:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipHistWarn1.jsp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/equipHistWarn1.jsp b/gx_tieta/WebRoot/equipHistWarn1.jsp
index d1f260e..27fe768 100644
--- a/gx_tieta/WebRoot/equipHistWarn1.jsp
+++ b/gx_tieta/WebRoot/equipHistWarn1.jsp
@@ -376,7 +376,7 @@
// 鐢熸垚琛ㄦ牸鐨勫ご閮ㄥ拰琛ㄤ綋
function createAllTbl (header, body, arrTh, arrTd,arrTr,status) {
- console.info(status);
+ //console.info(status);
var newArrTh = new Array();
var newArrTd = new Array();
newArrTh = getArrTh(status, arrTh);
@@ -653,7 +653,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
- console.log(temp);
+ //console.log(temp);
return temp;
}
@@ -678,6 +678,11 @@
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 "鍩虹珯寮�闂ㄥ憡璀�";
}
}
return "閫氫俊鏁呴殰";
--
Gitblit v1.9.1