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

81041

2018-11-01 fec317a184dbe5c28902bdaf9a5b07512f6ae2c8

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

 gx_tieta/WebRoot/eleAssess.jsp

@@ -15,6 +15,7 @@
    <link href="css/basic.css" type="text/css" rel="stylesheet" />

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

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

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

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

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

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

@@ -46,6 +47,8 @@
                        <td>省</td>

                        <!-- 市 -->

                        <td>市</td>

                        <!-- 区/县 -->

                        <td>区/县</td>

                        <!-- 机房站点（或机房设备） -->

                        <td><s:text name="Computer_site"/></td>

                        <!-- 蓄电池组 -->

@@ -75,6 +78,10 @@
                        </td>

                        <td>

                            <select id="city" name="bd.binf.StationName2">

                            </select>

                        </td>

                        <td>

                            <select id="county" name="bd.binf.StationName5">

                            </select>

                        </td>

                        <td>

@@ -224,6 +231,7 @@
    <div id="allTransShade"></div>

    <div id="allShade"></div>    

</body>

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

<script type="text/javascript">

    var permits;

    <%    Object obj=session.getAttribute("permits");

@@ -255,8 +263,8 @@
    var lastjson;

    $(document).ready(function(){

        $("#container a").eq(0).click(function(){

        $('#maintence_infor').scrollTop(0);

        $('#maintence_infor').scrollLeft(0);

            $('#maintence_infor').scrollTop(0);

            $('#maintence_infor').scrollLeft(0);

            createWait($('#maintence_infor'));

            $('#allTransShade').show();

            var newjson = $("#search_form").serialize();

@@ -566,7 +574,9 @@
    }

    

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

    var filterLoad;

    $(document).ready(function(){

        filterLoad = layer.load();

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

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

            data=data.result;

@@ -594,10 +604,14 @@
    });

    

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

    function findCity() {

    function findCity(isLoad) {

        var data = {

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

        };

        // 是否添加等待

        if(isLoad) {

            filterLoad = layer.load();

        }

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

        $.ajax({     

            type: "post",                 

@@ -622,9 +636,51 @@
                }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>');

                }

                findStationNamebyStationname1();

            }

        });

    }

    

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

@@ -634,15 +690,25 @@
    

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

    $('#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){

@@ -672,20 +738,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();

        }

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

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

        

@@ -716,6 +786,8 @@
            }else{

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

            }

			
            layer.close(filterLoad);

        });

    }

    

@@ -929,7 +1001,8 @@
            },

            binf:{

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

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

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

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

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

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

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