首页添加告警信息

whychdw

2019-12-03 b6f0fbd68c5eef78bb8004a579fea4cee8b2dbaf

首页添加告警信息

 platforms/android/app/src/main/assets/www/index.html

@@ -20,7 +20,7 @@
    <link rel="stylesheet" href="css/common.css">

    <script src="js/zepto.js"></script>

    <script src="js/bui.js"></script>

    <script src="js/common_functions.js"></script>

    <script src="js/common_functions.js?1a05af30a1"></script>

    <script src="js/vue.min.js"></script>

    <script src="css/element-ui/index.js?3aa0e315ae"></script>

    <script src="js/componets.js?ec02efd5f7"></script>


 platforms/android/app/src/main/assets/www/js/common_functions.js

@@ -305,4 +305,65 @@
    for (var k in o) {
        if (new RegExp("(" + k + ")").test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
    }return format;
};
};

// 电池告警名称
var battAlarmTypes = [{
    value: 119001,
    text: '组端电压告警',
    unit: "V"
}, {
    value: 119002,
    text: '电池电流告警',
    unit: "A"
}, {
    value: 119003,
    text: '单体电压告警',
    unit: 'V'
}, {
    value: 119004,
    text: '单体温度告警',
    unit: '℃'
}, {
    value: 119005,
    text: '单体内阻告警',
    unit: 'mΩ'
}];

// 电池告警类型
var almSignalId = [{
    value: 0,
    text: '无告警'
}, {
    value: 1,
    text: '下限告警'
}, {
    value: 2,
    text: '上限告警'
}];

// 根据value的值获取文本值
function getTextByVal(value, list) {
    var rs = "未知";
    // 遍历list
    for (var i = 0; i < list.length; i++) {
        var _list = list[i];
        if (_list.value == value) {
            rs = _list.text;
        }
    }
    return rs;
}

// 根据value的值获取单位
function getTextByUnit(value, list) {
    var rs = "";
    // 遍历list
    for (var i = 0; i < list.length; i++) {
        var _list = list[i];
        if (_list.value == value && _list.unit) {
            rs = _list.unit;
        }
    }
    return rs;
}

 platforms/android/app/src/main/assets/www/pages/main/main.html

@@ -1,6 +1,6 @@


<div class="bui-page">

      <main>

      <main ref="main">

        <div class="tab-menus">

            <div class="bui-box">

                <div class="span1">

@@ -77,54 +77,65 @@
            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'warning'">

                <div class="tab-item-name">{{tbls.warning.name}}</div>

                <el-table stripe border size="mini" header-row-class-name="header-primary" :height="tbls.warning.height" :data="tbls.warning.data">

                    <el-table-column prop="num" align="center" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="alm_id" align="center" label="告警名称">

                    </el-table-column>

                    <el-table-column prop="MonNum" align="center" label="单体编号">

                    </el-table-column>

                    <el-table-column prop="alm_start_time" align="center" align="center" label="告警开始时间">

                    </el-table-column>

                </el-table>

                <div :style="{height:tbls.warning.height+'px'}">

                    <el-table stripe border height="100%" size="mini" header-row-class-name="header-primary" :data="tbls.warning.data">

                        <el-table-column prop="number" align="center" align="center" label="电池组编号">

                        </el-table-column>

                        <el-table-column prop="note" align="center" label="电池组名称">

                        </el-table-column>

                        <el-table-column prop="alm_name" align="center" label="告警名称">

                        </el-table-column>

                        <el-table-column prop="alm_type" align="center" label="告警类型">

                        </el-table-column>

                        <el-table-column prop="MonNum" align="center" label="单体编号">

                        </el-table-column>

                        <el-table-column prop="alm_value" align="center" label="告警值">

                        </el-table-column>

                        <el-table-column prop="alm_start_time" align="center" align="center" label="告警开始时间">

                        </el-table-column>

                    </el-table>

                </div>

                <el-pagination large style="text-align:center" background layout="prev, pager, next" :total="tbls.warning.page.PageAll" @current-change="warningCurrentChange">

                </el-pagination>

            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'charge'">

                <div class="tab-item-name">{{tbls.charge.name}}</div>

                <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.charge.height" :data="tbls.charge.data">

                    <el-table-column prop="num" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                    </el-table-column>

                    <el-table-column prop="testTimelong" align="center" label="测试时长">

                    </el-table-column>

                    <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                    </el-table-column>  
                    <el-table-column prop="groupvol" align="center" label="组端电流（A）">

                    </el-table-column>

                </el-table>

                <div :style="{height:tbls.charge.height+'px'}">

                    <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.charge.data">

                        <el-table-column prop="num" align="center" label="电池组编号">

                        </el-table-column>

                        <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                        </el-table-column>

                        <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                        </el-table-column>

                        <el-table-column prop="testTimelong" align="center" label="测试时长">

                        </el-table-column>

                        <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                        </el-table-column>  
                        <el-table-column prop="groupvol" align="center" label="组端电流（A）">

                        </el-table-column>

                    </el-table>

                </div>

				
            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'discharge'">

                <div class="tab-item-name">{{tbls.discharge.name}}</div>

                <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.discharge.height" :data="tbls.discharge.data">

                    <el-table-column prop="num" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                    </el-table-column>

                    <el-table-column prop="testTimelong" align="center" label="测试时长">

                    </el-table-column>

                    <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                    </el-table-column>  
                    <el-table-column prop="groupcurr" header-align="center" align="center" label="组端电流（A）">

                    </el-table-column>

                </el-table>

                <div :style="{height:tbls.discharge.height+'px'}">

                    <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.discharge.data">

                        <el-table-column prop="num" align="center" label="电池组编号">

                        </el-table-column>

                        <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                        </el-table-column>

                        <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                        </el-table-column>

                        <el-table-column prop="testTimelong" align="center" label="测试时长">

                        </el-table-column>

                        <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                        </el-table-column>  
                        <el-table-column prop="groupcurr" header-align="center" align="center" label="组端电流（A）">

                        </el-table-column>

                    </el-table>

                </div>

            </div>

        </div>

        


 platforms/android/app/src/main/assets/www/pages/main/main.js

