From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 28 十二月 2018 17:08:53 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/equipWarn1.jsp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp index b7a2f09..e12d711 100644 --- a/gx_tieta/WebRoot/equipWarn1.jsp +++ b/gx_tieta/WebRoot/equipWarn1.jsp @@ -123,6 +123,7 @@ <option value="119025">鍩虹珯鍙戠數鍛婅</option> <option value="119026">鍩虹珯鎺夌珯鍛婅</option> <option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option> + <option value ="119028">璁惧楂樻俯鍛婅</option> </select> </td> @@ -508,7 +509,7 @@ success: function(data){ data = eval("("+data+")"); var model = eval("("+data.result+")"); - console.info(model); + //console.info(model); alarm_list = new Array(); if(model.code==1){ alarm_list = model.data; @@ -738,6 +739,7 @@ case 119025:return "鍩虹珯鍙戠數鍛婅"; case 119026:return "鍩虹珯鎺夌珯鍛婅"; case 119027:return "鍩虹珯寮�闂ㄥ憡璀�"; + case 119028:return "璁惧楂樻俯鍛婅"; } } return "閫氫俊鏁呴殰"; -- Gitblit v1.9.1