LiJun
2018-10-16 46b798edc2dc0249a9ab6988e079825bc2ac7280
设备远程升级页面修改
2个文件已修改
120 ■■■■■ 已修改文件
gx_tieta/WebRoot/batt-station-update.jsp 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-station-update.jsp
@@ -16,6 +16,7 @@
    <link rel="stylesheet" href="css/BrdwMaint.css">
    <link rel="stylesheet" type="text/css" href="css/loading.css">
    <link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">
    <link rel="stylesheet" type="text/css" href="src/css/layui.css">
    <meta http-equiv="pragma" content="no-cache">
    <meta http-equiv="cache-control" content="no-cache">
    <meta http-equiv="expires" content="0">    
@@ -39,6 +40,10 @@
        }
        #tbBrdw table {
            width: 100%;
        }
        #tbBrdw table i.fa-refresh {
            font-size:18px;
            cursor: pointer;
        }
        #cardOption input[type="checkbox"] {
            vertical-align: middle;
@@ -81,7 +86,6 @@
                            </td>
                            <td>
                                <select id="station_name">
                                </select>
                            </td>
                        </tr>
@@ -107,15 +111,16 @@
        <div id="allShade"></div>
        <script type="text/javascript" src="js/loading.js"></script>
        <script type="text/javascript" src="js/createTab.js"></script>
        <script type="text/javascript" src="src/layui.js"></script>
        <script type="text/javascript">
            layui.use(['layer'], function() {
                var layer = layui.layer;
        var arrTh = new Array();    // 表格的头部
        var arrTd = new Array();    // 表格的表体
        var tblStatus = new Array();    // 表格状态数组
        var tblOptsHd = new Array();    // 表格选项头部
        var tblOptsBd = new Array();  // 表格选项数组
        arrTh = ['机房ID', '机房名称','设备ID','设备名称'];
                arrTh = ['机房ID', '机房名称','设备ID','设备名称','操作'];
        //arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>',  '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];
        //tblOptsHd = ['编号', '选项', '是否选择'];
        tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -230,6 +235,66 @@
        }
        
       
                $(function(){
                    //点击添加按钮
                    $('#paging .add').click(function(){
                        var stationid = $('#station_name').find('option:selected').attr('stationid');
                        if(getSelectStation(stationid,findStationNamebyStationname1.stations) != undefined){
                            if(getSelectStation(stationid,stations) == undefined){
                                addStationFromDb();
                            }else{
                                noContent.showNoContent("该机房已经添加到表格",2000);
                            }
                        }else{
                            noContent.showNoContent("请先选择一个机房");
                        }
                    });
                });
                var stations = new Array();
                //将设备添加到表格中
                function addStationFromDb(){
                    loading.showLoading();
                    var temp = {
                        dev_id:$('#station_name').find('option:selected').attr('stationid'),
                        dfu_file:"avr_dfu.uc3",
                        dfu_wr_stat:1,
                        dfu_data_blocknum:1
                    };
                    var station = getSelectStation(temp.dev_id, findStationNamebyStationname1.stations);
                    $.ajax({
                        type: "post",
                        url: "Fbs9100s_dfu_stateAction_action_add",
                        async:true,
                        dataType:'json',
                        data:"json = "+JSON.stringify(temp),
                        success: function(data){
                            stations.push(station);
                            console.info(stations);
                            var _arrTd = new Array();
                            for(var i = 0 ; i<stations.length;i++){
                                var st = stations[i];
                                _arrTd.push(st.StationId);
                                _arrTd.push(st.StationName);
                                _arrTd.push(st.FBSDeviceId);
                                _arrTd.push(st.FBSDeviceName);
                                _arrTd.push('<i class="fa fa-refresh" title="升级设备" onclick="(updateStationVersion('+st.FBSDeviceId+'))"></i>');
                            }
                            createAllTbl(tblHd, tblBd, arrTh, _arrTd, tblStatus);
                            loading.hideLoading();
                        }
                    });
                }
          // 省-市-机房-电池组
        $(document).ready(function(){
            //页面加载时查询维护区中的枢纽类型
@@ -301,6 +366,7 @@
        
        //根据省,市查询站点
        function findStationNamebyStationname1(){
                    findStationNamebyStationname1.stations = new Array();
            var tmp = {
                StationName1:$("#station_name1").val(),
                StationName2:$("#city").val()
@@ -316,13 +382,14 @@
                    var optsList = [];
                    for(var i=0;i<_data.length;i++){
                        var __data = _data[i];
                                //console.info(__data);
                        var _attr = {
                            StationId: __data.StationId
                                    StationId: __data.FBSDeviceId,
                        };
                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
                        optsList.push(tmp);
                    }
                            findStationNamebyStationname1.stations = _data;
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                }else{
@@ -330,7 +397,46 @@
                }
            });
        }
            });
        
            //升级指定的设备
            function updateStationVersion(dev_id){
                loading.showLoading();
                var temp = {
                    dev_id:dev_id
                };
                $.ajax({
                    type: "post",
                    url: "Fbs9100s_dfu_stateAction_action_update",
                    async:true,
                    dataType:'json',
                    data:"json = "+JSON.stringify(temp),
                    success: function(data){
                        var rs = JSON.parse(data.result);
                        if(rs.code == 1) {
                            layer.msg("升级成功!");
                        }else{
                            layer.msg("升级失败!");
                        }
                        loading.hideLoading();
                    }
                });
            }
            //获取选中的机房对象
            function getSelectStation(dev_id,arr){
                if(arr != undefined && arr.length > 0){
                    for(var i=0;i<arr.length;i++){
                        if(arr[i].FBSDeviceId == dev_id){
                            return arr[i];
                        }
                    }
                }
                return undefined;
            }
        
        
        
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
@@ -6,7 +6,7 @@
import com.fgkj.services.ram.Fbs9100s_dfu_stateService;
public class Fbs9100s_dfu_stateAction extends ActionUtil{
    private Fbs9100s_dfu_stateService service;
    private Fbs9100s_dfu_stateService service = new Fbs9100s_dfu_stateService();
    private String json;
    private String result;