@@ -198,10 +198,12 @@
                            cmd_type: 0,
                            data: [{
                                num: 1,
                                BattGroupName: '电池组1',
                                note: '电池组1',
                                MonNum: 1,
                                alm_start_time: '2019-12-3 00:00:00',
                                alm_id: 2,
                                alm_id: 119001,
                                alm_signal_id: 2,
                                alm_value: 39.7,
                                page: {
                                    PageAll: 40
                                }
@@ -214,8 +216,23 @@
                setAlarmInfo: function setAlarmInfo(res) {
                    // 设置实时告警信息
                    if (res.code == 1) {
                        var page = this.tbls.warning.page;
                        // 设置数据
                        this.tbls.warning.data = res.data;
                        var data = [];
                        for (var i = 0; i < res.data.length; i++) {
                            var _data = res.data[i];
                            var tmp = {};
                            var number = i + 1 + (page.PageCurr - 1) * page.PageSize;
                            tmp.number = number; // 编号
                            tmp.note = _data.note; // 电池组名称
                            tmp.alm_name = getTextByVal(_data.alm_id, battAlarmTypes); // 告警名称
                            tmp.alm_type = getTextByVal(_data.alm_signal_id, almSignalId); // 告警类型
                            tmp.MonNum = _data.MonNum; // 单体编号
                            tmp.alm_value = _data.alm_value + getTextByUnit(_data.alm_id, battAlarmTypes); // 告警值
                            tmp.alm_start_time = _data.alm_start_time; // 告警开始时间
                            data.push(tmp);
                        }
                        this.tbls.warning.data = data;
                        // 设置分页
                        this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
                    } else {
@@ -224,11 +241,11 @@
                        // 设置分页
                        this.tbls.warning.page.PageAll = 0;
                    }
                    console.log(res);
                    //console.log(res);
                },
                // 设置当前页
                warningCurrentChange: function warningCurrentChange(curr) {
                    this.tbls.warning.PageCurr = curr;
                    this.tbls.warning.page.PageCurr = curr;
                    // 查询电池告警信息
                    this.startSearchAlarmInfo();
                },
@@ -250,10 +267,17 @@
                        },
                        reload: true
                    });
                },
                setTblsHt: function setTblsHt() {
                    var totalHt = this.$refs.main.offsetHeight;
                    this.tbls.warning.height = totalHt - 168;
                    this.tbls.charge.height = totalHt - 136;
                    this.tbls.discharge.height = totalHt - 136;
                }
            },
            mounted: function mounted() {
                var self = this;
                this.setTblsHt();

                // 查询放电信息
                this.startReadBattDiscInfo();

 www/index.html

@@ -20,7 +20,7 @@
    <link rel="stylesheet" href="css/common.css">

    <script src="js/zepto.js"></script>

    <script src="js/bui.js"></script>

    <script src="js/common_functions.js"></script>

    <script src="js/common_functions.js?1a05af30a1"></script>

    <script src="js/vue.min.js"></script>

    <script src="css/element-ui/index.js?3aa0e315ae"></script>

    <script src="js/componets.js?ec02efd5f7"></script>


 www/js/common_functions.js

@@ -305,4 +305,65 @@
    for (var k in o) {
        if (new RegExp("(" + k + ")").test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
    }return format;
};
};

