whychdw
2019-12-03 e494970eb80d7fd9fe6e8e0aceecbb9a82cf39c7
添加单体内阻
4个文件已修改
64 ■■■■■ 已修改文件
platforms/android/app/src/main/assets/www/pages/monitor-data/monitor-data.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/monitor-data/monitor-data.js 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/monitor-data/monitor-data.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/monitor-data/monitor-data.js 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/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();
                };