station3->0

hdw

2018-09-27 44d9cc533a7ff51146d6f33530c84ef4f50dbe2e

station3->0

 gx_tieta/WebRoot/batt-attention.jsp

@@ -417,7 +417,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                        optsList.push(tmp);

                    }

                    

@@ -441,7 +441,7 @@
            var tmp = {

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

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

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

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

                StationId: stationid

            };

        


 gx_tieta/WebRoot/control.jsp

@@ -3976,11 +3976,10 @@
            // 机房->电池组

            treeView.ele.on('click', '.home', function() {

                var home = $(this).data('attr');

                console.log(home);

                var tmp = {

                    StationName1: home.StationName1,

                    StationName2: home.StationName2,

                    StationName3: home.StationName3,

                    StationName: home.StationName,

                    StationId: home.StationId

                };

                fourth(treeView, $(this).parent(), tmp);

@@ -3994,7 +3993,7 @@
                    BattGroupId = eleGroup.BattGroupId;

                    // 对BTS9611做特殊的处理

                    var batt = getBatt();

                    console.info(batt);

                    //console.info(batt);

                    $('#eleCircleBtn').removeClass('hide');

                    if(regEquipType(batt.FBSDeviceId, globalPattern.BTSSreen)) {

                        var isAct = $('#eleCircleBtn').hasClass('action');


 gx_tieta/WebRoot/dataManage.jsp

@@ -688,7 +688,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                

@@ -712,7 +712,7 @@
        var tmp = {

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

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

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

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

            StationId: stationid

        };

    


 gx_tieta/WebRoot/dischargetest.jsp

@@ -1217,7 +1217,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                        optsList.push(tmp);

                    }

                    

@@ -1241,7 +1241,7 @@
            var tmp = {

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

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

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

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

                StationId: stationid

            };

        


 gx_tieta/WebRoot/ele-param.jsp

@@ -672,7 +672,7 @@
                            var _attr = {

                                StationId: __data.StationId

                            };

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

                            var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                            optsList.push(tmp);

                        }

                        


 gx_tieta/WebRoot/eleAnalyse.jsp

@@ -396,7 +396,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                

@@ -421,7 +421,7 @@
        var tmp = {

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

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

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

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

            StationId: stationid

        };

    


 gx_tieta/WebRoot/eleAssess.jsp

@@ -657,7 +657,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                

@@ -682,7 +682,7 @@
        var tmp = {

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

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

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

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

            StationId: stationid

        };

    


 gx_tieta/WebRoot/eleHistoryWarn.jsp

@@ -517,7 +517,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                        optsList.push(tmp);

                    }

                    

@@ -542,7 +542,7 @@
            var tmp = {

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

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

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

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

                StationId: stationid

            };

        


 gx_tieta/WebRoot/eleMonomer.jsp

@@ -712,7 +712,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                

@@ -737,7 +737,7 @@
        var tmp = {

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

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

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

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

            StationId: stationid

        };

    


 gx_tieta/WebRoot/ele_statistics.jsp

@@ -634,7 +634,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                

@@ -658,7 +658,7 @@
        var tmp = {

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

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

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

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

            StationId: stationid

        };

    


 gx_tieta/WebRoot/elestatus.jsp

@@ -430,7 +430,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                        optsList.push(tmp);

                    }

                    

@@ -455,7 +455,7 @@
            var tmp = {

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

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

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

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

                StationId: stationid

            };

        


 gx_tieta/WebRoot/elewarn.jsp

@@ -649,7 +649,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                

@@ -674,7 +674,7 @@
        var tmp = {

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

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

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

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

            StationId: stationid

        };

    


 gx_tieta/WebRoot/endure.jsp

@@ -376,7 +376,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                        optsList.push(tmp);

                    }

                    


 gx_tieta/WebRoot/equip-charge-param.jsp

@@ -444,7 +444,7 @@
                        var __data = _data[i];

                        var _attr = {

                            'stataion_name1': __data.StationName1,

                            'stataion_name': __data.StationName3,

                            'stataion_name': __data.StationName,

                            'dev_name': __data.FBSDeviceName

                        };

                        var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);


 gx_tieta/WebRoot/equipHistWarn1.jsp

@@ -89,13 +89,18 @@
                    <!-- 维护区信息 -->

                    <table>

                        <tr class="fWeight">

                            <td><s:text name="Maintenance_area"/></td>                <!-- 维护区 -->

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

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

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

                            <td colspan="2"><s:text name="Alarm_start_time"/></td>    <!-- 告警开始时间段 -->

                        </tr>

                        <tr>

                            <td>

                                <select id="station_name1" name="station_name1">

                                </select>

                            </td>

                            <td>

                                <select id="city" name="station_name2">

                                </select>

                            </td>

                            <td>

