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

hdw

2018-11-20 fd77d548a62649faabcecd1c33352aa28cf8fead

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

 gx_tieta/WebRoot/iframe/batt-state-statistical-details.html

@@ -125,7 +125,7 @@
                    ,{field:'warntype', title:'异常类型', align:'center'}

                    ,{field:'warnstarttime', title:'异常开始时间', align:'center', sort: true}

                    ,{field:'warnendtime', title:'异常结束时间', align:'center'}

                    ,{field:'warntimelen', title:'异常时长(秒)', align:'center'}

                    ,{field:'warntimelen', title:'异常时长(分钟)', align:'center'}

                ]]

                ,data: rsData

                ,page: {

@@ -164,7 +164,7 @@
                        if(temp.warntypenum == _data.station_event_type){

                            temp.warnendtime = _data.record_datetime;

                            var timelong = (new Date(temp.warnendtime).getTime()- new Date(temp.warnstarttime).getTime())/1000;

                            temp.warntimelen = timelong;

                            temp.warntimelen = (timelong/60).toFixed(2);

                        }

                

                    }


 gx_tieta/WebRoot/index.jsp

@@ -956,6 +956,8 @@
                             Almarr.push(/*{

                             name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId)            // 容量告警告警                                     

                             } ,*/{

                                 name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id),                // 在线电压 
                             },{

                                 name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum),                    // 组端电压 

                             },{

                                 name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id),                    // 充电电流 


 gx_tieta/WebRoot/mobil/battM.html

@@ -56,7 +56,7 @@
            }

        }*/

        

        var temp = getCookie("county");

        var temp = getCookie("battselect");

        temp = JSON.parse(temp);

        console.info(temp);

        //根据机房id查询电池组

