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/dialog/LoadTestDialog.vue | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/pages/test/dialog/LoadTestDialog.vue b/src/pages/test/dialog/LoadTestDialog.vue
index d23db2d..64dd091 100644
--- a/src/pages/test/dialog/LoadTestDialog.vue
+++ b/src/pages/test/dialog/LoadTestDialog.vue
@@ -1,25 +1,35 @@
<template>
- <el-dialog
- :visible.sync="dialogVisible" 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"
- v-loading="loading" element-loading-text="鎷煎懡鍔犺浇涓�"
- element-loading-spinner="el-icon-loading"
- element-loading-background="rgba(0, 0, 0, 0)">
- <mw-step v-model="step"></mw-step>
- <div class="step-list">
- <div class="step-item" v-show="step == 0">
- <new-test @nextStep="newTest"></new-test>
+ <div class="el-dialog-wrapper">
+ <el-dialog
+ :visible.sync="dialogVisible" 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"
+ v-loading="loading" element-loading-text="鎷煎懡鍔犺浇涓�"
+ element-loading-spinner="el-icon-loading"
+ element-loading-background="rgba(0, 0, 0, 0)">
+ <mw-step v-model="step"></mw-step>
+ <div class="step-list">
+ <div class="step-item" v-show="step == 0">
+ <new-test @nextStep="newTest"></new-test>
+ </div>
+ <div class="step-item" v-show="step == 1" v-if="step>0">
+ <test-data-input :type="params.type" @nextStep="dataInput"></test-data-input>
+ </div>
+ <div class="step-item" v-show="step == 2" v-if="step>1">
+ <test-step-confirm v-if="type=='fz'" @nextStep="completeTest"></test-step-confirm>
+ <test-step-confirm-kz v-else-if="type=='kz'" @nextStep="completeTest"></test-step-confirm-kz>
+ </div>
</div>
- <div class="step-item" v-show="step == 1" v-if="step>0">
- <test-data-input :type="params.type" @nextStep="dataInput"></test-data-input>
- </div>
- <div class="step-item" v-show="step == 2" v-if="step>1">
- <test-step-confirm v-if="type=='fz'" @nextStep="completeTest"></test-step-confirm>
- <test-step-confirm-kz v-else-if="type=='kz'" @nextStep="completeTest"></test-step-confirm-kz>
- </div>
- </div>
- </el-dialog>
+ </el-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">
+ <test-start :type="type" @startTest="startTest" v-if="testStepCheck"></test-start>
+ </el-dialog>
+ </div>
</template>
<script>
@@ -28,6 +38,7 @@
import TestDataInput from "@/pages/test/dialog/testDataInput";
import TestStepConfirm from "@/pages/test/dialog/testStepConfirm";
import testStepConfirmKz from "@/pages/test/dialog/testStepConfirmKz";
+import TestStart from "@/pages/test/dialog/testStart";
import {addKzFzTest} from "@/pages/test/js/api";
export default {
@@ -47,13 +58,15 @@
TestDataInput,
mwStep,
newTest,
- testStepConfirmKz
+ testStepConfirmKz,
+ TestStart
},
data() {
return {
loading: false,
step: 0,
dialogVisible: false,
+ testStepCheck: false,
params: {
baseData: {
experimentId: "", // 璇曢獙缂栧彿
@@ -113,11 +126,11 @@
this.loading = true;
addKzFzTest(this.params).then(res => {
let rs = res.data;
- console.log(rs);
if (rs.code == 1) {
this.dialogVisible = false;
this.$nextTick(() => {
this.$layer.msg("鐢熸垚璇曢獙鎴愬姛");
+ this.testStepCheck = true;
});
} else {
this.$layer.msg("鐢熸垚璇曢獙澶辫触");
@@ -128,6 +141,9 @@
this.loading = false;
});
},
+ startTest() {
+ console.log(123);
+ }
},
mounted() {
this.params.type = this.type;
--
Gitblit v1.9.1