// 电池告警名称
var battAlarmTypes = [{
    value: 119001,
    text: '组端电压告警',
    unit: "V"
}, {
    value: 119002,
    text: '电池电流告警',
    unit: "A"
}, {
    value: 119003,
    text: '单体电压告警',
    unit: 'V'
}, {
    value: 119004,
    text: '单体温度告警',
    unit: '℃'
}, {
    value: 119005,
    text: '单体内阻告警',
    unit: 'mΩ'
}];

// 电池告警类型
var almSignalId = [{
    value: 0,
    text: '无告警'
}, {
    value: 1,
    text: '下限告警'
}, {
    value: 2,
    text: '上限告警'
}];

// 根据value的值获取文本值
function getTextByVal(value, list) {
    var rs = "未知";
    // 遍历list
    for (var i = 0; i < list.length; i++) {
        var _list = list[i];
        if (_list.value == value) {
            rs = _list.text;
        }
    }
    return rs;
}

// 根据value的值获取单位
function getTextByUnit(value, list) {
    var rs = "";
    // 遍历list
    for (var i = 0; i < list.length; i++) {
        var _list = list[i];
        if (_list.value == value && _list.unit) {
            rs = _list.unit;
        }
    }
    return rs;
}

 www/pages/main/main.html

@@ -1,6 +1,6 @@


<div class="bui-page">

      <main>

      <main ref="main">

        <div class="tab-menus">

            <div class="bui-box">

                <div class="span1">

@@ -77,54 +77,65 @@
            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'warning'">

                <div class="tab-item-name">{{tbls.warning.name}}</div>

                <el-table stripe border size="mini" header-row-class-name="header-primary" :height="tbls.warning.height" :data="tbls.warning.data">

                    <el-table-column prop="num" align="center" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="alm_id" align="center" label="告警名称">

                    </el-table-column>

                    <el-table-column prop="MonNum" align="center" label="单体编号">

                    </el-table-column>

                    <el-table-column prop="alm_start_time" align="center" align="center" label="告警开始时间">

                    </el-table-column>

                </el-table>

                <div :style="{height:tbls.warning.height+'px'}">

                    <el-table stripe border height="100%" size="mini" header-row-class-name="header-primary" :data="tbls.warning.data">

                        <el-table-column prop="number" align="center" align="center" label="电池组编号">

                        </el-table-column>

                        <el-table-column prop="note" align="center" label="电池组名称">

                        </el-table-column>

                        <el-table-column prop="alm_name" align="center" label="告警名称">

                        </el-table-column>

                        <el-table-column prop="alm_type" align="center" label="告警类型">

                        </el-table-column>

                        <el-table-column prop="MonNum" align="center" label="单体编号">

                        </el-table-column>

                        <el-table-column prop="alm_value" align="center" label="告警值">

                        </el-table-column>

                        <el-table-column prop="alm_start_time" align="center" align="center" label="告警开始时间">

                        </el-table-column>

                    </el-table>

                </div>

                <el-pagination large style="text-align:center" background layout="prev, pager, next" :total="tbls.warning.page.PageAll" @current-change="warningCurrentChange">

                </el-pagination>

            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'charge'">

                <div class="tab-item-name">{{tbls.charge.name}}</div>

                <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.charge.height" :data="tbls.charge.data">

                    <el-table-column prop="num" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                    </el-table-column>

                    <el-table-column prop="testTimelong" align="center" label="测试时长">

                    </el-table-column>

                    <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                    </el-table-column>  
                    <el-table-column prop="groupvol" align="center" label="组端电流（A）">

                    </el-table-column>

                </el-table>

                <div :style="{height:tbls.charge.height+'px'}">

                    <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.charge.data">

                        <el-table-column prop="num" align="center" label="电池组编号">

                        </el-table-column>

                        <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                        </el-table-column>

                        <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                        </el-table-column>

                        <el-table-column prop="testTimelong" align="center" label="测试时长">

                        </el-table-column>

                        <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                        </el-table-column>  
                        <el-table-column prop="groupvol" align="center" label="组端电流（A）">

                        </el-table-column>

                    </el-table>

                </div>

				
            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'discharge'">

                <div class="tab-item-name">{{tbls.discharge.name}}</div>

                <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.discharge.height" :data="tbls.discharge.data">

                    <el-table-column prop="num" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                    </el-table-column>

                    <el-table-column prop="testTimelong" align="center" label="测试时长">

                    </el-table-column>

                    <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                    </el-table-column>  
                    <el-table-column prop="groupcurr" header-align="center" align="center" label="组端电流（A）">

                    </el-table-column>

                </el-table>

                <div :style="{height:tbls.discharge.height+'px'}">

                    <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.discharge.data">

                        <el-table-column prop="num" align="center" label="电池组编号">

                        </el-table-column>

                        <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                        </el-table-column>

                        <el-table-column prop="testStartTime" align="center" label="测试开始时间">

                        </el-table-column>

                        <el-table-column prop="testTimelong" align="center" label="测试时长">

                        </el-table-column>

                        <el-table-column prop="groupvol" align="center" label="组端电压（V）">

                        </el-table-column>  
                        <el-table-column prop="groupcurr" header-align="center" align="center" label="组端电流（A）">

                        </el-table-column>

                    </el-table>

                </div>

            </div>

        </div>

        


 www/pages/main/main.js

