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

hdw

2019-01-14 d00b94b5771112a25971e934a36c86a15e1c475b

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

 gx_tieta/WebRoot/mobil/control.html

@@ -29,7 +29,7 @@
                <a href="voltageM.html" target="_top">1.单体电压 </a>



            </li>

            <li>

            <!--<li>

                <a href="temperatureM.html" target="_top">2.温度 </a>

            </li>

            <li>


 gx_tieta/WebRoot/mobil/ele-param2.html

@@ -300,8 +300,8 @@
                StationName1:'',

                StationName2: '',

                StationName5:''

            };

			
            };	
            loadshow();

            // 查询机房信息

            $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){

                var rs = JSON.parse(result.result);

@@ -325,6 +325,7 @@
                    //console.log(homeSource)

                    // 设置资源内容

                    $('#searchHomeIframe').data('homeSource', homeSource);

                    loadclose();

                }

            });

            


 gx_tieta/WebRoot/mobil/index.html

@@ -45,7 +45,7 @@
                <a href="indexctM.html" target="_top" data-i18n="main.usermanagement">作业管理</a>

            </li>    

            <li>

                <a href="map.html" target="_top" data-i18n="main.usermanagement">机房定位</a>

                <a href="map.html" target="_top" id="LocationCR" data-i18n="main.usermanagement">机房定位</a>

            </li>

             <li>

                <a href="checkAccept-index.html" id="check_Accept" target="_top" data-i18n="main.usermanagement">批准审批及验收</a>

@@ -92,6 +92,7 @@
        delCookie("station");

        delCookie("eleparm");

        delCookie("eleparm1"); 

        delCookie("happroval");

        $(document.body).css( "visibility", "visible") ;

    });

    

@@ -116,6 +117,7 @@
                    if(isHasPermit("install_look_permit",data)){

                    }else{

                        document.getElementById("check_Accept").style.display="none";

                        document.getElementById("LocationCR").style.display="none";		
                    }

                }

        });