Merge branch 'FBS9600' of http://whyclxw@118.89.139.230:10101/r/FBS9600App....

81041

2019-12-03 cdd913e6074872da4d4d4dd420faf0b190ce9ed8

Merge branch 'FBS9600' of http://whyclxw@118.89.139.230:10101/r/FBS9600App.git into FBS9600

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

@@ -86,7 +86,7 @@
                    }
                },
                setBattDiscInfo: function setBattDiscInfo(res) {
                    // console.log(res);
                    console.log(res);
                    // 对数据进行处理
                    this.tbls.discharge.data = res.data;
                    // 统计个数
@@ -99,9 +99,9 @@
                    }, 4000);
                },
                readBattCharInfo: function readBattCharInfo() {
                    //  读取放电信息
                    //  读取充电信息
                    if (typeof DeviceService != 'undefined') {
                        DeviceService.readBattDiscInfo();
                        DeviceService.readBattCharInfo();
                    } else {
                        this.setBattCharInfo({
                            code: 1,
@@ -128,7 +128,7 @@
                    }
                },
                setBattCharInfo: function setBattCharInfo(res) {
                    // console.log(res);
                    console.log(res);
                    // 对数据进行处理
                    this.tbls.charge.data = res.data;
                    // 统计个数

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

@@ -18,7 +18,7 @@
        <div id="dialogCenter" class="bui-dialog" style="display:none">

            <div class="bui-dialog-head">{{options.monResLine.title}}</div>

            <div class="bui-dialog-main">

                <high-line-chart v-if="shows.monResLine" :style="{width: '700px'}" height="350px" id="monResLine" name="单体内阻" unit="mΩ" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monResLine"></high-line-chart>

                <high-line-chart v-if="shows.monResLine" :style="{width: '700px'}" height="350px" id="monResLine" name="单体内阻" unit="mΩ" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monResLine"></high-line-chart>

            </div>

            <div class="bui-dialog-close"><i class="icon-close"></i></div>

        </div>


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

@@ -631,9 +631,33 @@
                    } else {
                        setTimeout(function () {
                            self.loading.hide();
                            self.setMonResLine([{
                                mon_res: 10,
                                test_starttime: '2019-12-03 10:09:00'
                            }, {
                                mon_res: 11,
                                test_starttime: '2019-12-03 11:09:00'
                            }, {
                                mon_res: 9,
                                test_starttime: '2019-12-03 12:09:00'
                            }]);
                            self.uiDialog.open();
                        }, 1000);
                    }
                },
                setMonResLine: function setMonResLine(data) {
                    var monRes = [[]];
                    var times = [];
                    // 遍历data
                    for (var i = 0; i < data.length; i++) {
                        var _data = data[i];
                        monRes[0].push(_data.mon_res);
                        times.push(_data.test_starttime);
                    }
                    this.options.monResLine.categories = times;
                    this.options.monResLine.data = monRes;
                    // 设置配置项
                    this.$refs.monResLine.setOption(this.options.monResLine);
                }
            },
            created: function created() {
@@ -798,7 +822,11 @@
                    // 关闭等待
                    self.loading.hide();
                    // 根据返回结果显示内容
                    if (res.code == 1) {} else {}
                    if (res.code == 1) {
                        self.setMonResLine(res.data);
                    } else {
                        self.setMonResLine([]);
                    }
                    // 显示面板
                    self.uiDialog.open();
                };

 www/pages/main/main.js

@@ -86,7 +86,7 @@
                    }
                },
                setBattDiscInfo: function setBattDiscInfo(res) {
                    // console.log(res);
                    console.log(res);
                    // 对数据进行处理
                    this.tbls.discharge.data = res.data;
                    // 统计个数
@@ -99,9 +99,9 @@
                    }, 4000);
                },
                readBattCharInfo: function readBattCharInfo() {
                    //  读取放电信息
                    //  读取充电信息
                    if (typeof DeviceService != 'undefined') {
                        DeviceService.readBattDiscInfo();
                        DeviceService.readBattCharInfo();
                    } else {
                        this.setBattCharInfo({
                            code: 1,
@@ -128,7 +128,7 @@
                    }
                },
                setBattCharInfo: function setBattCharInfo(res) {
                    // console.log(res);
                    console.log(res);
                    // 对数据进行处理
                    this.tbls.charge.data = res.data;
                    // 统计个数

 www/pages/monitor-data/monitor-data.html

@@ -18,7 +18,7 @@
        <div id="dialogCenter" class="bui-dialog" style="display:none">

            <div class="bui-dialog-head">{{options.monResLine.title}}</div>

            <div class="bui-dialog-main">

                <high-line-chart v-if="shows.monResLine" :style="{width: '700px'}" height="350px" id="monResLine" name="单体内阻" unit="mΩ" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monResLine"></high-line-chart>

                <high-line-chart v-if="shows.monResLine" :style="{width: '700px'}" height="350px" id="monResLine" name="单体内阻" unit="mΩ" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monResLine"></high-line-chart>

            </div>

            <div class="bui-dialog-close"><i class="icon-close"></i></div>

        </div>


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

@@ -631,9 +631,33 @@
                    } else {
                        setTimeout(function () {
                            self.loading.hide();
                            self.setMonResLine([{
                                mon_res: 10,
                                test_starttime: '2019-12-03 10:09:00'
                            }, {
                                mon_res: 11,
                                test_starttime: '2019-12-03 11:09:00'
                            }, {
                                mon_res: 9,
                                test_starttime: '2019-12-03 12:09:00'
                            }]);
                            self.uiDialog.open();
                        }, 1000);
                    }
                },
                setMonResLine: function setMonResLine(data) {
                    var monRes = [[]];
                    var times = [];
                    // 遍历data
                    for (var i = 0; i < data.length; i++) {
                        var _data = data[i];
                        monRes[0].push(_data.mon_res);
                        times.push(_data.test_starttime);
                    }
                    this.options.monResLine.categories = times;
                    this.options.monResLine.data = monRes;
                    // 设置配置项
                    this.$refs.monResLine.setOption(this.options.monResLine);
                }
            },
            created: function created() {
@@ -798,7 +822,11 @@
                    // 关闭等待
                    self.loading.hide();
                    // 根据返回结果显示内容
                    if (res.code == 1) {} else {}
                    if (res.code == 1) {
                        self.setMonResLine(res.data);
                    } else {
                        self.setMonResLine([]);
                    }
                    // 显示面板
                    self.uiDialog.open();
                };