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/eleWarnPrmSet.jsp

@@ -562,6 +562,7 @@
            "dev_id":dev_id,

            "alm_id":alm_id

         };

         console.info(warmId);

         var load = layer.load(1);

         //console.log(warmId);

         $.post("Dev_paramAction!serchByCondition","json="+JSON.stringify(warmId),function(data){