Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 gx_tieta/WebRoot/equipWarn1.jsp

@@ -509,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;