hdw
2018-09-26 57344eb33c330b854ba132e12319949c9f93d36f
电池测试省-市-机房-电池组联动
5个文件已修改
214 ■■■■ 已修改文件
gx_tieta/WebRoot/charge-test.jsp 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/dischargetest.jsp 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/createTab.js 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/pages/siderbar.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/charge-test.jsp
@@ -4646,6 +4646,9 @@
        treeView.ele.on('click', '.home', function() {
            var home = $(this).data('attr');
            var tmp = {
                StationName1: home.StationName1,
                StationName2: home.StationName2,
                StationName3: home.StationName3,
                StationId: home.StationId
            };
            fourth(treeView, $(this).parent(), tmp);
gx_tieta/WebRoot/control.jsp
@@ -3976,7 +3976,11 @@
            // 机房->电池组
            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,
                    StationId: home.StationId
                };
                fourth(treeView, $(this).parent(), tmp);
gx_tieta/WebRoot/dischargetest.jsp
@@ -84,7 +84,8 @@
                <table>
                    <thead>
                        <tr>
                            <th><s:text name="Maintenance_area"/><!-- 维护区 --></th>
                            <th>省</th>
                            <th>市<!-- 维护区 --></th>
                            <th><s:text name="Computer_site"/><!-- 机房站点(或机房设备) --></th>
                            <th><s:text name="Battery_name"/><!-- 蓄电池组名称 --></th>
                        </tr>
@@ -93,6 +94,10 @@
                        <tr>
                            <td>
                                <select id="station_name1">
                                </select>
                            </td>
                            <td>
                                <select id="city">
                                </select>
                            </td>
                            <td>
@@ -164,31 +169,31 @@
                            <th><s:text name="Discharging"/><s:text name="Hourly_rate"/><!-- 放电小时率 --></th>
                        </tr>
                        <tr>
                            <td><input id="discurr" type="text" value="25"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="hourrate" type="text" value="20"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="discurr" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="hourrate" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                        </tr>
                        <tr>
                            <th><s:text name="Discharging"/><s:text name="Capacity"/><!-- 放电容量 -->(0~90000AH)</th>
                            <th><s:text name="Discharging"/><s:text name="Time_long"/><!-- 放电时长 -->(0~5940<s:text name="Minutes"/>)</th>
                        </tr>
                        <tr>
                            <td><input id="discap" type="text" value="250"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="distime" type="text" value="600"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="discap" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="distime" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                        </tr>
                        <tr>
                            <th><s:text name="Monomer"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 单体下限阀值 -->(0~20V)</th>
                            <th><s:text name="Group_of_end"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 组端下限阀值 -->(0~60V)</th>
                        </tr>
                        <tr>
                            <td><input id="MonomerVol_low" type="text" value="1.804"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="GroupVol_low" type="text" value="46.0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="MonomerVol_low" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="GroupVol_low" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                        </tr>
                        <tr>
                            <th><s:text name="Monomer"/><s:text name="Lower_limit"/><s:text name="Amount"/><!-- 单体下限数量 --></th>
                            <th><s:text name="On-line_voltage"/><s:text name="Low"/><s:text name="Dispose"/><!-- 在线电压低处理 --></th>
                        </tr>
                        <tr>
                            <td><input id="MonomerlowCount" type="text" value="1"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td><input id="MonomerlowCount" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
                            <td>
                                <select id="OnlineVolLowAction">
                                    <option value="0"><s:text name="Stop"/><s:text name="Test"/><!-- 停止测试 --></option>
@@ -1124,61 +1129,99 @@
        
        $(document).ready(function(){
            //页面加载时查询维护区中的枢纽类型
            $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
            $.post("BattInfAction!serchAllStation",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.data.length+"<s:text name='Species'/>)");
                            $option.attr("value", "");
                        }else{
                            $option.text(data.data[i-1]);
                            $option.attr("value",data.data[i-1]);
                        }
                        $select.append($option);
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for(var i=0;i<data.data.length;i++){
                        var _data = data.data[i];
                        var tmp = getOptionsData(_data.StationName1, _data.StationName1, _data);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                }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(){
            findStationNamebyStationname1();
            findCity();
        });
        
        //当市的值变换时更新机房站点
        $('#city').change(function(){
            findStationNamebyStationname1();
        });
        //根据维护区查询站点
        function findStationNamebyStationname1(){
            var user = {
                UNote:$("#station_name1 option:selected").val()
            var tmp = {
                StationName1:$("#station_name1").val(),
                StationName2:$("#city").val()
            };
            //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]);
                        }
                        $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.StationName3, __data, _attr);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                }else{
                    $("#station_name").text('').html('<option>暂无可测机房站点</option>');
                }
