修改内容

whychdw

2019-08-30 9bbb4d770c59994c22fee8f9d7583548df10c0bd

修改内容

 dist/index.html

@@ -20,9 +20,9 @@
    <script src="js/zepto.js"></script>
    <script src="js/bui.js"></script>
    
    <script src="js/const_var.js?6cd34f2e59"></script>
    <script src="js/const_var.js?dc030f6a08"></script>
    
    <script src="js/common_functions.js?6ee6cc69bb"></script>
    <script src="js/common_functions.js?e6b792d4c0"></script>
    
    <script src="js/vue.min.js"></script>
    <script src="css/iview/iview.min.js"></script>

 dist/js/common_functions.js

@@ -356,4 +356,21 @@
        return true;
    }
    return false;
}

function getBattstate(state) {
    var str = "";
    switch (state) {
        case 1:
            str = battstate[1];break;
        case 2:
            str = battstate[2];break;
        case 3:
            str = battstate[3];break;
        case 4:
            str = battstate[4];break;
        default:
            str = battstate[0];
    }
    return str;
}

 dist/pages/battery/battery.js

@@ -42,27 +42,32 @@
                    columns: [{
                        title: '电池组',
                        key: 'BattGroupName',
                        minWidth: 120,
                        align: 'center'
                    }, {
                        title: '状态',
                        key: 'state',
                        minWidth: 180,
                        align: 'center'
                    }, {
                        title: '组端电压',
                        key: 'MonVolLowToAvg',
                        minWidth: 120,
                        align: 'center'
                    }, {
                        title: '电流',
                        key: 'Load_curr',
                        minWidth: 120,
                        align: 'center'
                    }, {
                        title: '告警信息',
                        key: 'SignalName',
                        minWidth: 120,
                        align: 'center'
                    }, {
                        title: '查看实时监控数据',
                        key: 'see',
                        minWidth: 80,
                        minWidth: 120,
                        align: 'center',
                        render: function render(h, params) {
                            return h('div', [h('i-button', {
@@ -141,9 +146,6 @@
                    var json = JSON.stringify({
                        FBSDeviceId: id
                    });
                    var deviceBaseInfo = getDevBaseInfo(id);
                    console.log(id);
                    console.log(deviceBaseInfo);
                    // 请求后台获取告警
                    ajax({
                        type: 'post',
@@ -158,7 +160,7 @@
                                for (var i = 0; i < data.length; i++) {
                                    var _data = data[i];
                                    _data.FBSDeviceId = id;
                                    _data.state = deviceBaseInfo.workstates[_data.num];
                                    _data.state = getBattstate(_data.num);
                                }
                                self.eleTbl.data = data;
                            }

 dist/pages/battery/batteryInfo.html

@@ -16,20 +16,26 @@
            <div class="tbl-container bg-white mt8 batt-info">
                <div class="tbl-content">
                    <table class="bui-table">
                        <colgroup>
                            <col width="30%">
                            <col width="30%">
                            <col width="30%">
                            <col width="10%">
                        </colgroup>
                        <tbody>
                            <tr>
                                <td>电池状态：离线</td>
                                <td>组端电压：</td>
                                <td>组端电流：</td>
                                <td>电池状态：<span v-text="getBattState"></span></td>
                                <td>组端电压：<span v-text="rtState.group_vol"></span>V</td>
                                <td>组端电流：<span v-text="rtState.group_curr"></span>A</td>
                                <td rowspan="3" style="width:2rem">
                                    <button class="bui-btn bui-btn-small bg-primary">内阻测试</button>
                                    <button class="bui-btn bui-btn-small mt8 bg-primary">导出数据</button>
                                </td>
                            </tr>
                            <tr>
                                <td>测试容量：</td>
                                <td>测试时间：</td>
                                <td>测试时长：</td>
                                <td>测试容量：<span v-text="rtState.batt_test_cap"></span>AH</td>
                                <td>更新时间：<span v-text="rtState.batt_test_recordtime"></span></td>
                                <td>测试时长：<spna v-text="getTestTimeLong"></spna></td>
                            </tr>
                            <tr>
                                <td>纹波电流均值：</td>

 dist/pages/battery/batteryInfo.js

@@ -5,31 +5,82 @@
 * 默认模块名: battery
 * @return {[object]}  [ 返回一个对象 ]
 */
loader.define(function (require, exports, module) {
    var bs = bui.store({
        scope: 'page',
        data: {}
    });
    /**
     * 规定params={battGroupId:'',battGroupName: '', devId: ''}
     */
    var params = router.getPageParams();
    var vm = new Vue({
        el: bs.$el[0],
        data: {
            params: params,
            title: '未知'
        },
        computed: {
            getTitle: function getTitle() {
                var title = this.params.battGroupName ? this.params.battGroupName : '未知';
                return title;
            }
        }
    });
loader.define({
    data: {
        vm: ''
    },
    loaded: function loaded(require, exports, module) {
        var bs = bui.store({
            scope: 'page',
            data: {}
        });

    // 脚本都需要在这里执行
    var uiTab = bui.tab({
        id: "#uiTab"
    });
        /**
         * 规定params={battGroupId:'',battGroupName: '', devId: ''}
         */
        var params = router.getPageParams();
        var vm = this.vm = new Vue({
            el: bs.$el[0],
            data: {
                params: params,
                title: '未知',
                rtState: {
                    batt_test_type: '', // 电池状态
                    group_vol: '', // 组端电压
                    group_curr: '', // 组端电流
                    batt_test_cap: '', // 测试容量
                    batt_test_recordtime: '', // 更新日期
                    batt_test_tlong: 0 // 测试时长
                }
            },
            methods: {
                searchRtState: function searchRtState() {
                    var self = this;
                    var json = JSON.stringify({
                        BattGroupId: self.params.battGroupId
                    });
                    // 查询后台
                    ajax({
                        type: 'post',
                        async: true,
                        url: 'Batt_rtstateAction!serchByCondition',
                        data: 'json=' + json,
                        dataType: 'json',
                        success: function success(res) {
                            var rs = JSON.parse(res.result);
                            if (rs.code == 1) {
                                var data = rs.data[0];
                                // console.log(data);
                                self.rtState = data;
                            }
                        }
                    });
                }
            },
            computed: {
                getTitle: function getTitle() {
                    var title = this.params.battGroupName ? this.params.battGroupName : '未知';
                    return title;
                },
                getTestTimeLong: function getTestTimeLong() {
                    var testTimeLong = this.rtState.batt_test_tlong;
                    return formatSeconds(testTimeLong);
                },
                getBattState: function getBattState() {
                    // 获取电池信息
                    var test_type = this.rtState.batt_test_type;
                    var state = getBattstate(test_type);
                    return state;
                }
            },
            mounted: function mounted() {
                // 查询电池组状态
                this.searchRtState();
                // 脚本都需要在这里执行
                var uiTab = bui.tab({
                    id: "#uiTab"
                });
            }
        });
    }
});

 src/js/common_functions.js

@@ -362,4 +362,16 @@
        return true;
    }
    return false;
}

function getBattstate(state){
    var str="";
    switch(state){
        case 1:str = battstate[1];break;
        case 2:str = battstate[2];break;
        case 3:str = battstate[3];break;
        case 4:str = battstate[4];break;
        default:str = battstate[0];
    }
    return str;
}

 src/js/const_var.js

@@ -48,4 +48,6 @@
        , '应急供电单体下限到', '市电恢复停止应急供电', '停止自动应急供电', '无法启动核容测试', '模块故障', '电池开路故障'],
        alarmstates: []
    }
];
];

const battstate=['未知','浮充','充电','放电','均充'];

 src/pages/battery/battery.js

@@ -41,32 +41,37 @@
                        {
                            title: '电池组',
                            key: 'BattGroupName',
                            minWidth: 120,
                            align: 'center',
                        },
                        {
                            title: '状态',
                            key: 'state',
                            minWidth: 180,
                            align: 'center',
                        },
                        {
                            title: '组端电压',
                            key: 'MonVolLowToAvg',
                            minWidth: 120,
                            align: 'center',
                        },
                        {
                            title: '电流',
                            key: 'Load_curr',
                            minWidth: 120,
                            align: 'center',
                        },
                        {
                            title: '告警信息',
                            key: 'SignalName',
                            minWidth: 120,
                            align: 'center',
                        },
                        {
                            title: '查看实时监控数据',
                            key: 'see',
                            minWidth: 80,
                            minWidth: 120,
                            align: 'center',
                            render: (h, params) => {
                                return h('div', [
@@ -148,9 +153,6 @@
                    var json = JSON.stringify({
                        FBSDeviceId: id
                    });
                    var deviceBaseInfo = getDevBaseInfo(id);
                    console.log(id);
                    console.log(deviceBaseInfo);
                    // 请求后台获取告警
                    ajax({
                        type: 'post',
@@ -165,7 +167,7 @@
                                for(var i=0; i<data.length; i++) {
                                    var _data = data[i];
                                    _data.FBSDeviceId = id;
                                    _data.state = deviceBaseInfo.workstates[_data.num];
                                    _data.state = getBattstate(_data.num);
                                }
                                self.eleTbl.data = data;
                            }

 src/pages/battery/batteryInfo.html

@@ -16,20 +16,26 @@
            <div class="tbl-container bg-white mt8 batt-info">
                <div class="tbl-content">
                    <table class="bui-table">
                        <colgroup>
                            <col width="30%"></col>
                            <col width="30%"></col>
                            <col width="30%"></col>
                            <col width="10%"></col>
                        </colgroup>
                        <tbody>
                            <tr>
                                <td>电池状态：离线</td>
                                <td>组端电压：</td>
                                <td>组端电流：</td>
                                <td>电池状态：<span v-text="getBattState"></span></td>
                                <td>组端电压：<span v-text="rtState.group_vol"></span>V</td>
                                <td>组端电流：<span v-text="rtState.group_curr"></span>A</td>
                                <td rowspan="3" style="width: 2rem">
                                    <button class="bui-btn bui-btn-small bg-primary">内阻测试</button>
                                    <button class="bui-btn bui-btn-small mt8 bg-primary">导出数据</button>
                                </td>
                            </tr>
                            <tr>
                                <td>测试容量：</td>
                                <td>测试时间：</td>
                                <td>测试时长：</td>
                                <td>测试容量：<span v-text="rtState.batt_test_cap"></span>AH</td>
                                <td>更新时间：<span v-text="rtState.batt_test_recordtime"></span></td>
                                <td>测试时长：<spna v-text="getTestTimeLong"></spna></td>
                            </tr>
                            <tr>
                                <td>纹波电流均值：</td>

 src/pages/battery/batteryInfo.js

@@ -3,31 +3,83 @@
 * 默认模块名: battery
 * @return {[object]}  [ 返回一个对象 ]
 */
loader.define(function(require,exports,module){
    var bs = bui.store({
        scope: 'page',
        data: {}
    });
    /**
     * 规定params={battGroupId:'',battGroupName: '', devId: ''}
     */
    var params = router.getPageParams();
    var vm = new Vue({
        el: bs.$el[0],
        data: {
            params: params,
            title: '未知'
        },
        computed: {
            getTitle: function() {
                var title = this.params.battGroupName?this.params.battGroupName: '未知';
                return title;
            }
        },
    });
loader.define({
    data: {
        vm: ''
    },
    loaded: function(require,exports,module) {
        var bs = bui.store({
            scope: 'page',
            data: {}
        });

    // 脚本都需要在这里执行
    var uiTab = bui.tab({
        id:"#uiTab"
    });
        /**
         * 规定params={battGroupId:'',battGroupName: '', devId: ''}
         */
        var params = router.getPageParams();
        var vm = this.vm = new Vue({
            el: bs.$el[0],
            data: {
                params: params,
                title: '未知',
                rtState: {
                    batt_test_type: '',     // 电池状态
                    group_vol: '',          // 组端电压
                    group_curr: '',         // 组端电流
                    batt_test_cap: '',      // 测试容量
                    batt_test_recordtime: '',   // 更新日期
                    batt_test_tlong: 0,     // 测试时长
                }
            },
            methods: {
                searchRtState: function() {
                    var self = this;
                    var json = JSON.stringify({
                        BattGroupId: self.params.battGroupId
                    });
                    // 查询后台
                    ajax({
                        type: 'post',
                        async: true,
                        url: 'Batt_rtstateAction!serchByCondition',
                        data: 'json='+json,
                        dataType: 'json',
                        success: function(res) {
                            var rs = JSON.parse(res.result);
                            if(rs.code == 1) {
                                var data = rs.data[0];
                                // console.log(data);
                                self.rtState = data;
                            }
                        }
                    });

                }
            },
            computed: {
                getTitle: function() {
                    var title = this.params.battGroupName?this.params.battGroupName: '未知';
                    return title;
                },
                getTestTimeLong: function() {
                    var testTimeLong = this.rtState.batt_test_tlong;
                    return formatSeconds(testTimeLong);
                },
                getBattState: function() {
                    // 获取电池信息
                    var test_type = this.rtState.batt_test_type;
                    var state = getBattstate(test_type);
                    return state;
                }
            },
            mounted() {
                // 查询电池组状态
                this.searchRtState();
                // 脚本都需要在这里执行
                var uiTab = bui.tab({
                    id:"#uiTab"
                });
            },
        });
    }
});