whychdw
2019-10-24 e2e10167f08600de684842711b5829c4c8cde77c
提交内容
4个文件已修改
86 ■■■■■ 已修改文件
platforms/android/app/src/main/assets/www/pages/testdata/testdata.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/testdata/testdata.js 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/testdata/testdata.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/testdata/testdata.js 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/testdata/testdata.html
@@ -61,7 +61,7 @@
                                    <i-button
                                    v-if="testData.btnState == 1" 
                                    type="success"
                                    @click="startTest()">继续测试</i-button>
                                    @click="continueTest()">继续测试</i-button>
                                    <!-- 暂停测试 -->
                                    <i-button 
                                    v-else
platforms/android/app/src/main/assets/www/pages/testdata/testdata.js
@@ -118,6 +118,37 @@
                    }
                    return rs;
                },
                // 继续测试
                continueTest: function() {
                    var params = this.params;
                    var testData = this.testData;
                    var dataState = this.regData(testData.tatalVol);
                    if(dataState.code == 1) {
                        switch(params.name) {
                            case 'charge':
                                // 启动充电测试
                                this.startCharge();
                            break;
                            case 'discharge':
                                // 启动放电测试
                                this.startDischarge();
                            break;
                            case 'activity':        // 特殊需要继续发送暂停
                                // 暂停活化测试
                                this.pauseHHTest();
                            break;
                            default:
                                bui.alert('未知测试类型,无法启动测试!');
                            break;
                        }
                    }else {
                        this.$Modal.warning({
                            title: '告警信息',
                            'mask-closable': true,
                            content: dataState.msg
                        });
                    }
                },
                // 启动测试
                startTest: function() {
                    var params = this.params;
@@ -340,11 +371,17 @@
                this.pauseTestWorker.onmessage = function(res) {
                    // 关闭等待框
                    self.loading.hide();
                    // 获取页面路由参数
                    var params = self.params;
                    var action = '暂停';
                    if(params.name == 'activity') {
                        action = '操作';
                    }
                    var rs = res.data;
                    if(rs.code == 1) {
                        bui.alert('暂停成功!');
                        bui.alert(action+'成功!');
                    }else {
                        bui.alert('暂停失败!');
                        bui.alert(action+'失败!');
                    }
                    // 获取测试参数
                    self.getTestData();
www/pages/testdata/testdata.html
@@ -61,7 +61,7 @@
                                    <i-button
                                    v-if="testData.btnState == 1" 
                                    type="success"
                                    @click="startTest()">继续测试</i-button>
                                    @click="continueTest()">继续测试</i-button>
                                    <!-- 暂停测试 -->
                                    <i-button 
                                    v-else
www/pages/testdata/testdata.js
@@ -118,6 +118,37 @@
                    }
                    return rs;
                },
                // 继续测试
                continueTest: function() {
                    var params = this.params;
                    var testData = this.testData;
                    var dataState = this.regData(testData.tatalVol);
                    if(dataState.code == 1) {
                        switch(params.name) {
                            case 'charge':
                                // 启动充电测试
                                this.startCharge();
                            break;
                            case 'discharge':
                                // 启动放电测试
                                this.startDischarge();
                            break;
                            case 'activity':        // 特殊需要继续发送暂停
                                // 暂停活化测试
                                this.pauseHHTest();
                            break;
                            default:
                                bui.alert('未知测试类型,无法启动测试!');
                            break;
                        }
                    }else {
                        this.$Modal.warning({
                            title: '告警信息',
                            'mask-closable': true,
                            content: dataState.msg
                        });
                    }
                },
                // 启动测试
                startTest: function() {
                    var params = this.params;
@@ -340,11 +371,17 @@
                this.pauseTestWorker.onmessage = function(res) {
                    // 关闭等待框
                    self.loading.hide();
                    // 获取页面路由参数
                    var params = self.params;
                    var action = '暂停';
                    if(params.name == 'activity') {
                        action = '操作';
                    }
                    var rs = res.data;
                    if(rs.code == 1) {
                        bui.alert('暂停成功!');
                        bui.alert(action+'成功!');
                    }else {
                        bui.alert('暂停失败!');
                        bui.alert(action+'失败!');
                    }
                    // 获取测试参数
                    self.getTestData();