Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-11 b66ed691935b9369cb93c5397d562128591b09d7

 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){