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

81041

2019-01-10 c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992

 gx_tieta/WebRoot/mobil/wapprovalBatt-index.html

@@ -121,9 +121,10 @@
                            }

                         }

                         console.info(model);

                         stationlist=model;

		 						
                      }

                   }

                   stationlist=model;

                   createUl($('#battList'),model);

                }

             }

@@ -151,6 +152,7 @@
                  num :arrdata[i].num,

                  check_en:arrdata[i].check_en,

                  apply_date: arrdata[i].apply_date,

                  apply_name: arrdata[i].apply_name,

                  binf:{

                     StationId : arrdata[i].binf.StationId,   // 机房编号

                     StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName3+"-"+arrdata[i].binf.StationName4),   // 拼接机房名称