fix:合并

This commit is contained in:
wenyann 2021-03-24 18:52:07 +08:00
parent efae6aae5b
commit ad5346d7e8
1 changed files with 2 additions and 2 deletions

View File

@ -455,7 +455,7 @@ export default {
}, },
getTestOptions(val) { getTestOptions(val) {
this.form.type = val this.form.type = val
this.projectId = getCurrentProjectID() this.projectId = this.projectId
this.testOptions = []; this.testOptions = [];
let url = ''; let url = '';
if (this.form.type === 'testcase' || this.form.type === 'automation') { if (this.form.type === 'testcase' || this.form.type === 'automation') {
@ -556,7 +556,7 @@ export default {
/* /*
this.form.selected=[["automation", "3edaaf31-3fa4-4a53-9654-320205c2953a"],["automation", "3aa58bd1-c986-448c-8060-d32713dbd4eb"]] this.form.selected=[["automation", "3edaaf31-3fa4-4a53-9654-320205c2953a"],["automation", "3aa58bd1-c986-448c-8060-d32713dbd4eb"]]
*/ */
this.projectId = getCurrentProjectID(); this.projectId = this.projectId;
if (window.history && window.history.pushState) { if (window.history && window.history.pushState) {
history.pushState(null, null, document.URL); history.pushState(null, null, document.URL);
window.addEventListener('popstate', this.close); window.addEventListener('popstate', this.close);