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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 gx_tieta/WebRoot/mobil/js/battNav.js

@@ -25,3 +25,7 @@
   setCookie("pages","2");

   window.location.href="machineroomM.html";

}

function JumpElegroupListPage(){

   setCookie("pages","4");

   window.location.href="elegroup-list.html";

}