Showing
2 changed files
with
19 additions
and
42 deletions
| 1 | <template> | 1 | <template> |
| 2 | <div class="navbar"> | 2 | <div class="navbar"> |
| 3 | - <hamburger | 3 | + <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" |
| 4 | - id="hamburger-container" | 4 | + @toggleClick="toggleSideBar" /> |
| 5 | - :is-active="sidebar.opened" | 5 | + <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" /> |
| 6 | - class="hamburger-container" | ||
| 7 | - @toggleClick="toggleSideBar" | ||
| 8 | - /> | ||
| 9 | - <breadcrumb | ||
| 10 | - id="breadcrumb-container" | ||
| 11 | - class="breadcrumb-container" | ||
| 12 | - v-if="!topNav" | ||
| 13 | - /> | ||
| 14 | <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" /> | 6 | <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" /> |
| 15 | 7 | ||
| 16 | <div class="right-menu"> | 8 | <div class="right-menu"> |
| 17 | <template v-if="device !== 'mobile'"> </template> | 9 | <template v-if="device !== 'mobile'"> </template> |
| 18 | - <el-select | 10 | + <el-select v-model="portName" size="mini" style="width: 120px; top: -17px; right: 7px" placeholder="选择口岸"> |
| 19 | - v-model="portName" | 11 | + <el-option v-for="item in portNameList" :label="item" :value="item" :key="item"> |
| 20 | - size="mini" | ||
| 21 | - style="width: 120px; top: -17px; right: 7px" | ||
| 22 | - placeholder="选择口岸" | ||
| 23 | - > | ||
| 24 | - <el-option | ||
| 25 | - v-for="item in portNameList" | ||
| 26 | - :label="item" | ||
| 27 | - :value="item" | ||
| 28 | - :key="item" | ||
| 29 | - > | ||
| 30 | </el-option> | 12 | </el-option> |
| 31 | </el-select> | 13 | </el-select> |
| 32 | - <el-dropdown | 14 | + <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> |
| 33 | - class="avatar-container right-menu-item hover-effect" | ||
| 34 | - trigger="click" | ||
| 35 | - > | ||
| 36 | <div class="userName-wrapper"> | 15 | <div class="userName-wrapper"> |
| 37 | <!-- <img :src="avatar" class="user-avatar" /> --> | 16 | <!-- <img :src="avatar" class="user-avatar" /> --> |
| 38 | - <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎!{{userName}}</span> | 17 | + <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎!{{ userName }}</span> |
| 39 | </div> | 18 | </div> |
| 40 | <el-dropdown-menu slot="dropdown"> | 19 | <el-dropdown-menu slot="dropdown"> |
| 41 | <el-dropdown-item @click.native="logout"> | 20 | <el-dropdown-item @click.native="logout"> |
| ... | @@ -43,12 +22,7 @@ | ... | @@ -43,12 +22,7 @@ |
| 43 | </el-dropdown-item> | 22 | </el-dropdown-item> |
| 44 | </el-dropdown-menu> | 23 | </el-dropdown-menu> |
| 45 | </el-dropdown> | 24 | </el-dropdown> |
| 46 | - <el-select | 25 | + <el-select v-model="locale" size="mini" @change="local" style="width: 75px; top: -17px; right: 7px"> |
| 47 | - v-model="locale" | ||
| 48 | - size="mini" | ||
| 49 | - @change="local" | ||
| 50 | - style="width: 75px; top: -17px; right: 7px" | ||
| 51 | - > | ||
| 52 | <el-option label="中文" value="zh"> </el-option> | 26 | <el-option label="中文" value="zh"> </el-option> |
| 53 | <el-option label="英文" value="en"> </el-option> | 27 | <el-option label="英文" value="en"> </el-option> |
| 54 | </el-select> | 28 | </el-select> |
| ... | @@ -70,7 +44,7 @@ export default { | ... | @@ -70,7 +44,7 @@ export default { |
| 70 | }, | 44 | }, |
| 71 | data() { | 45 | data() { |
| 72 | return { | 46 | return { |
| 73 | - userName:"", | 47 | + userName: "", |
| 74 | portNameList: [], | 48 | portNameList: [], |
| 75 | locale: "zh", | 49 | locale: "zh", |
| 76 | }; | 50 | }; |
| ... | @@ -111,9 +85,9 @@ export default { | ... | @@ -111,9 +85,9 @@ export default { |
| 111 | } else { | 85 | } else { |
| 112 | this.$confirm(res.msg, "提示", { | 86 | this.$confirm(res.msg, "提示", { |
| 113 | type: "warning", | 87 | type: "warning", |
| 114 | - }).then(()=>{ | 88 | + }).then(() => { |
| 115 | location.reload(); | 89 | location.reload(); |
| 116 | - }).catch(()=>{ | 90 | + }).catch(() => { |
| 117 | location.reload(); | 91 | location.reload(); |
| 118 | }); | 92 | }); |
| 119 | } | 93 | } |
| ... | @@ -135,7 +109,7 @@ export default { | ... | @@ -135,7 +109,7 @@ export default { |
| 135 | type: "warning", | 109 | type: "warning", |
| 136 | }).then(() => { | 110 | }).then(() => { |
| 137 | this.$store.dispatch("LogOut").then(() => { | 111 | this.$store.dispatch("LogOut").then(() => { |
| 138 | - this.$router.push('/') | 112 | + window.location.href = this.settings.logoutURL |
| 139 | // window.location.href = "https://test.secure.fedex.com/logout";//wsso系统跳转 | 113 | // window.location.href = "https://test.secure.fedex.com/logout";//wsso系统跳转 |
| 140 | }); | 114 | }); |
| 141 | }); | 115 | }); |
| ... | @@ -213,16 +187,19 @@ export default { | ... | @@ -213,16 +187,19 @@ export default { |
| 213 | text-align: center; | 187 | text-align: center; |
| 214 | margin-right: 15px; | 188 | margin-right: 15px; |
| 215 | font-weight: 700; | 189 | font-weight: 700; |
| 216 | - i{ | 190 | + |
| 191 | + i { | ||
| 217 | display: inline-block; | 192 | display: inline-block; |
| 218 | height: 50px; | 193 | height: 50px; |
| 219 | - margin-right:5px; | 194 | + margin-right: 5px; |
| 220 | font-size: 24px; | 195 | font-size: 24px; |
| 221 | line-height: 50px; | 196 | line-height: 50px; |
| 222 | } | 197 | } |
| 198 | + | ||
| 223 | .userName-wrapper { | 199 | .userName-wrapper { |
| 224 | position: relative; | 200 | position: relative; |
| 225 | - font-size:14px; | 201 | + font-size: 14px; |
| 202 | + | ||
| 226 | .user-avatar { | 203 | .user-avatar { |
| 227 | cursor: pointer; | 204 | cursor: pointer; |
| 228 | width: 40px; | 205 | width: 40px; | ... | ... |
-
Please register or login to post a comment