@@ -523,7 +528,8 @@
        });

    }

    

    $(document).ready(function(){

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

    $(document).ready(function(){

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

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

            data=data.result;

@@ -546,118 +552,99 @@
            }else{

                $("#station_name1").text('').html('<option>暂无管理的维护区</option>');

            }

            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();

    });

    

    var isNewload = true;

    //根据维护区查询站点

    //根据省，市查询站点

    function findStationNamebyStationname1(){

        var user = {

            UNote:$("#station_name1 option:selected").val()

        var tmp = {

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

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

        };

        var stationid = getQueryString("stationId");

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

        //alert(selectvalue);

        $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){

            //console.info(data);

            data=data.result;

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

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

        $.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");

                $select.text('');

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

                    var $option=$("<option></option>");

                    if(i==0){

                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
                        $option.attr("value", "");			
                    }else{

                        $option.text(data.data[i-1]);

                        $option.attr("value",data.data[i-1]);

                        if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){

                            $option.attr("selected",true);

                            isNewload = false;

                        }	
                    }					
                    $select.append($option);

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

                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>');

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

            }

            seachDevHisAlarm();

        });

    }

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

    $.post("BattInfAction_serchByStation",null,function(data){

        data=data.result;

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

        //console.info(data);

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

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

            $select.text("");

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

                $option=$("<option></option>");

                if(i==0){

                    $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
                    $option.attr("value", "");			
                }else{

                    $option.text(data.data[i-1].StationName1);

                    $option.attr("value",data.data[i-1].StationName1);	
                }					
                $select.append($option);

            }				
        }

        findStationNamebyStationname1();		
    });

    

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

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

        findStationNamebyStationname1();

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

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

        seachDevHisAlarm();

    });

	
    //根据维护区查询站点

    function findStationNamebyStationname1(){

        var stationid = getQueryString("stationId");

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

        //alert(selectvalue);

        $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){

            //console.info(data);

            data=data.result;

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

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

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

                $select.text("");

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

                    var $option=$("<option></option>");

                    if(i==0){

                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
                        $option.attr("value", "");			
                    }else{

                        $option.text(data.data[i-1].StationName);

                        $option.attr("value",data.data[i-1].StationName);	
                        if(stationid !=undefined && stationid == data.data[i-1].StationName){

                            $option.attr("selected",true);

                        }						
                    }					
                    $select.append($option);					
                }

                seachDevHisAlarm();

            }

        });

    } */

    

    //构造查询条件

    function createSearchParam(){

        var temp = {

            binf:{

                StationName:$('#station_name').val(),        //机房名

                StationName1:$('#station_name1').val(),        //维护区

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

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

                BattProductDate:$('#starttime').val()+" 00:00:00",

                BattProductDate1:$('#endtime').val()+" 23:59:59",

            },

@@ -666,6 +653,7 @@
                pageCurr:Page.pageCurr,                        //当前页

            }

        };

        console.log(temp);

        return temp;

    }

    


 gx_tieta/WebRoot/equipWarn1.jsp

@@ -574,6 +574,7 @@
                    pageCurr:Page.pageCurr,                        //当前页

                }

            };

            console.log(temp);

            return temp;

        }

        

@@ -966,7 +967,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                        optsList.push(tmp);

                    }

                    


 gx_tieta/WebRoot/equipment.jsp

@@ -930,7 +930,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                


 gx_tieta/WebRoot/pages/js/pages/siderbar.js

@@ -301,13 +301,12 @@
            success: function(data){

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

                treeView.delProgress(container);

                console.info(rs);

                if(rs.code == 1) {

                    var _data= rs.data;

                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName3, 'home', __data);

                        var tmp = treeView.getFolder(__data.StationName, 'home', __data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

@@ -329,7 +328,7 @@
        var tmp = {

            StationName1: data.StationName1,

            StationName2: data.StationName2,

            StationName3: data.StationName3,

            StationName: data.StationName,

            StationId: data.StationId

        };

        fourth(treeView, container, tmp, true);

@@ -357,7 +356,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFile(__data.StationName3, 'home', '',__data);

                        var tmp = treeView.getFile(__data.StationName, 'home', '',__data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);


 gx_tieta/WebRoot/taskplan.jsp

@@ -546,7 +546,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    optsList.push(tmp);

                }

                

@@ -571,7 +571,7 @@
        var tmp = {

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

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

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

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

            StationId: stationid

        };