@@ -1192,36 +1235,41 @@
        
        //根据维护区和机房查询蓄电池组
        function findserchByBattGroupNamebystationname(){
            var user = {
                UNote:$("#station_name1 option:selected").val(),
                UName:$("#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(),
                StationName3: $("#station_name").val(),
                StationId: stationid
            };
        
            //var station_name1=$("#station_name1 option:selected").val();
            //var station_name=$("#station_name option:selected").val();
            
            $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
            $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
                data=data.result;
                //console.info(data);
                data=eval("("+data+")");
                //console.info(data);        
                if(data.code==1 && data.data.length>0){
                    var $select = $("#battgroup_name");
                    $select.text('');
                    for(var i=0;i<=data.data.length;i++){
                        $option=$("<option></option>");
                        if(i!=0){
                            $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
                            $option.attr("value",data.data[i-1].BattGroupId);
                            $option.attr("stationname",data.data[i-1].StationName);
                            $option.attr("dev_id",data.data[i-1].FBSDeviceId);
                            $option.attr("batt_num",(data.data[i-1].GroupIndexInFBSDevice+1));
                        }else{
                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                            $option.attr("value", "0");
                        }
                        $select.append($option);
                    // 根据数据构造生成下拉列表的数据
                    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);
                }else{
                    $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');
                }
@@ -1919,7 +1967,6 @@
        var ld9alarm_arr = ['无','手动停止','单体下限到','充电完成停止','测试完成停止','远程停止','在线电压低', '温度异常高', '电流异常'];
        
        function flushTable(obj){
            console.info(obj);
            $('#main .tbl-body tbody tr').each(function(i){
                var dev_id = $(this).find('td').eq(2).text();
                if(dev_id == obj.binf.FBSDeviceId){
gx_tieta/WebRoot/js/createTab.js
@@ -394,6 +394,41 @@
    }
    ele.append(__select);
}
// 在下拉列表中生成option
function createOptions(ele, optList, all) {
    // 清空ele
    ele.text("");
    // 根据all判断是否有全部的选项
    if(all) {
        var _option = $('<option value="">全部(共'+optList.length+'种)</option>');
        ele.append(_option);
    }
    // 根据optList的值生成内容
    for(var i=0; i<optList.length; i++) {
        var _data = optList[i];
        var _option = $('<option value="'+_data.val+'">'+_data.txt+'</option>');
        _option.data('attr', _data.data);
        Object.keys(_data.attr).forEach(function(key) {
            _option.attr(key, _data.attr[key]);
        });
        ele.append(_option);
    }
}
// 获取生成下拉列表的数据
function getOptionsData(txt, val, data, attr) {
    var _tmp = {};
    _tmp.txt = txt;
    _tmp.val = val;
    _tmp.attr = attr || {};
    _tmp.data = data || {};
    return _tmp;
}
/*
    创建表格
    @param jquery对象 eleHead  表格头部容器
gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -327,6 +327,9 @@
    // 展开三级导航
    function thirdSpread(treeView, container, data) {
        var tmp = {
            StationName1: data.StationName1,
            StationName2: data.StationName2,
            StationName3: data.StationName3,
            StationId: data.StationId
        };
        fourth(treeView, container, tmp, true);