hdw
2018-09-28 b4b5054b63c714268878f2f2a2b175fd69b3d8a5
包机组管理修改
2个文件已修改
304 ■■■■ 已修改文件
gx_tieta/WebRoot/elegroup.jsp 300 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/elegroup.jsp
@@ -35,14 +35,18 @@
                <!-- 维护区信息 -->
                <table>
                    <tr class="fWeight">
                        <td><s:text name="Maintenance_area"/></td>                    <!-- 维护区 -->
                        <td>省</td>                    <!-- 省 -->
                        <td>市</td>                    <!-- 市 -->
                        <td><s:text name="Computer_site"/></td>                        <!-- 机房站点(或机房设备) -->
                        <td><s:text name="Battery"/></td>                            <!-- 蓄电池组 -->
                    </tr>
                    <tr>
                        <td>
                            <select id="station_name1" name="">
                            </select>
                        </td>
                        <td>
                            <select id="city" name="">
                            </select>
                        </td>
                        <td>
@@ -109,8 +113,10 @@
    <!-- 右键表格菜单 -->
    <div id="tb-right-menu">
        <a href="javascript:;" class="apply"><s:text name="Apply"/></a>                                        <!-- 应用 -->
        <a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a>                    <!-- 添加单个电池组 -->
        <a href="javascript:;" class="add-province">添加全省机房</a>                                            <!-- 添加全省机房 -->
        <a href="javascript:;" class="add-city">添加全市机房</a>                                                <!-- 添加全市机房 -->
        <a href="javascript:;" class="add-station"><s:text name="Add_all_Chartere_room_batt_group"/></a>    <!-- 添加整个机房电池组 -->
        <a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a>                    <!-- 添加单个电池组 -->
        <!--<a href="javascript:;" class="add-weihuqu"><s:text name="Add_maintenance_area_batt_group"/></a>         添加整个维护区电池组 -->
        <div class="a-con">
            <a href="javascript:;" class="all-pitch"><s:text name="All_selected"/></a>                        <!-- 全部选中 -->
