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