Skip to content

Administrator / project_progress

Go to a project
Commit ed9f8874 by bingobo
Options

修改getuser逻辑，在router/index.js中获取用户信息，增加windowunload实现页面刷新时更新getuser

1 parent 2eb7c304
Expand all
Inline Side-by-side
Showing with 88 additions and 87 deletions
src/App.vue
......@@ -9,6 +9,25 @@
</template>
<script>
// import './assets/bootstrap/bootstrap.min.css'
import axios from 'axios';
export default {
data() {
return{
wholeRoutes: {}
}
},
async created() {
},
methods: {
},
destroyed(){
console.log('destroyed11111111');
}
}
// document.cookie = "joker=dwwq12";
</script>
......
src/main.js
import Vue from 'vue'
import App from './App.vue'
import router from './router'
import router from './router/index.js'
import * as echarts from 'echarts'
import ElementUI from 'element-ui'
import store from './store';
......
src/utils/http.js
import Vue from 'vue';
import axios from 'axios';
import router from '../router/index.js';
// import router from '../router/index.js';
import { Message, MessageBox, Loading } from 'element-ui';
import { SM4Util } from "./sm4";
......
src/views/assessChecks/mianHome.vue
......@@ -131,50 +131,42 @@ export default {
this.init();
},
methods: {
async getIscInfoAndRoutes() {
// const userInfo = Cookies.get('joker');
// console.log('userInfo', userInfo);
// let res = await evaluationMaterials({
// current: 1,
// pageSize: 10,
// module: 0,
// })
try {
let res = await axios.post(SystemConfig.VUE_APP_GET_USER, null, {
timeout: 5000,
});
// let res = await getIscInfo();
// async getIscInfoAndRoutes() {
// try {
// let res = await axios.post(SystemConfig.VUE_APP_GET_USER, null, {
// timeout: 5000,
// });
// if (res && res.data && res.data.code == 200) {
// // sessionStorage.setItem("userid", res.content.id);
// sessionStorage.setItem("username", res.data.content.name);
// sessionStorage.setItem("userloginname", res.data.content.loginName);
// }
// } catch (error) {
// const res = {
// success: true,
// code: 200,
// message: "OK",
// content: {
// loginName: "weizheng",
// name: "魏征",
// department: "数据运营中心",
// departmentId: "",
// funcList: [],
// },
// };
// if (res.code === 200) {
if (res && res.data && res.data.code == 200) {
// sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.data.content.name);
sessionStorage.setItem("userloginname", res.data.content.loginName);
}
} catch (error) {
const res = {
success: true,
code: 200,
message: "OK",
content: {
loginName: "weizheng",
name: "魏征",
department: "数据运营中心",
departmentId: "",
funcList: [],
},
};
if (res.code === 200) {
// sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.content.name);
sessionStorage.setItem("userloginname", res.content.loginName);
}
}
},
// // sessionStorage.setItem("userid", res.content.id);
// sessionStorage.setItem("username", res.content.name);
// sessionStorage.setItem("userloginname", res.content.loginName);
// }
// }
// },
async init() {
if(!sessionStorage.getItem('userloginname')) {
// 如果没有session, 先调用该接口获取用户信息
await this.getIscInfoAndRoutes()
}
// if(!sessionStorage.getItem('userloginname')) {
// // 如果没有session, 先调用该接口获取用户信息
// await this.getIscInfoAndRoutes()
// }
let params = {};
Object.assign(params, this.ruleForm);
......
src/views/assessZC/materialAcquisition.vue
......@@ -62,7 +62,7 @@
</span>
列表自定义设置
</el-button>
<div class="column-display"
<div
style="width: 180px;display: flex; flex-direction: column; justify-content: center; align-items: center;">
<el-checkbox-group v-model="checkedTableColumns">
<el-checkbox v-for="column in columns" :key="column.label" :label="column.prop">
......@@ -73,7 +73,6 @@
</el-popover>
<el-button @click="detailsForm()">
<img alt="img" class="buttonIcon" src="../../assets/ck.png" />详情</el-button>
<el-button @click="confirm()" :disabled="confirmdisabled" :class="confirmdisabled ? 'noclick' : ''">
<i class="el-icon-chat-dot-square"></i>&nbsp;&nbsp;&nbsp;问题整改</el-button>
<el-button @click="submitNexts()" :disabled="subdisabled" :class="subdisabled ? 'noclick' : ''"><i
......
src/views/layout/index.vue
......@@ -397,52 +397,43 @@ export default {
this.$refs[ref].toggleRowSelection(row);
}
},
async getIscInfoAndRoutes() {
// const userInfo = Cookies.get('joker');
// console.log('userInfo', userInfo);
// let res = await evaluationMaterials({
// current: 1,
// pageSize: 10,
// module: 0,
// })
try {
let res = await axios.post(SystemConfig.VUE_APP_GET_USER, null, {
timeout: 5000,
});
// let res = await getIscInfo();
// async getIscInfoAndRoutes() {
// try {
// let res = await axios.post(SystemConfig.VUE_APP_GET_USER, null, {
// timeout: 5000,
// });
// if (res && res.data && res.data.code == 200) {
// // sessionStorage.setItem("userid", res.content.id);
// sessionStorage.setItem("username", res.data.content.name);
// sessionStorage.setItem("userloginname", res.data.content.loginName);
// }
// } catch (error) {
// const res = {
// success: true,
// code: 200,
// message: "OK",
// content: {
// loginName: "weizheng",
// name: "魏征",
// mobile: "",
// email: "",
// department: "数据运营中心",
// departmentId: "",
// funcList: [],
// },
// };
// if (res.code === 200) {
if (res && res.data && res.data.code == 200) {
// sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.data.content.name);
sessionStorage.setItem("userloginname", res.data.content.loginName);
}
} catch (error) {
const res = {
success: true,
code: 200,
message: "OK",
content: {
loginName: "weizheng",
name: "魏征",
mobile: "",
email: "",
department: "数据运营中心",
departmentId: "",
funcList: [],
},
};
if (res.code === 200) {
// sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.content.name);
sessionStorage.setItem("userloginname", res.content.loginName);
}
}
},
// // sessionStorage.setItem("userid", res.content.id);
// sessionStorage.setItem("username", res.content.name);
// sessionStorage.setItem("userloginname", res.content.loginName);
// }
// }
// },
async getMessageList() {
if(!sessionStorage.getItem('userloginname')) {
// 如果没有session, 先调用该接口获取用户信息
await this.getIscInfoAndRoutes()
// await this.getIscInfoAndRoutes()
}
let params = {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!