Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
imac-vue
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
jinhui.wang
2022-07-25 16:12:36 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e92db410234f1b54f4af8e4a4cee46e75136c3bb
e92db410
1 parent
a0fccdbc
代码更新
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
42 deletions
src/layout/components/Navbar.vue
src/settings.js
src/layout/components/Navbar.vue
View file @
e92db41
<template>
<div class="navbar">
<hamburger
id="hamburger-container"
:is-active="sidebar.opened"
class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<breadcrumb
id="breadcrumb-container"
class="breadcrumb-container"
v-if="!topNav"
/>
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
@toggleClick="toggleSideBar" />
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
<div class="right-menu">
<template v-if="device !== 'mobile'"> </template>
<el-select
v-model="portName"
size="mini"
style="width: 120px; top: -17px; right: 7px"
placeholder="选择口岸"
>
<el-option
v-for="item in portNameList"
:label="item"
:value="item"
:key="item"
>
<el-select v-model="portName" size="mini" style="width: 120px; top: -17px; right: 7px" placeholder="选择口岸">
<el-option v-for="item in portNameList" :label="item" :value="item" :key="item">
</el-option>
</el-select>
<el-dropdown
class="avatar-container right-menu-item hover-effect"
trigger="click"
>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="userName-wrapper">
<!-- <img :src="avatar" class="user-avatar" /> -->
<span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎!{{
userName
}}</span>
<span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎!{{
userName
}}</span>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="logout">
...
...
@@ -43,12 +22,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-select
v-model="locale"
size="mini"
@change="local"
style="width: 75px; top: -17px; right: 7px"
>
<el-select v-model="locale" size="mini" @change="local" style="width: 75px; top: -17px; right: 7px">
<el-option label="中文" value="zh"> </el-option>
<el-option label="英文" value="en"> </el-option>
</el-select>
...
...
@@ -70,7 +44,7 @@ export default {
},
data() {
return {
userName:"",
userName:
"",
portNameList: [],
locale: "zh",
};
...
...
@@ -111,9 +85,9 @@ export default {
} else {
this.$confirm(res.msg, "提示", {
type: "warning",
}).then(()
=>
{
}).then(()
=>
{
location.reload();
}).catch(()
=>
{
}).catch(()
=>
{
location.reload();
});
}
...
...
@@ -135,7 +109,7 @@ export default {
type: "warning",
}).then(() => {
this.$store.dispatch("LogOut").then(() => {
this.$router.push('/')
window.location.href = this.settings.logoutURL
// window.location.href = "https://test.secure.fedex.com/logout";//wsso系统跳转
});
});
...
...
@@ -213,16 +187,19 @@ export default {
text-align: center;
margin-right: 15px;
font-weight: 700;
i{
i {
display: inline-block;
height: 50px;
margin-right:5px;
margin-right:
5px;
font-size: 24px;
line-height: 50px;
}
.userName-wrapper {
position: relative;
font-size:14px;
font-size: 14px;
.user-avatar {
cursor: pointer;
width: 40px;
...
...
src/settings.js
View file @
e92db41
...
...
@@ -42,7 +42,7 @@ module.exports = {
/**
* logout
*/
logoutURL
:
'
/test/index
'
,
logoutURL
:
'
http://47.103.140.98/test/login
'
,
/**
* 后端接口
...
...
Please
register
or
login
to post a comment