From c04bbbbe82d0f1ee4bd01ba2ca9f2b3c0b71425e Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期三, 26 五月 2021 10:22:37 +0800
Subject: [PATCH] 提交内容
---
src/pages/test/dialog/completeTestDialog.vue | 2 +-
src/pages/test/testManager/testing.vue | 27 +++++++++++++++++++--------
src/pages/test/dialog/LoadTestDialog.vue | 3 +--
src/pages/test/js/const.js | 8 +++++++-
src/router/index.js | 8 ++++++++
src/pages/test/testManager/index.vue | 1 -
6 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/pages/test/dialog/LoadTestDialog.vue b/src/pages/test/dialog/LoadTestDialog.vue
index eb8f6c1..1d6f08c 100644
--- a/src/pages/test/dialog/LoadTestDialog.vue
+++ b/src/pages/test/dialog/LoadTestDialog.vue
@@ -184,14 +184,13 @@
checkIsTesting() {
getExitTest().then(res => {
let rs = res.data;
- console.log(rs);
if (rs.code == 1) {
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');
+ this.$router.push('/index/testManager');
}
});
} else {
diff --git a/src/pages/test/dialog/completeTestDialog.vue b/src/pages/test/dialog/completeTestDialog.vue
index 0ca2d39..fbdeec1 100644
--- a/src/pages/test/dialog/completeTestDialog.vue
+++ b/src/pages/test/dialog/completeTestDialog.vue
@@ -46,7 +46,7 @@
},
methods: {
newTest() {
- this.$router.push("/index/testManager/noTest")
+ this.$router.push("/index/testManager");
}
},
mounted() {
diff --git a/src/pages/test/js/const.js b/src/pages/test/js/const.js
index d4d4137..042a1ac 100644
--- a/src/pages/test/js/const.js
+++ b/src/pages/test/js/const.js
@@ -2,13 +2,19 @@
{
label: '绌鸿浇璇曢獙',
value: 'kz',
+ route: '/index/windingTest',
+ step: true, // 鏄惁鏈夎瘯楠屾楠�
},
{
label: '璐熻浇璇曢獙',
value: 'fz',
+ route: '/index/noLoadTest',
+ step: true, // 鏄惁鏈夎瘯楠屾楠�
},
{
label: '缁曢樆璇曢獙',
- value: 'rz'
+ value: 'rz',
+ route: '/index/loadTest',
+ step: false,
}
];
\ No newline at end of file
diff --git a/src/pages/test/testManager/index.vue b/src/pages/test/testManager/index.vue
index 9e9c047..dafcc4c 100644
--- a/src/pages/test/testManager/index.vue
+++ b/src/pages/test/testManager/index.vue
@@ -33,7 +33,6 @@
getExitTest() {
getExitTest().then(res=>{
let rs = res.data;
- console.log(rs);
if(rs.code == 1) {
this.$router.push('/index/testManager/testing');
}else {
diff --git a/src/pages/test/testManager/testing.vue b/src/pages/test/testManager/testing.vue
index 9a60e0c..2097e5f 100644
--- a/src/pages/test/testManager/testing.vue
+++ b/src/pages/test/testManager/testing.vue
@@ -43,7 +43,7 @@
<el-button type="primary" size="mini" @click="goTest">杩涘叆璇曢獙</el-button>
</div>
</test-card>
- <test-card no-footer>
+ <test-card no-footer v-if="stepShow">
<div slot="title" class="page-panel-title">
<span class="title-pillar"></span>
璇曢獙杩涘害
@@ -61,6 +61,8 @@
getExitTest,
experimentPoint
} from "@/pages/test/js/api";
+ import {getItemByValue} from "@/assets/js/tools";
+ import {constTestType} from "@/pages/test/js/const";
export default {
name: "testManagerTesting",
components: {
@@ -71,7 +73,8 @@
data() {
return {
info: {},
- list: []
+ list: [],
+ stepShow: false,
}
},
methods: {
@@ -101,13 +104,21 @@
let rs = res.data;
if (rs.code == 1) {
this.info = rs.data;
- if (this.info.type == "fz") {
- this.info.typeName = "璐熻浇璇曢獙"
- } else if (this.info.type == "kz") {
- this.info.typeName = "绌鸿浇璇曢獙"
+ let type = this.info.type;
+ let testInfo = getItemByValue(type, constTestType);
+ if (testInfo != -1) {
+ this.info.typeName = testInfo.label;
+ this.stepShow = testInfo.step;
+ // 鏄剧ず娴嬭瘯姝ラ
+ if(this.stepShow) {
+ this.experimentPoint(rs.data.id);
+ }
+
+ }else {
+ this.info.typeName = "鏈煡璇曢獙绫诲瀷";
}
- console.log(this.info)
- this.experimentPoint(rs.data.id)
+
+
} else {
this.dialogVisible = true;
}
diff --git a/src/router/index.js b/src/router/index.js
index cb0b706..f8fa021 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,6 +8,14 @@
routes
});
+//瑙ｅ喅vue璺敱閲嶅瀵艰埅閿欒
+//鑾峰彇鍘熷瀷瀵硅薄涓婄殑push鍑芥暟
+const originalPush = VueRouter.prototype.push
+//淇敼鍘熷瀷瀵硅薄涓殑push鏂规硶
+VueRouter.prototype.push = function push(location) {
+ return originalPush.call(this, location).catch(err => err)
+}
+
/* eslint-disable */
router.beforeEach((to, from, next) => {
if (to.name != 'login' && (!sessionStorage.getItem('uid') || sessionStorage.getItem('uid') == -1)) {
--
Gitblit v1.9.1