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

This commit is contained in:
chenjianxing 2020-12-11 14:42:34 +08:00
parent 12f6fa6c91 928f7bcf7c
commit d97bcef1a3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
<template slot="title"> <template slot="title">
<div class="title"> <div class="title">
{{ i.name }} {{ i.name }}
<i class="el-icon-check" v-if="i.id === projectId"></i> <i class="el-icon-check" v-if="i.id === currentProjectId"></i>
</div> </div>
</template> </template>
</el-menu-item> </el-menu-item>
@ -26,7 +26,7 @@
</template> </template>
<script> <script>
import {getCurrentUser, hasRoles} from "@/common/js/utils"; import {getCurrentProjectID, getCurrentUser, hasRoles} from "@/common/js/utils";
import {PROJECT_ID, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "@/common/js/constants"; import {PROJECT_ID, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "@/common/js/constants";
export default { export default {
@ -43,7 +43,7 @@ export default {
items: [], items: [],
search_text: '', search_text: '',
userId: getCurrentUser().id, userId: getCurrentUser().id,
projectId: localStorage.getItem(PROJECT_ID) currentProjectId: localStorage.getItem(PROJECT_ID)
} }
}, },
watch: { watch: {
@ -61,6 +61,9 @@ export default {
this.result = this.$get(this.options.url, (response) => { this.result = this.$get(this.options.url, (response) => {
this.items = response.data; this.items = response.data;
this.items = this.items.splice(0, 3); this.items = this.items.splice(0, 3);
if (!getCurrentProjectID() && this.items.length > 0) {
this.change(this.items[0].id);
}
}); });
} }
}, },
@ -72,7 +75,6 @@ export default {
} }
}, },
change(projectId) { change(projectId) {
// todo 初始化的时候切换默认项目
this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => { this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => {
localStorage.setItem(PROJECT_ID, projectId); localStorage.setItem(PROJECT_ID, projectId);
window.location.reload(); window.location.reload();

1
frontend/src/common/js/utils.js
View File

@ -96,6 +96,7 @@ export function getCurrentProjectID() {
export function saveLocalStorage(response) { export function saveLocalStorage(response) {
// 登录信息保存 cookie // 登录信息保存 cookie
localStorage.setItem(TokenKey, JSON.stringify(response.data)); localStorage.setItem(TokenKey, JSON.stringify(response.data));
localStorage.setItem(PROJECT_ID, response.data.lastProjectId);
let rolesArray = response.data.roles; let rolesArray = response.data.roles;
let roles = rolesArray.map(r => r.id); let roles = rolesArray.map(r => r.id);
// 保存角色 // 保存角色