修改单体列表和统计信息功能 关闭切换等待

whychdw

2019-12-20 74856eff3cde9a310d446eb140594764cb654ee7

修改单体列表和统计信息功能 关闭切换等待

 platforms/android/app/src/main/assets/www/pages/monitor-data/monitor-data.js

@@ -260,6 +260,10 @@
                    this.setOption();
                },
                setMonInfoTbl: function setMonInfoTbl(data) {
                    // 判断当前是否更新单体列表
                    if (this.tabs.active != 0) {
                        return;
                    }
                    var monCount = data.monCount;
                    var list = [];
                    var k = -1;
@@ -283,6 +287,10 @@
                    this.tbls.monInfo.data = list;
                },
                setTotal: function setTotal(data) {
                    // 判断当前是否更新统计信息
                    if (this.tabs.active != 1) {
                        return;
                    }
                    // 单体电压
                    var vol = this.getMaxMinAvg(data.monCount, data.mon_vols);
                    this.setTotalItem(0, vol, 'V', 2);
@@ -577,7 +585,7 @@
                    setTimeout(function () {
                        // 设置配置项
                        self.setOption();
                    }, 500);
                    }, 0);
                },
                handleNextBtn: function handleNextBtn() {
                    var self = this;
@@ -590,7 +598,7 @@
                    setTimeout(function () {
                        // 设置配置项
                        self.setOption();
                    }, 500);
                    }, 0);
                },
                initPage: function initPage() {
                    // 初始化图表分页信息

 www/pages/monitor-data/monitor-data.js

@@ -260,6 +260,10 @@
                    this.setOption();
                },
                setMonInfoTbl: function setMonInfoTbl(data) {
                    // 判断当前是否更新单体列表
                    if (this.tabs.active != 0) {
                        return;
                    }
                    var monCount = data.monCount;
                    var list = [];
                    var k = -1;
@@ -283,6 +287,10 @@
                    this.tbls.monInfo.data = list;
                },
                setTotal: function setTotal(data) {
                    // 判断当前是否更新统计信息
                    if (this.tabs.active != 1) {
                        return;
                    }
                    // 单体电压
                    var vol = this.getMaxMinAvg(data.monCount, data.mon_vols);
                    this.setTotalItem(0, vol, 'V', 2);
@@ -577,7 +585,7 @@
                    setTimeout(function () {
                        // 设置配置项
                        self.setOption();
                    }, 500);
                    }, 0);
                },
                handleNextBtn: function handleNextBtn() {
                    var self = this;
@@ -590,7 +598,7 @@
                    setTimeout(function () {
                        // 设置配置项
                        self.setOption();
                    }, 500);
                    }, 0);
                },
                initPage: function initPage() {
                    // 初始化图表分页信息