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

81041

2018-12-26 94c3b603ae4fd3f26e23a33e3eabc781d9c08846

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

 gx_tieta/WebRoot/Top.jsp

@@ -205,7 +205,7 @@
  <script type="text/javascript" src="js/rightmenu.js"></script>

  <script type="text/javascript">

      $(document).ready(function(){

        setUserName();                //设置用户名称

        //setUserName();                //设置用户名称

        

        searchRecentlyAlarm();        //查询最近30秒的设备和电池告警

        

@@ -919,7 +919,7 @@
        

        // 判断当前页面不是登陆页面开始执行检测服务器状态

        if(!loginPatt.test(url)) {

            checkServer();

            //checkServer();

        }

        

        var linkNum = 0;    // 测试服务器连接计数 =3 跳转到登陆页面

@@ -930,17 +930,17 @@
                async: true,

                success: function(rs) {

                    linkNum = 0;    // 初始化测试连接

                    setTimeout(checkServer, 500);

                    setTimeout(checkServer, 200);

                },

                error:function() {

                     // 网络连接不正常

                    // 网络连接不正常

                    if(!navigator.onLine) {

                         linkNum = 0;

                         setTimeout(checkServer, 500);

                         setTimeout(checkServer, 200);

                    }else{

                         linkNum++;

                         // 服务器连接不正常

                         if(linkNum == 2) {

                         if(linkNum == 3) {

                             console.info('出现第'+linkNum+"次测试服务器连接失败！跳转到登陆");

                             // 网络正常但服务器连续多次检测不正常跳转到登陆页面

                             alert('网络连接异常，请检查网络连接是否正常！');

@@ -954,5 +954,57 @@
            });

        }

    })(jQuery);

	
    // 监测后台session是否存判断当前用户连接是否合法

    ;(function ($) {

        var url = window.location.href;

        var loginPatt = /\/login.jsp/;

		
        // 判断当前页面不是登陆页面开始执行检测服务器状态

        if(!loginPatt.test(url)) {

            checkServer();

        }

		
        var linkNum = 0;    // 测试服务器连接计数 =3 跳转到登陆页面

        function checkServer() {

            $.ajax({

                url:'LoginAction_check',

                type: 'post',

                async: true,

                success: function(res) {

                    //console.log(res);

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

                    if(rs.code==0) {

                        linkNum = 0;    // 初始化测试连接

                        setTimeout(checkServer, 100);

                    }else {

                        alert(rs.msg);

                        window.location.replace("login.jsp");

                    }

		        	
                },

                error: function() {

                    // 网络连接不正常

                    if(!navigator.onLine) {

                         linkNum = 0;

                         setTimeout(checkServer, 100);

                    }else{

                         linkNum++;

                         // 服务器连接不正常

                         if(linkNum == 3) {

                             console.info('出现第'+linkNum+"次测试服务器连接失败！跳转到登陆");

                             // 网络正常但服务器连续多次检测不正常跳转到登陆页面

                             alert('网络连接异常，请检查网络连接是否正常！');

                             window.location.replace("login.jsp");

                         }else {

                             console.info('出现第'+linkNum+"次测试服务器连接失败！");

                             checkServer();

                         }

                    }

                }

             });

        }

    })(jQuery);

	
  </script>

</html>


 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/User_infAction.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/User_infService.class

Binary files differ

 gx_tieta/WebRoot/batt-fault-manage.jsp

@@ -366,9 +366,11 @@
                searchfault();

            });        



            var isNewLoad = true;

            // 省-市-机房-电池组

            $(document).ready(function() {

                //页面加载时查询维护区中的枢纽类型

                var pre_province = getQueryString("province");

                $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,

                function(data) {

                    data = data.result;

@@ -385,6 +387,9 @@
                            } else {

                                $option.text(data.data[i - 1]);

                                $option.attr("value", data.data[i - 1]);

                                if(pre_province == data.data[i - 1] && isNewLoad){

                                    $option.attr('selected',true);

                                }

                            }

                            $select.append($option);         

                        }                    

@@ -400,6 +405,8 @@
                var data = {

                    StationName1: $("#station_name1").val()

                };

                var pre_city = getQueryString('city');

                console.info(pre_city);

                // 请求获取当前省下的市

                $.ajax({

                    type: "post",

@@ -417,6 +424,9 @@
                            for (var i = 0; i < _data.length; i++) {

                                var __data = _data[i];

                                var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);

                                if(pre_city == __data.StationName2 && isNewLoad){

                                    tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);		                        	
                                }

                                optsList.push(tmp);

                            }

                            // 根据数据生成下拉列表

@@ -437,7 +447,7 @@
                    StationName1:$("#station_name1").val(),

                    StationName2:$("#city").val(),

                };

				
                var pre_county = getQueryString('county');

                // 查询区县

                $.ajax({

                    type: 'post',

@@ -457,6 +467,9 @@
                                    StationId: __data.StationId

                                };

                                var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                                if(pre_county == __data.StationName5 && isNewLoad){

                                    tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                                }

                                optsList.push(tmp);

                            }

                            

