Skip to content

Administrator / project_progress

Go to a project
Commit 61df6dc7 by bingobo
Options

修改getuser

1 parent 1bce0738
Inline Side-by-side
Showing with 73 additions and 16 deletions
dist.zip deleted 100644 → 0
The file could not be displayed because it is too large.
src/views/assessChecks/mianHome.vue
...@@ -144,10 +144,11 @@ export default { ...@@ -144,10 +144,11 @@ export default {
timeout: 5000, timeout: 5000,
}); });
// let res = await getIscInfo(); // let res = await getIscInfo();
if (res.code === 200) { // if (res.code === 200) {
if (res && res.data && res.data.code == 200) {
// sessionStorage.setItem("userid", res.content.id); // sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.content.name); sessionStorage.setItem("username", res.data.content.name);
sessionStorage.setItem("userloginname", res.content.loginName); sessionStorage.setItem("userloginname", res.data.content.loginName);
} }
} catch (error) { } catch (error) {
const res = { const res = {
......
src/views/layout/index.vue
...@@ -410,10 +410,11 @@ export default { ...@@ -410,10 +410,11 @@ export default {
timeout: 5000, timeout: 5000,
}); });
// let res = await getIscInfo(); // let res = await getIscInfo();
if (res.code === 200) { // if (res.code === 200) {
if (res && res.data && res.data.code == 200) {
// sessionStorage.setItem("userid", res.content.id); // sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.content.name); sessionStorage.setItem("username", res.data.content.name);
sessionStorage.setItem("userloginname", res.content.loginName); sessionStorage.setItem("userloginname", res.data.content.loginName);
} }
} catch (error) { } catch (error) {
const res = { const res = {
......
src/views/layout/leftBar.vue
...@@ -127,12 +127,12 @@ export default { ...@@ -127,12 +127,12 @@ export default {
}, },
}, },
watch: { watch: {
// wholeRoutes(newVale, oldVale) { wholeRoutes(newVale, oldVale) {
// // console.log('newVale', newVale); console.log('wholeRoutes-newVale', newVale);
// this.souYeRoute = newVale.souYeRoute // this.souYeRoute = newVale.souYeRoute
// this.menuList = newVale.restRoutes // this.menuList = newVale.restRoutes
// console.log(111, this.menuList); // console.log(111, this.menuList);
// }, },
$route: { $route: {
immediate: true, immediate: true,
handler(n, o) { handler(n, o) {
......
src/views/layout/mainLayout.vue
...@@ -258,19 +258,73 @@ export default { ...@@ -258,19 +258,73 @@ export default {
// pageSize: 10, // pageSize: 10,
// module: 0, // module: 0,
// }) // })
// try {
// const res = {
// data: {
// content: {
// menuList: [
// {
// name: '立项'
// },
// {
// name: '后评估'
// }
// ]
// }
// }
// }
// const menu = res && res.data && res.data.content.menuList ? res.data.content.menuList.find(item => item.name === "综合分析中心").children : 22;
// console.log('debug1', menu);
// } catch (error) {
// console.log('debug2', error);
// }
// fetch('http://25.66.215.209/gateway/getUser', {
// method: 'POST',
// headers: {
// 'Content-Type': 'application/json'
// }
// }).then(response => {
// response.json()
// }).then(data => {
// console.log('success11', data);
// // 实际接口返回的数据结构
// // data = {
// // code: 200,
// // content: {
// // loginName: 'aaa',
// // id: 'asda',
// // menuList: [
// // {name: '后评估中心', children: [], url: '/arch/#/mainLayout/mianHome'},
// // {name: '综合分析中心', children: [], url: '/arch/static/#/panorama/requirement'},
// // ]
// // }
// // }
// }).catch(error => {
// console.log('error222', error);
// })
try { try {
let res = await axios.post(`http://25.66.215.209/gateway/getUser`, null, { let res = await axios.post(`http://25.66.215.209/gateway/getUser`, null, {
timeout: 1000, timeout: 1000,
}); });
console.log('gateway/getUser=>res', res);
// let res = await getIscInfo(); // let res = await getIscInfo();
if (res.code === 200) { // if (res.code === 200) {
if (res && res.data && res.data.code == 200) {
// sessionStorage.setItem("userid", res.content.id); // sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.content.name); sessionStorage.setItem("username", res.data.content.name);
sessionStorage.setItem("userloginname", res.content.loginName); sessionStorage.setItem("userloginname", res.data.content.loginName);
// const routes = res.content.menuList.filter(item => item.name === '立项统筹中心') // const routes = res.data.content.menuList.filter(item => item.name === '立项统筹中心')
const routes = res.content.menuList.filter(item => item.name === '后评估管控中心') const routes = res.data.content.menuList.filter(item => item.name === '后评估管控中心')
const resRoutes = routes[0].children; const resRoutes = routes[0].children;
// console.log(123123, resRoutes); console.log(123123, resRoutes);
const souYeRoute = resRoutes.filter((item) => item.name === "首页"); const souYeRoute = resRoutes.filter((item) => item.name === "首页");
const restRoutes = resRoutes.filter((item) => item.name !== "首页"); const restRoutes = resRoutes.filter((item) => item.name !== "首页");
// restRoutes.forEach(val => { // restRoutes.forEach(val => {
...@@ -279,10 +333,11 @@ export default { ...@@ -279,10 +333,11 @@ export default {
// } // }
// }) // })
// this.menuList = restRoutes // this.menuList = restRoutes
// console.log(2222, souYeRoute, restRoutes); console.log(2222, souYeRoute, restRoutes);
this.wholeRoutes = {souYeRoute, restRoutes} this.wholeRoutes = {souYeRoute, restRoutes}
} }
} catch (error) { } catch (error) {
console.error('getIscInfoAndRoutes', error);
const res = { const res = {
success: true, success: true,
code: 200, code: 200,
......
归档.zip deleted 100644 → 0
No preview for this file type
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!