|
@@ -7,10 +7,10 @@
|
|
<img src="../assets/images/logo.png" alt="">
|
|
<img src="../assets/images/logo.png" alt="">
|
|
</div>
|
|
</div>
|
|
<div class="header_right">
|
|
<div class="header_right">
|
|
- <el-avatar shape="circle" :size="50" :src="dmUser.faceid" />
|
|
|
|
|
|
+ <el-avatar shape="circle" :size="50" :src="dmUser.user.dmUser.faceid" />
|
|
<div class="departmeny">
|
|
<div class="departmeny">
|
|
- <p class="name"><span>{{ nowUser.nickName }}</span></p>
|
|
|
|
- <p><span>部门:</span><span>{{ dept.name }}</span></p>
|
|
|
|
|
|
+ <p class="name"><span>{{ dmUser.user.nickName }}</span></p>
|
|
|
|
+ <p><span>部门:</span><span>{{ dmUser.user.dept.name }}</span></p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</header>
|
|
</header>
|
|
@@ -19,13 +19,13 @@
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<div class="demo-basic--circle">
|
|
<div class="demo-basic--circle">
|
|
<div class="block">
|
|
<div class="block">
|
|
- <el-avatar :size="150" :src="dmUser.faceid" />
|
|
|
|
|
|
+ <el-avatar :size="150" :src="dmUser.user.dmUser.faceid" />
|
|
</div>
|
|
</div>
|
|
<div class="userInfo">
|
|
<div class="userInfo">
|
|
- <div class="name"><span>{{ nowUser.nickName }}</span></div>
|
|
|
|
|
|
+ <div class="name"><span>{{ dmUser.user.nickName }}</span></div>
|
|
<div class="departmeny">
|
|
<div class="departmeny">
|
|
- <p><span>部门:</span><span>{{ dept.name }}</span></p>
|
|
|
|
- <p><span>手机:</span><span>{{ nowUser.phone }}</span></p>
|
|
|
|
|
|
+ <p><span>部门:</span><span>{{ dmUser.user.dept.name }}</span></p>
|
|
|
|
+ <p><span>手机:</span><span>{{ dmUser.user.phone }}</span></p>
|
|
</div>
|
|
</div>
|
|
<div class="icon">
|
|
<div class="icon">
|
|
<div class="icon_left">
|
|
<div class="icon_left">
|
|
@@ -174,9 +174,7 @@ export default {
|
|
systemListOne: [], // 快捷功能入口列表(字段需改,暂用的系统功能入口)
|
|
systemListOne: [], // 快捷功能入口列表(字段需改,暂用的系统功能入口)
|
|
balance: null,
|
|
balance: null,
|
|
plate: null,
|
|
plate: null,
|
|
- nowUser: {},
|
|
|
|
- dmUser: {},
|
|
|
|
- dept: {}
|
|
|
|
|
|
+ dmUser: { 'user': { 'dmUser': {}, 'dept': {}}}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -191,27 +189,32 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
getUser(token) {
|
|
getUser(token) {
|
|
ssoGetUser(token).then((res) => {
|
|
ssoGetUser(token).then((res) => {
|
|
- this.nowUser = res.data.data.user
|
|
|
|
- this.dmUser = this.nowUser.dmUser
|
|
|
|
- this.dept = this.nowUser.dept
|
|
|
|
- console.log(this.nowUser)
|
|
|
|
|
|
+ if (!sessionStorage.getItem('dmUser')) {
|
|
|
|
+ console.log(111)
|
|
|
|
+ sessionStorage.setItem('dmUser', JSON.stringify(res.data.data))
|
|
|
|
+ this.dmUser = res.data.data
|
|
|
|
+ } else {
|
|
|
|
+ console.log(222)
|
|
|
|
+ this.dmUser = JSON.parse(sessionStorage.getItem('dmUser'))
|
|
|
|
+ }
|
|
|
|
+ console.log(this.dmUser)
|
|
const user = {
|
|
const user = {
|
|
- username: res.data.data.user.username,
|
|
|
|
- password: res.data.data.user.ossPassword
|
|
|
|
|
|
+ username: this.dmUser.user.username,
|
|
|
|
+ password: this.dmUser.user.ossPassword
|
|
}
|
|
}
|
|
this.$store.dispatch('Sso', user).then(() => {
|
|
this.$store.dispatch('Sso', user).then(() => {
|
|
- crudDmSystem.queryByUserId(res.data.data.user.id, 0).then((res) => {
|
|
|
|
|
|
+ crudDmSystem.queryByUserId(this.dmUser.user.id, 0).then((res) => {
|
|
this.systemList = res
|
|
this.systemList = res
|
|
})
|
|
})
|
|
- crudDmSystem.queryByUserId(res.data.data.user.id, 1).then((res) => {
|
|
|
|
|
|
+ crudDmSystem.queryByUserId(this.dmUser.user.id, 1).then((res) => {
|
|
this.systemListOne = res
|
|
this.systemListOne = res
|
|
})
|
|
})
|
|
})
|
|
})
|
|
- this.getBalance(res.data.data.user.dmUser.cardid)
|
|
|
|
- this.getPlate(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.id)
|
|
|
|
- this.getAccessTraffic(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.id)
|
|
|
|
- this.orderRecord(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.dmUser.cardid)
|
|
|
|
- this.getVisitors(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.id)
|
|
|
|
|
|
+ this.getBalance(this.dmUser.user.dmUser.cardid)
|
|
|
|
+ this.getPlate(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.id)
|
|
|
|
+ this.getAccessTraffic(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.id)
|
|
|
|
+ this.orderRecord(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.dmUser.cardid)
|
|
|
|
+ this.getVisitors(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.id)
|
|
})
|
|
})
|
|
},
|
|
},
|
|
getBalance(card) {
|
|
getBalance(card) {
|