@@ -491,6 +504,7 @@
                    StationName2: $("#city").val(),

                    StationName5: $("#county").val()

                };

                var pre_home = getQueryString('home');

                //var selectvalue=$("#station_name1 option:selected").val();

                //alert(selectvalue);

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

@@ -507,12 +521,16 @@
                                StationId: __data.StationId

                            };

                            var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);

                            if(pre_home == __data.StationName && isNewLoad){

                                tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);

                                isNewLoad = false

                            }

                            optsList.push(tmp);

                        }

        

                        // 根据数据生成下拉列表

                        createOptions($select, optsList, true);

		                
                        searchfault();

                    } else {

                        $("#station_name3").text('').html('<option>暂无可测机房站点</option>');

                       


 gx_tieta/WebRoot/elegroup.jsp

@@ -307,7 +307,7 @@
            }

        });

        

        setUserName();

        //setUserName();

        //页面加载完生成包机组列表

        searchAllbaojiGroup();

        


 gx_tieta/WebRoot/js/base.js

@@ -26,7 +26,7 @@


// 检查当前用户是否在另一主机登陆

function checkUserlogin(){

    //console.info("check");

    console.info("check***********************");

    $.post("LoginAction_check",null,function(data){

        data = eval("(" + data.result + ")");

        user=data.uinf;

@@ -38,7 +38,7 @@
            window.location.href="login.jsp";            

        }else{

            clearInterval(timeID);

            timeID = setTimeout(checkUserlogin,5000);

            timeID = setTimeout(checkUserlogin,100);

        }

    }).error(function(){

        clearInterval(timeID);


 gx_tieta/WebRoot/oprsrch.jsp

@@ -113,7 +113,7 @@


    //初始化页面内容

    $(document).ready(function(){

        setUserName();

        //setUserName();

        

        //定义页面高度

        var srnHt=$(window).height();    //浏览器可以区域的高度


 gx_tieta/src/com/fgkj/actions/User_infAction.java

@@ -225,6 +225,18 @@
        return SUCCESS;

    }

    

    public String checkSession() {

        model = new ServiceModel();

        Object obj = ActionUtil.getUser();

        if(obj != null) {

            model.setCode(1);

        }else {

            model.setCode(0);

        }

        result = ActionUtil.tojson(model);

        return SUCCESS;

    }

	
    public String test(){

        System.out.println(upjson);

        System.out.println(uif);


 gx_tieta/src/com/fgkj/services/User_infService.java

@@ -273,10 +273,15 @@
            if (user != null && login_time != null) {

                UserClient client = map.get(user.getUName());

                if (client != null) {

                    if (login_time != client.getLogin_times()) {

                    if (login_time == client.getLogin_times()) {

                        model.setCode(0);

                    }else {

                        model.setCode(1);

                        model.setMsg(getText("The landing on the account in another host, please log in again"));

                    }

                }else {

                    model.setCode(1);

                    model.setMsg(getText("You are not logged in, please log in"));

                }

            } else {

                model.setCode(1);