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

81041

2018-11-26 8b67d0abb22ebbab192fa51be7f271eb215999d9

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

 gx_tieta/WebRoot/Top.jsp

@@ -132,6 +132,9 @@
                </div>     

                <div class="cell-list control">

                    <img src="image/webStatus/control_normal.gif" alt="线程监控程序" title="线程监控程序运行：正常">

                </div>

                <div class="cell-list server-time">					
                    2018-11-26 00:00:00

                </div>            

            </div>

            <div class="international">

@@ -334,8 +337,6 @@
    }

    

    

	
	
    $(function(){

        $.ajax({     

            type: "post",                 

@@ -528,6 +529,31 @@
        warnAlarmData = temp;

    }

    

    seachServerTime();

    //获取服务器上的时间

    function seachServerTime(){	
        $.ajax({ 	
            type:"post", 				
            url: "User_infAction!searchServerTime",				
            async:true,				
            dataType:'text',

            data:null,		
            success: function(data){ 
                data = eval('('+data+')');

                var model = eval('('+data.result+')');

                if(model.code == 1){

                    $('.server-time').text(model.msg);

                }else{

	
                }

                setTimeout(seachServerTime, 1000);				
            },

            error:function() {

                setTimeout(seachServerTime, 2000);

            } 				
        });

    }

	
    // 监测当前的告警信息是否为最新的告警

    function checkWarnDataIsNew(warnData) {

        var rs = 0;


 gx_tieta/WebRoot/mobil/batt-state-statistical.html

@@ -110,9 +110,9 @@
                            <option value="">全部</option>

                        </select>

                        <p>统计方式</p>

                        <select id="" data-mini="true">

                            <option value="">按年统计</option>

                            <option value="">按月统计</option>

                        <select id="statistics" data-mini="true">

                            <option value="3">按年统计</option>

                            <option value="1">按月统计</option>

                            

                        </select>

                         <p>时间</p>

@@ -193,19 +193,11 @@
         loadshow();

         var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';

        var temp = createSearchForm();

        console.info(stationid);

        /*var temp = {

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

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

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

            StationName: $("#station_name").val(),

            StationId: stationid

        };*/

        //console.info(temp);

           console.info(temp);

         var json = JSON.stringify(temp);

         //console.info(json);

        arrTd = new Array();

        $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){

        $.post("Bts_station_eventAction!serchByCondition","json="+json,function(data){

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

            //console.info(data);

            if(data.code==1 && data.data.length>0){

@@ -214,14 +206,18 @@
                arr=new Array();

                index=0;

                for(var i=0;i<data.length;i++){

                    Page.pageAll=data[i].Size;

                    arr[index++]=data[i].BattGroupId;                //电池组id

                    arr[index++]=data[i].StationName;                //机房名称

                    arr[index++]=data[i].StationIp;                    //机房IP

                    arr[index++]=data[i].BattGroupName;    //电池组名称

                    arr[index++]=data[i].BattGroupNum;                //电池组序号

					
					
                    arr[index++]=data[i].note;                        //测试日期

                    arr[index++]=data[i].stationName;                //机房名称

                    arr[index++]=data[i].station_event_type_poff;				
                    arr[index++]=data[i].station_event_type_fadian;					
                    arr[index++]=data[i].station_event_type_diaozhan;	
                    arr[index++]=data[i].station_event_type_dooropen;				
                    arr[index++]=data[i].station_event_type_xuhang;

                    arr[index++]=data[i].station_event_type_tempup;

                    arr[index++]=data[i].station_event_type_templow;

                    arr[index++]=data[i].station_event_type_dampup;

                    arr[index++]=data[i].station_event_type_damplow;

                    arr[index++]="";                                    //按钮

                }

               //console.info(Page);

               createTbl(tbl, arrTh, arr);

@@ -243,27 +239,18 @@


    

    function createSearchForm(){

        var stationid = $('#homeName').find("option:selected").attr('Stationid');

        var temp={

            page:{

                pageCurr:Page.pageCurr,

                pageSize:Page.pageSize,

            },

            binf:{

                StationName1:$('#mainteArea').val(),

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

                StationName5:$('#country').val(),

                StationName:$('#homeName').val(),

				
            },

			
            tdata:{	
				
                record_time:$('#startTestrecord').val(),           //电池测试记录时间段

                record_time1:$('#endTestrecord').val()  
				
            }

			
                StationName3:$('#homeName').val(),                                                    //机房名称

                StationId: stationid?stationid:0,

                BattInUseDate:$('#startTestrecord').val()+" 00:00:00",           //电池测试记录时间段

                BattInUseDate1:$('#endTestrecord').val()+" 23:59:59",  
                BattGroupNum:$('#statistics').val(),

        };

        console.info(temp);

        return temp;

    }

    // stringify(createSearchForm());

@@ -433,7 +420,7 @@
 

 //根据机房获取电池组   

     function findserchByBattGroupNamebystationname(){

        var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';

        var stationid = $("#country").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';

    

        var data = {

            StationName1: $("#mainteArea").val(),


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

@@ -1,5 +1,7 @@
package com.fgkj.actions;



import java.text.SimpleDateFormat;

import java.util.Date;

import java.util.List;



import com.fgkj.dao.UinfDaoFactory;

@@ -212,6 +214,17 @@
    public String checkService(){

        return SUCCESS;

    }

	
    //获取服务器的时间

    public String searchServerTime(){

        ServiceModel model = new ServiceModel();

        model.setCode(1);

        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        model.setMsg(sdf.format(new Date()));

        result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);

        return SUCCESS;

    }

	
    public String test(){

        System.out.println(upjson);

        System.out.println(uif);