@@ -198,10 +198,12 @@
                            cmd_type: 0,
                            data: [{
                                num: 1,
                                BattGroupName: '电池组1',
                                note: '电池组1',
                                MonNum: 1,
                                alm_start_time: '2019-12-3 00:00:00',
                                alm_id: 2,
                                alm_id: 119001,
                                alm_signal_id: 2,
                                alm_value: 39.7,
                                page: {
                                    PageAll: 40
                                }
@@ -214,8 +216,23 @@
                setAlarmInfo: function setAlarmInfo(res) {
                    // 设置实时告警信息
                    if (res.code == 1) {
                        var page = this.tbls.warning.page;
                        // 设置数据
                        this.tbls.warning.data = res.data;
                        var data = [];
                        for (var i = 0; i < res.data.length; i++) {
                            var _data = res.data[i];
                            var tmp = {};
                            var number = i + 1 + (page.PageCurr - 1) * page.PageSize;
                            tmp.number = number; // 编号
                            tmp.note = _data.note; // 电池组名称
                            tmp.alm_name = getTextByVal(_data.alm_id, battAlarmTypes); // 告警名称
                            tmp.alm_type = getTextByVal(_data.alm_signal_id, almSignalId); // 告警类型
                            tmp.MonNum = _data.MonNum; // 单体编号
                            tmp.alm_value = _data.alm_value + getTextByUnit(_data.alm_id, battAlarmTypes); // 告警值
                            tmp.alm_start_time = _data.alm_start_time; // 告警开始时间
                            data.push(tmp);
                        }
                        this.tbls.warning.data = data;
                        // 设置分页
                        this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
                    } else {
@@ -224,11 +241,11 @@
                        // 设置分页
                        this.tbls.warning.page.PageAll = 0;
                    }
                    console.log(res);
                    //console.log(res);
                },
                // 设置当前页
                warningCurrentChange: function warningCurrentChange(curr) {
                    this.tbls.warning.PageCurr = curr;
                    this.tbls.warning.page.PageCurr = curr;
                    // 查询电池告警信息
                    this.startSearchAlarmInfo();
                },
@@ -250,10 +267,17 @@
                        },
                        reload: true
                    });
                },
                setTblsHt: function setTblsHt() {
                    var totalHt = this.$refs.main.offsetHeight;
                    this.tbls.warning.height = totalHt - 168;
                    this.tbls.charge.height = totalHt - 136;
                    this.tbls.discharge.height = totalHt - 136;
                }
            },
            mounted: function mounted() {
                var self = this;
                this.setTblsHt();

                // 查询放电信息
                this.startReadBattDiscInfo();