@@ -65,11 +65,13 @@
            var data = {

                        StationName1: temp.StationName1,

                        StationName2: temp.StationName2,

                        StationName5: temp.StationName5

                        StationName5: temp.StationName5,

                        StationName: temp.StationName,

                        StationId: temp.StationId

                    };

            $.ajax({     

                type: "post",                 

                url: "BattInfAction!serchStationName3",				
                url: "BattInfAction!serchBattByStation",				
                async:true,                

                dataType:'text',

                data:"json = "+JSON.stringify(data),

@@ -105,7 +107,7 @@
            for (var i = 0; i < dataList.length; i++){

                var _li = $('<li></li');

                

                var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value=""  data-transition="slide">'+dataList[i].StationName3+'</a>');

                var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value=""  data-transition="slide">'+dataList[i].BattGroupName+'</a>');

                // 将_a添加到_li，将_li添加到_ul中

                _li.append(_a);

                _ul.append(_li);


 gx_tieta/WebRoot/mobil/control.html

@@ -107,6 +107,7 @@
        function searchBattInfo(){

            var temp = getCookie("batt");

            var batt = JSON.parse(temp);

            console.info(batt);

            arrTd = new Array();

            $.ajax({     

                type: "post",                 


 gx_tieta/WebRoot/mobil/history.html

@@ -63,6 +63,7 @@
            var res_list=new Array();            //电导内阻测试数据

            var temp = getCookie("batt");

            var batt=eval("("+temp+")");

            console.info(batt);

            $(document).ready(function(){

                //console.info(batt);

                

@@ -94,6 +95,10 @@
            

            function searchcharedata(batt){

                loadshow();

                var temp = {

                    num:batt.FBSDeviceId,

                    BattGroupId:batt.BattGroupId

                };

                jieneng_charge_list = new Array();        //节能充电测试数据

                tingdian_charge_list = new Array();        //停电充电测试数据

                

@@ -101,10 +106,10 @@
                tingdian_discharge_list = new Array();    //停电放电测试数据

                //jiafu_discharge_list = new Array();    //假负载放电测试数据

                $.ajax({

                    url : "Batttestdata_infAction!findByInfo",

                    url : "Batttestdata_infAction_searchBattTestInfDataById",

                    async: true,

                    type : "POST",

                    data : "bti.BattGroupId="+batt.BattGroupId,

                    data : "json="+JSON.stringify(temp),

                    dataType :    "json",

                    success : function(data){

                        //console.info(data);


 gx_tieta/WebRoot/mobil/selectbatt.html

New file
@@ -0,0 +1,150 @@
<!doctype html>

<html>

<head>

<meta charset="utf-8">

<title></title>

<meta name="viewport" content="width=device-width,initial-scale=1">

<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>

<link rel="stylesheet" href="css/breadcrumb.css">

<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>

<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>

<script type="text/javascript" src="mobilJs/base.js"></script>

</head>

    <body>

        <!-- 三级菜单内容    -->

        <div data-role="page">

            <div data-role="header" data-position="fixed">

                <a href="machineroomM.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>

                <h1>蓄电池组</h1>

            </div>

	
            <div data-role="content">

                <ul class="breadcrumb"></ul>

                <div id="battList2"></div>

            </div>

            <div data-role="footer" data-position="fixed">

                <!-- <h1>福光电子有限公司</h1> -->

            </div>

        </div>

    </body>

    <script type="text/javascript" src="js/battNav.js"></script>

    <script type="text/javascript">

		
        var battinlist = new Array();            //所有电池组的数组

		
        $(document).ready(function(){

            setCookie('batt', '');

            //init();

            searchkBattByStationid();

        });

		
    /*    function init(){

            var temp = getCookie("county");

            if(temp != '' || temp != undefined) {

                temp = eval('('+temp+')');

				
                var data = [

                    {url: 'javascript:JumpHomePage();', txt: '首页'},

                    {url: 'machineroomM.html', txt: temp.StationName5 },

                    {url: 'javascript:;', txt: '蓄电池组'}

                ];

                addBreadCrumb($('.breadcrumb').eq(0),data);

							
                searchkBattByStationid(temp.StationId);

            }else {

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

            }

        }*/

		
        var temp = getCookie("county");

        temp = JSON.parse(temp);

        console.info(temp);

        //根据机房id查询电池组

        function searchkBattByStationid(){

            loadshow();

            var data = {

                        StationName1: temp.StationName1,

                        StationName2: temp.StationName2,

                        StationName5: temp.StationName5

                    };

            $.ajax({ 	
                type: "post", 				
                url: "BattInfAction!serchStationName3",				
                async:true,				
                dataType:'text',

                data:"json = "+JSON.stringify(data),

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

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

                    console.info(model);

                    if(model.code == 1){

                        battinlist = model.data;

                        createUl($('#battList2'), model.data);

                    }

                    loadclose();

                },

                error:function(){

                    loadclose();

                } 				
            });

        }

		
        /*

            声明一个函数createUl,用于生成ul和li

            @param ulCon ul的容器

            @param dataList  ul的数据内容

        */

        function createUl(ulCon, dataList) {

            // 清理容器下的ul

            ulCon.find('ul').remove();

			
            // 创建ul

            var _ul = $('<ul data-role="listview" data-inset="true"></ul>');

			
            // 遍历dataList生成li和a

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

                var _li = $('<li></li');

				
                var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value=""  data-transition="slide">'+dataList[i].StationName3+'</a>');

                // 将_a添加到_li，将_li添加到_ul中

                _li.append(_a);

                _ul.append(_li);

            }

			
            // 将_ul添加到容器中

            ulCon.append(_ul).trigger('create');			
            loadclose();

        }

		
        $(document).ready(function () {

            var aLi = -1;

            $('#battList2').on('click', 'ul li', function () {

                aLi = $(this).index();

                batt = getbatt(battinlist,aLi);

                var json=window.JSON.stringify(batt);

                setCookie("battselect",json);

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

            });

        });

		
		
		
        //获取当前选中的batt

        function getbatt(arr,index){

            console.log(arr);

            console.log(index);

            if(arr.length>index){

                return arr[index];

            }

            return undefined;

        };

		
        $(function(){

            $('.breadcrumb').on('tap', 'a[href="#page0"]', function() {

                list=getList(battinlist,0,batt);

                //init();

            });

        });

    </script>

	
</html>

 gx_tieta/WebRoot/mobil/selectcounty.html

@@ -65,7 +65,7 @@
                

                var json=window.JSON.stringify(county);

                setCookie("county",json);

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

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

            });

                

        });


 gx_tieta/WebRoot/mobil/testdata.html

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

            <script type="text/javascript">

                $(function() {

                console.warn(111133);

                //console.warn(111133);

                console.info(batt);

                    var data = [

                        {url: 'javascript:JumpHomePage();', txt: '首页'},


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

@@ -27,6 +27,7 @@
import com.fgkj.dto.Batttestdata_inf;

import com.fgkj.dto.Page;

import com.fgkj.dto.ServiceModel;

import com.fgkj.dto.User;

import com.fgkj.dto.User_inf;

import com.fgkj.dto.User_log;



@@ -238,7 +239,7 @@
        adata.setAlm_cleared_type(0);//单体内阻告警数

        adata.setUsr_Id(0);//连接条阻抗告警数

        adata.setAlm_value(0f);//容量更换告警



        adata.setRecord_Id(0l);//在线电压告警数

        bmd.setAdata(adata);

        int numZ=0;//告警总数

        //求八种类型告警的数量  

@@ -279,6 +280,9 @@
                }

                if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){

                    adata.setAlm_value((float)list.get(i).getNum());//容量更换告警数

                    numZ+=list.get(i).getNum();

                }if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){

                    adata.setRecord_Id((long)list.get(i).getNum());//在线电压告警数

                    numZ+=list.get(i).getNum();

                }



@@ -566,20 +570,21 @@
        tdata.setRecord_time(ActionUtil.getSimpDate(date1));

        tdata.setRecord_time1(ActionUtil.getSimpDate(date2));

        

        User_inf uinf=new User_inf();

        uinf.setUId(1002);

        Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();

        bmd.setPage(p);

        bmd.setAdata(adata);

        bmd.setMainf(mainf);

        bmd.setBinf(binf);

        bmd.setTdata(tdata);

        bmd.setUinf(uinf);

        //System.out.println(bmd);

        //bs.serchByCondition(bmd);

        //bs.serchByInfo(bmd);

        //.serchAlm(bmd);

        bs.serchAlm(bmd);

        //bs.serchGood();

        User_inf uinf=new User_inf();

        uinf.setUId(1038);

        bs.serchTopAlmTen(uinf);

        //bs.serchTopAlmTen(uinf);

    }



}