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

81041

2018-11-01 30fd57f9bae8c05e99f85c41efdcb14b52c29d29

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

 gx_tieta/WebRoot/batt-life-manage.jsp

@@ -465,7 +465,7 @@
        function searchBattLife(isLoad){

            var temp = createSearchParam();

            var json = JSON.stringify(temp);

            var arrTd = new Array();

            arrTd = new Array();

            var load;

            if(isLoad) {

                load = layer.load(1);

@@ -503,12 +503,12 @@
                        Page.pageAll = data[data.length-1].page.pageAll;

                        var pageNum=Math.ceil(Page.pageAll/Page.pageSize);

                        $('#total').text(Page.pageAll);

                        $('#current').text(Page.pageCurr+"/"+pageNum);

                        createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);

                        $('#current').text(Page.pageCurr+"/"+pageNum);	
                    }

					
                }

                    createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);			
                }	
            });

			
        }

        //首页

        $('#home').click(function(){


 gx_tieta/WebRoot/dischargeplan.jsp

@@ -20,7 +20,7 @@
    <link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">

    <link rel="stylesheet" type="text/css" href="css/progress.css">

    <link rel="stylesheet" type="text/css" href="css/popup.css">

	
    <link href="src/css/layui.css" type="text/css" rel="stylesheet">

    <!-- 导入Echarts的js包 -->

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

    <!-- 导入frame.js -->

@@ -42,6 +42,7 @@
                    <tr class="fWeight">

                        <td>省</td>                                    <!-- 省 -->

                        <td>市</td>                                    <!-- 市 -->

                        <td>区/县</td>                                <!-- 区/县 -->

                        <td><s:text name="Computer_site"/></td>        <!-- 机房站点（或机房设备） -->

                        <td><s:text name="Battery"/></td>            <!-- 蓄电池组 -->

                        <td><s:text name="Test"/><s:text name="Status"/></td>        <!-- 测试状态 -->

@@ -56,14 +57,13 @@
                            <select id="city" name="station_name2"></select>

                        </td>

                        <td>

                            <select id="station_name" name="station_name">

								
                            </select>

                            <select id="county" name="station_name5"></select>

                        </td>

                        <td>

                            <select id="battgroup_name" name="battgroup_name">

								
                            </select>

                            <select id="station_name" name="station_name"></select>

                        </td>

                        <td>

                            <select id="battgroup_name" name="battgroup_name"></select>

                        </td>

                        <td>

                            <select id="discharge-state" name="discharge-state">

@@ -167,6 +167,7 @@
    <script type="text/javascript" src="js/popup.js"></script>

    <!-- 导入Jquery -->

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

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

    <script type="text/javascript">

        var Page = {

            pageSize:10,                 //每页的行数

@@ -487,7 +488,7 @@
        

        var formjson;

        function searchDischarge(){

            loading.showLoading();			
            var load = layer.load(1);			
            var jsontemp = $('#search_form').serialize();

            if(formjson != jsontemp){

                Page.pageCurr = 1;

@@ -502,7 +503,7 @@
                async:true,                

                dataType:'text',

                data:"json="+json,        

                success: function(data){ 
                success: function(data){

                    arrTd = new Array();

                    data = eval('('+data+')');

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

@@ -546,11 +547,11 @@
                    $('#page_num').val(Page.pageCurr);

                    //console.info(arrTd);

                    changeTblByStatus();

                    loading.hideLoading();										
                    layer.close(load);										
                }                 

            }).error(function(){

                noContent.showNoContent("<s:text name='Search'/><s:text name='Fail'/>,<s:text name='Please'/><s:text name='Examine'/><s:text name='Network'/><s:text name='Connect'/>！");            //查询失败,请检查网络连接

                loading.hideLoading();

                layer.close(load);

            });

        }

        

@@ -619,7 +620,9 @@
        $('#end-discharge-end-date').val(new Date().format('yyyy-MM-dd'));

        

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

        var filterLoad;

        $(document).ready(function(){

            filterLoad = layer.load();

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

            $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){

                data=data.result;

@@ -647,10 +650,14 @@
        });

        

        // 根据维护区的内容查询市

        function findCity() {

        function findCity(isLoad) {

            var data = {

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

            };

            // 是否添加等待

            if(isLoad) {

                filterLoad = layer.load();

            }

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

            $.ajax({     

                type: "post",                 

@@ -675,27 +682,121 @@
                    }else {

                        $select.text('').html('<option>暂无可测市</option>');

                    }

                    findStationNamebyStationname1();

                    findCounty();

                }

            });

        }

        

        // 查询区/县

        function findCounty(isLoad) {

            var tmp = {

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

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

            };

            // 是否添加等待

            if(isLoad) {

                filterLoad = layer.load();

            }

            // 查询区县

            $.ajax({

                type: 'post',

                async: true,

                url: "BattInfAction!serchStationName5",

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

                success:function(data) {

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

                    var $select = $("#county");

                    if(rs.code==1){

                        var _data = rs.data;

                        // 根据数据构造生成下拉列表的数据

                        var optsList = [];

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

                            var __data = _data[i];

                            var _attr = {

                                StationId: __data.StationId

                            };

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

                            optsList.push(tmp);

                        }

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

                        createOptions($select, optsList, true);

                    }else{

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

                    }

                    findCounty();

                }

            });

        }

		
        // 查询区/县

        function findCounty(isLoad) {

            var tmp = {

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

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

            };

            // 是否添加等待

            if(isLoad) {

                filterLoad = layer.load();

            }

            // 查询区县

            $.ajax({

                type: 'post',

                async: true,

                url: "BattInfAction!serchStationName5",

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

                success:function(data) {

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

                    var $select = $("#county");

                    if(rs.code==1){

                        var _data = rs.data;

                        // 根据数据构造生成下拉列表的数据

                        var optsList = [];

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

                            var __data = _data[i];

                            var _attr = {

                                StationId: __data.StationId

                            };

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

                            optsList.push(tmp);

                        }

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

                        createOptions($select, optsList, true);

                    }else{

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

                    }

                    findStationNamebyStationname1();

                }

            });

        }

		
        //当维护区的值变换时更新市

        $('#station_name1').change(function(){

            findCity();

            findCity(true);

        });

        

        //当维护区的值变换时更新机房站点

        $('#city').change(function(){

            findStationNamebyStationname1();

            findCounty(true);

        });

		
        //当区/县的值变换时更新机房站点

        $('#county').change(function(){

            findStationNamebyStationname1(true);

        });

        

        //根据省，市查询站点

        function findStationNamebyStationname1(){

        function findStationNamebyStationname1(isLoad){

            var tmp = {

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

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

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

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

            };

            // 是否添加等待

            if(isLoad) {

                filterLoad = layer.load();

            }

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

            //alert(selectvalue);

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

@@ -725,20 +826,24 @@
        

        // 根据机房名称查询电池组

        $('#station_name').change(function(){

            findserchByBattGroupNamebystationname();

            findserchByBattGroupNamebystationname(true);

        });

        

        //根据省，市和机房查询蓄电池组

        function findserchByBattGroupNamebystationname(){

        function findserchByBattGroupNamebystationname(isLoad){

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

            // 构造查询条件

            var tmp = {

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

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

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

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

                StationId: stationid

            };

			
            // 是否添加等待

            if(isLoad) {

                filterLoad = layer.load();

            }

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

                data=data.result;

                //console.info(data);

@@ -767,6 +872,8 @@
                }else{

                    $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');

                }

				
                layer.close(filterLoad);

            });

        }

                

@@ -797,6 +904,7 @@
            var temp = {

                binf:{

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

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

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

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

                    BattGroupId:$('#battgroup_name').val(),


 gx_tieta/WebRoot/taskplan.jsp

@@ -702,7 +702,7 @@
                StationName:$('#station_name').val(),

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

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

                StationNmae5:$('#county').val(),

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

                BattGroupId:$('#battgroup_name').val(),

                BattProducer:$('#producer').val(),

                BattInUseDate:$('#startinusedate').val()+" 00:00:00",