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

didiyu

2018-12-18 99ed6cd7dc00f90b6161fbc44fc878f18ee248c2

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

@@ -419,6 +419,7 @@


            var battInfoTpl = $('#battInfoTpl').html();

         var editInfo = parent.$('#iframeEdit').data('data');

         editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);

         // console.log(editInfo);

            var data = {

                StationId: '4011100'