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

hdw

2018-12-06 a942cb0a9090867a3bf0afc69eb63df0d4b9d762

 gx_tieta/WebRoot/iframe/batt-info-edit.html

@@ -488,6 +488,7 @@
                     layer.msg('修改成功！3秒后面板自动关闭');

                     setTimeout(function() {

                        parent.$('#iframeClose').click();

                        parent.$('#paging .search').click();

                     }, 3000);

                  }else{

                     layer.msg('修改失败！');