test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/metersphere/metersphere 

# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
This commit is contained in:
fit2-zhao 2020-12-18 17:14:44 +08:00
parent 9ef40e9187 93369cb04a
commit 616d00024c
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/business/components/common/head/SearchList.vue
View File

@ -101,6 +101,15 @@ export default {
this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => {
localStorage.setItem(PROJECT_ID, projectId);
let path = this.$route.matched[0].path ? this.$route.matched[0].path : '/';
if (path === '/api') {
if (this.$store.state.switch.value === 'new') {
path = "/api/home";
} else if (this.$store.state.switch.value === 'old') {
path = "/api/home_obsolete";
} else {
path = '/';
}
}
this.$router.push(path).then(() => {
window.location.reload()
}).catch(err => err);

2
frontend/src/business/components/settings/organization/components/JiraSetting.vue
View File

@ -34,7 +34,7 @@
</div>
<div>
2. {{ $t('organization.integration.use_tip_two') }}
<router-link to="/track/project/all" style="margin-left: 5px">
<router-link to="/setting/project/all" style="margin-left: 5px">
{{ $t('organization.integration.link_the_project_now') }}
</router-link>
</div>

2
frontend/src/business/components/settings/organization/components/TapdSetting.vue
View File

@ -28,7 +28,7 @@
</div>
<div>
2. {{ $t('organization.integration.use_tip_two') }}
<router-link to="/track/project/all" style="margin-left: 5px">
<router-link to="/setting/project/all" style="margin-left: 5px">
{{ $t('organization.integration.link_the_project_now') }}
</router-link>
</div>

2
frontend/src/business/components/settings/organization/components/ZentaoSetting.vue
View File

@ -31,7 +31,7 @@
</div>
<div>
2. {{ $t('organization.integration.use_tip_two') }}
<router-link to="/track/project/all" style="margin-left: 5px">
<router-link to="/setting/project/all" style="margin-left: 5px">
{{ $t('organization.integration.link_the_project_now') }}
</router-link>
</div>

3
frontend/src/business/components/track/plan/components/TestPlanEdit.vue
View File

@ -13,11 +13,10 @@
<el-row>
<el-col :span="8" :offset="1">
<el-form-item
:placeholder="$t('test_track.plan.input_name')"
:label="$t('test_track.plan.plan_name')"
:label-width="formLabelWidth"
prop="name">
<el-input v-model="form.name"></el-input>
<el-input v-model="form.name" :placeholder="$t('test_track.plan.input_plan_name')"></el-input>
</el-form-item>
</el-col>