From 393c717d50fe8933e57d3014c6932b2acb750a50 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期一, 24 五月 2021 10:27:17 +0800
Subject: [PATCH] 提交内容
---
src/pages/test/loadTest.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/pages/test/loadTest.vue b/src/pages/test/loadTest.vue
index 409c802..5b88cd8 100644
--- a/src/pages/test/loadTest.vue
+++ b/src/pages/test/loadTest.vue
@@ -202,15 +202,7 @@
</div>
</div>
</div>
- <load-test-dialog type="fz" :visible="dialogVisible"></load-test-dialog>
- <el-dialog
- :visible.sync="testStepCheck" class="position-absolute dialog-center dialog-no-header"
- width="840px" top="0"
- :modal="false" :destroy-on-close="true"
- :close-on-press-escape="false" :close-on-click-modal="false"
- :modal-append-to-body="false">
-
- </el-dialog>
+ <load-test-dialog :type="type" :visible="dialogVisible"></load-test-dialog>
</div>
</template>
@@ -225,6 +217,8 @@
import absPanel from '@/components/smallModule/absPanel.vue';
import LoadTestDialog from "@/pages/test/dialog/LoadTestDialog";
import {getExitTest} from "@/pages/test/js/api";
+import {constTestType} from "@/pages/test/js/const";
+import {getLabel} from "@/assets/js/tools";
let diagram;
export default {
@@ -241,6 +235,7 @@
},
data() {
return {
+ type: 'fz',
dialogVisible: false,
speedValue: 0,
nbmspeedValue: 0,
@@ -387,7 +382,6 @@
unit: "V",
},
],
- testStepCheck: false,
}
},
watch: {
@@ -479,7 +473,17 @@
getExitTest().then(res=>{
let rs = res.data;
if(rs.code == 1) {
- this.$layer.msg('宸插瓨鍦ㄨ瘯楠�');
+ let data = rs.data;
+ if(data.type != this.type) {
+ let testType = getLabel(data.type, constTestType);
+ this.$alert("褰撳墠宸插紑鍚瘯楠岋細"+testType+"銆傚闇�瑕佽繘琛屽叾浠栬瘯楠岄渶鍏堝叧闂璇曢獙銆�", '绯荤粺鎻愮ず', {
+ callback:()=>{
+ this.$router.push('/index/testManager/testing');
+ }
+ });
+ }else {
+ console.log('鏌ヨ璇曢獙姝ラ');
+ }
}else {
this.dialogVisible = true;
}
--
Gitblit v1.9.1