fix: 修复修改密码弹出框样式丢失的问题,以及点击logout按钮空白处不生效的问题
This commit is contained in:
@@ -3,13 +3,16 @@
|
|||||||
[v-cloak] {
|
[v-cloak] {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
* {
|
* {
|
||||||
font-family: NotoSansSChineseRegular, serif;
|
font-family: NotoSansSChineseRegular, serif;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
html, body, #app {
|
html, body, #app {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
min-width: 1024px;
|
min-width: 1024px;
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
@@ -17,11 +20,13 @@ body {
|
|||||||
cursor: default !important;
|
cursor: default !important;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 在计算文本实际宽度的逻辑中使用到的临时dom
|
// 在计算文本实际宽度的逻辑中使用到的临时dom
|
||||||
.temp-dom {
|
.temp-dom {
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
width: 1em;
|
width: 1em;
|
||||||
height: 1em;
|
height: 1em;
|
||||||
@@ -33,7 +38,7 @@ body {
|
|||||||
/* 淡入淡出动画 */
|
/* 淡入淡出动画 */
|
||||||
.fade-enter-active,
|
.fade-enter-active,
|
||||||
.fade-leave-active {
|
.fade-leave-active {
|
||||||
transition: opacity 0.4s ease;
|
transition: opacity 0.4s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fade-enter-from,
|
.fade-enter-from,
|
||||||
@@ -46,22 +51,24 @@ body {
|
|||||||
//min-width: 30px !important;
|
//min-width: 30px !important;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
background: #FFE7E6 !important;
|
background: #FFE7E6 !important;
|
||||||
border: 1px solid rgba(226,97,84,0.42) !important;
|
border: 1px solid rgba(226, 97, 84, 0.42) !important;
|
||||||
padding: 6.6px 12px !important;
|
padding: 6.6px 12px !important;
|
||||||
border-radius: 4px !important;
|
border-radius: 4px !important;
|
||||||
font-size: 14px !important;
|
font-size: 14px !important;
|
||||||
color: #F53A19 !important;
|
color: #F53A19 !important;
|
||||||
font-weight: 400 !important;
|
font-weight: 400 !important;
|
||||||
line-height: 1.2 !important;
|
line-height: 1.2 !important;
|
||||||
|
|
||||||
.el-popper__arrow {
|
.el-popper__arrow {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 表头单词换行不被拆开
|
// 表头单词换行不被拆开
|
||||||
.el-table th > .cell {
|
.el-table th > .cell {
|
||||||
word-break: keep-all !important;
|
word-break: keep-all !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 表格内容换行,不对中文生效,避免中文出现省略号
|
// 表格内容换行,不对中文生效,避免中文出现省略号
|
||||||
.el-table .cell {
|
.el-table .cell {
|
||||||
word-break: break-word !important;
|
word-break: break-word !important;
|
||||||
@@ -79,6 +86,67 @@ body {
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.upload-body{
|
.upload-body {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.change-pin-dialog {
|
||||||
|
.el-dialog__header {
|
||||||
|
padding: 20px 20px 10px 20px;
|
||||||
|
|
||||||
|
.el-dialog__headerbtn {
|
||||||
|
position: absolute;
|
||||||
|
top: 10px;
|
||||||
|
right: 4px;
|
||||||
|
padding: 0;
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
outline: none;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-dialog__body {
|
||||||
|
padding: 30px 20px;
|
||||||
|
|
||||||
|
.el-form-item {
|
||||||
|
display: block;
|
||||||
|
|
||||||
|
.el-input__wrapper {
|
||||||
|
height: 39px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-dialog__footer {
|
||||||
|
padding: 20px;
|
||||||
|
|
||||||
|
.dialog-footer {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
|
||||||
|
.el-button {
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button:nth-child(1) {
|
||||||
|
width: 80px;
|
||||||
|
height: 28px;
|
||||||
|
margin-right: 20px;
|
||||||
|
color: var(--el-text-color-primary);
|
||||||
|
background: var(--el-fill-color-light);
|
||||||
|
border: 1px solid var(--el-border-color-dark);
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button:nth-child(2) {
|
||||||
|
width: 80px;
|
||||||
|
height: 28px;
|
||||||
|
margin-left: 0 !important;
|
||||||
|
background-color: var(--el-color-business);
|
||||||
|
border-color: var(--el-color-business-dark-2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -29,11 +29,11 @@
|
|||||||
<div class='login-user header-menu__item'>{{ nickName }} <i class="cn-icon cn-icon-arrow-down"></i></div>
|
<div class='login-user header-menu__item'>{{ nickName }} <i class="cn-icon cn-icon-arrow-down"></i></div>
|
||||||
<template #dropdown>
|
<template #dropdown>
|
||||||
<el-dropdown-menu>
|
<el-dropdown-menu>
|
||||||
<el-dropdown-item>
|
<el-dropdown-item @click="showPinDialog">
|
||||||
<div id="header-to-changepin" @click="showPinDialog">{{ $t('overall.changePassword') }}</div>
|
<div id="header-to-changepin">{{ $t('overall.changePassword') }}</div>
|
||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
<el-dropdown-item>
|
<el-dropdown-item @click="logout">
|
||||||
<div id="header-to-logout" @click="logout">{{ $t('overall.logout') }}</div>
|
<div id="header-to-logout">{{ $t('overall.logout') }}</div>
|
||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
<!-- <el-dropdown-item>-->
|
<!-- <el-dropdown-item>-->
|
||||||
<!-- <div id="header-to-theme" @click="switchTheme">-->
|
<!-- <div id="header-to-theme" @click="switchTheme">-->
|
||||||
@@ -190,6 +190,7 @@
|
|||||||
|
|
||||||
<!-- 改密码 -->
|
<!-- 改密码 -->
|
||||||
<el-dialog v-model="showChangePin"
|
<el-dialog v-model="showChangePin"
|
||||||
|
class="change-pin-dialog"
|
||||||
width="30%"
|
width="30%"
|
||||||
:before-close="handleClose">
|
:before-close="handleClose">
|
||||||
<el-form :rules="changePassFormRules" :model="changePassForm" ref="changePassForm">
|
<el-form :rules="changePassFormRules" :model="changePassForm" ref="changePassForm">
|
||||||
@@ -526,7 +527,6 @@ export default {
|
|||||||
this.showChangePin = true
|
this.showChangePin = true
|
||||||
},
|
},
|
||||||
logout () {
|
logout () {
|
||||||
//
|
|
||||||
sessionStorage.removeItem(storageKey.tokenExpireCurrentPath)
|
sessionStorage.removeItem(storageKey.tokenExpireCurrentPath)
|
||||||
localStorage.removeItem(storageKey.token)
|
localStorage.removeItem(storageKey.token)
|
||||||
axios.get(api.logout)
|
axios.get(api.logout)
|
||||||
|
|||||||
Reference in New Issue
Block a user