@@ -875,93 +881,160 @@
            });
        }
    }
    $(document).ready(function(){
    // 省-市-机房-电池组
    $(document).ready(function(){
        //页面加载时查询维护区中的枢纽类型
        $.post("BattInfAction_serchByStation",null,function(data){
        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
            data=data.result;
            data=eval("("+data+")");
            //console.info(data);
            if(data.code==1 && data.data.length>0){
                var Ostation_name1=document.getElementById("station_name1");
                Ostation_name1.innerHTML="";
                var $select = $("#station_name1");
                $select.text('');
                for(var i=0;i<=data.data.length;i++){
                    option=createEle("option");
                    $option=$("<option></option>");
                    if(i==0){
                        option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";        /* 全部    共   种 */
                        option.setAttribute("value", "");
                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                        $option.attr("value", "");
                    }else{
                        option.innerHTML=data.data[i-1].StationName1;
                        option.setAttribute("value",data.data[i-1].StationName1);
                        $option.text(data.data[i-1]);
                        $option.attr("value",data.data[i-1]);
                    }                    
                    Ostation_name1.appendChild(option);
                }
                    $select.append($option);
                }
            }else{
                $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
            }
            findStationNamebyStationname1();
        });
        //当维护区的值变换时更新机房站点
        $('#station_name1').change(function(){
            findStationNamebyStationname1()
            findCity();
        });
    });
    
    //根据维护区查询站点
    // 根据维护区的内容查询市
    function findCity() {
        var data = {
            StationName1: $("#station_name1").val()
        };
        // 请求获取当前省下的市
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName2",
            async:true,
            dataType:'json',
            data:"json = "+JSON.stringify(data),
            success: function(data){
                var rs = JSON.parse(data.result);
                var $select = $("#city");
                if(rs.code == 1) {
                    var _data= rs.data;
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for(var i=0;i<_data.length;i++){
                        var __data = _data[i];
                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                }else {
                    $select.text('').html('<option>暂无可测市</option>');
                }
                findStationNamebyStationname1();
            }
        });
    }
    //当维护区的值变换时更新市
    $('#station_name1').change(function(){
        findCity();
    });
    //当维护区的值变换时更新机房站点
    $('#city').change(function(){
        findStationNamebyStationname1();
    });
    //根据省,市查询站点
    function findStationNamebyStationname1(){
        var selectvalue=$("#station_name1 option:selected").val();
        $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
            data=data.result;
            data=eval("("+data+")");
            if(data.code==1 && data.data.length>0){
                var Ostttion_name = document.getElementById("station_name");
                Ostttion_name.innerHTML="";
                for(var i=0;i<=data.data.length;i++){
                    option=createEle("option");
                    if(i==0){
                        option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";
                        option.setAttribute("value", "");
                    }else{
                        option.innerHTML=data.data[i-1].StationName;
                        option.setAttribute("value",data.data[i-1].StationName);
                    }
                    Ostttion_name.appendChild(option);
        var tmp = {
            StationName1:$("#station_name1").val(),
            StationName2:$("#city").val()
        };
        //var selectvalue=$("#station_name1 option:selected").val();
        //alert(selectvalue);
        $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
            var rs = JSON.parse(data.result);
            if(rs.code==1){
                var _data = rs.data;
                var $select = $("#station_name");
                // 根据数据构造生成下拉列表的数据
                var optsList = [];
                for(var i=0;i<_data.length;i++){
                    var __data = _data[i];
                    var _attr = {
                        StationId: __data.StationId
                    };
                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
                    optsList.push(tmp);
                }
                // 根据数据生成下拉列表
                createOptions($select, optsList, true);
            }else{
                $("#station_name").text('').html('<option>暂无可测机房站点</option>');
            }
            findserchByBattGroupNamebystationname();
        });
        $('#station_name').change(function(){
            findserchByBattGroupNamebystationname();
        });
    }
    
    //根据维护区和机房查询蓄电池组
    // 根据机房名称查询电池组
    $('#station_name').change(function(){
        findserchByBattGroupNamebystationname();
    });
    //根据省,市和机房查询蓄电池组
    function findserchByBattGroupNamebystationname(){
        var station_name1=$("#station_name1 option:selected").val();
        var station_name=$("#station_name option:selected").val();
        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(),
            StationName: $("#station_name").val(),
            StationId: stationid
        };
        //var station_name1=$("#station_name1 option:selected").val();
        //var station_name=$("#station_name option:selected").val();
        
        $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
        $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
            data=data.result;
            //console.info(data);
            data=eval("("+data+")");
            //console.info(data.data);
            //console.info(data);
            if(data.code==1 && data.data.length>0){
                var Obattgroup_name = document.getElementById("battgroup_name");
                Obattgroup_name.innerHTML="";
                for(var i=0;i<=data.data.length;i++){
                    option=createEle("option");
                    if(i!=0){
                        option.innerHTML=data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>";
                        option.setAttribute("value",data.data[i-1].BattGroupId);
                    }else{
                        option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";
                        option.setAttribute("value", "0");
                    }
                    Obattgroup_name.appendChild(option);
                var $select = $("#battgroup_name");
                // 根据数据构造生成下拉列表的数据
                var optsList = [];
                for(var i=0;i<data.data.length;i++){
                    var _data = data.data[i];
                    var _attr = {
                        stationname: _data.StationName,
                        dev_id: _data.FBSDeviceId,
                        batt_num: _data.GroupIndexInFBSDevice+1
                    };
                    var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
                    var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
                    optsList.push(tmp);
                }
                // 根据数据生成下拉列表
                createOptions($select, optsList, true);
                $select.find('option').eq(0).val(0);
            }else{
                $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');
            }
        });
    }
    }
    
    //鼠标右键点击
    $('#tbroom').on('mousedown','table tr',function(e){
@@ -1251,15 +1324,100 @@
            
            showAllTd(bigEleGroupTxt,bigEleGroupVal);
        }
        // 添加整个省的机房
        $('#tb-right-menu .add-province').click(function() {
            //获取包机房名称和新增电池组名称
            var myRoom=new Array();
            var myRoomVal=new Array();
            var singleELeGroup=new Array();
            var singleEleVal=new Array();
            var province=$('#station_name1').attr('value');
            if(province.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
                var binf=new Object();
                binf={
                    BattGroupId: 0,                // 电池组id
                    StationName: '',            // 机房名称
                    StationName2: '',            // 市
                    StationName1: province,        // 省
                };
                var json=window.JSON.stringify(binf);
                $.post('BattInfAction!serchBatt','result='+json,function(data){
                    var model=eval("("+data.result+")");
                    //console.info(model);
                    if(model.code==1 && model.data.length>0){
                        //var stationid=0;
                        for(var i=0;i<model.data.length;i++){
                            var batt=model.data[i];
                            //console.info(batt);
                            myRoom.push(batt.StationName);
                            myRoomVal.push(batt.StationId);
                            singleELeGroup.push(batt.StationName);
                            singleELeGroup.push(batt.BattGroupName);
                            singleEleVal.push(batt.StationId);
                            singleEleVal.push(batt.BattGroupId);
                        }
                        //console.info(singleELeGroup);
                        addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);
                    }
                });
            }else{
                alert('请选择省!');        //请先选择省
            }
        });
        // 添加整个市的机房
        $('#tb-right-menu .add-city').click(function() {
            //获取包机房名称和新增电池组名称
            var myRoom=new Array();
            var myRoomVal=new Array();
            var singleELeGroup=new Array();
            var singleEleVal=new Array();
            var city = $('#city').attr('value');
            if(city.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
                var binf=new Object();
                binf={
                    BattGroupId: 0,                // 电池组id
                    StationName: '',            // 机房名称
                    StationName2: city,            // 市
                    StationName1: '',            // 省
                };
                //console.log(binf);
                var json=window.JSON.stringify(binf);
                $.post('BattInfAction!serchBatt','result='+json,function(data){
                    var model=eval("("+data.result+")");
                    console.info(model);
                    if(model.code==1 && model.data.length>0){
                        //var stationid=0;
                        for(var i=0;i<model.data.length;i++){
                            var batt=model.data[i];
                            //console.info(batt);
                            myRoom.push(batt.StationName);
                            myRoomVal.push(batt.StationId);
                            singleELeGroup.push(batt.StationName);
                            singleELeGroup.push(batt.BattGroupName);
                            singleEleVal.push(batt.StationId);
                            singleEleVal.push(batt.BattGroupId);
                        }
                        //console.info(singleELeGroup);
                        addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);
                    }
                });
            }else{
                alert('请选择市!');        //请先选择市
            }
        });
        //添加单个电池组
        $('#tb-right-menu .add-batt').click(function(){
            var battgrouid=    $('#battgroup_name').attr('value');
            if(battgrouid!=0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
                var binf=new Object();
                binf={
                    BattGroupId:battgrouid,
                    StationName:'',
                    StationName1:'',
                    BattGroupId: battgrouid,    // 电池组id
                    StationName: '',            // 机房名称
                    StationName2: '',            // 市
                    StationName1: '',            // 省
                };
                var json=window.JSON.stringify(binf);
                $.post('BattInfAction!serchBatt','result='+json,function(data){
@@ -1296,9 +1454,10 @@
            if(stationname.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
                var binf=new Object();
                binf={
                    BattGroupId:0,
                    StationName:stationname,
                    StationName1:'',
                    BattGroupId: 0,                // 电池组id
                    StationName: stationname,    // 机房名称
                    StationName2: '',            // 市
                    StationName1: '',            // 省
                };
                var json=window.JSON.stringify(binf);
                $.post('BattInfAction!serchBatt','result='+json,function(data){
@@ -1456,13 +1615,14 @@
                }
            }
        }
        console.info(oldArrVal);
        //console.info(oldArrVal);
    }
    
    //显示所有的单元格
    function showAllTd(bigArrTxt,bigArrVal){
        var tmp = battstationList[0]?battstationList[0]:[];
        //创建表格
        createTablenew($('#tbroom'),ArrTh,battstationList[0]);
        createTablenew($('#tbroom'),ArrTh,tmp);
        //console.info(ArrTd);
        for(var i=1;i<battstationList.length;i++)
        {
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -355,8 +355,8 @@
            baseSql+=station1SqlF;
        }
        //用于维护区
        String station2SqlT=" stationname2!=? ";//全部
        String station2SqlF=" stationname2=? ";
        String station2SqlT=" and stationname2!=? ";//全部
        String station2SqlF=" and stationname2=? ";
        if(binf.getStationName2().equals("")){
            baseSql+=station2SqlT;
        }else{