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

hdw

2018-11-06 d713b84e6285cde8db1d17c0138b46ec7ae7a599

 gx_tieta/WebRoot/batt-fault-manage.jsp

@@ -192,6 +192,7 @@
               area: ['1200px', '660px'],

               fixed: false, //不固定

               resize: true,

               maxHeight: 660,

               maxmin: true,

               content: 'iframe/batt-fault-manage-details.html'

            });