!1436 增加锁屏按钮并替换失效的锁屏图片close #IAUAH2

Merge pull request !1436 from KaneLeung/next

Web/src/layout/lockScreen/index.vue

@@ -196,7 +196,7 @@ const onLockScreenSubmit = async () => {
 			// 用户信息不存在时直接解锁（清理缓存后）
 			if (userInfos.account === void 0) {
 				themeConfig.value.isLockScreen = false;
-				themeConfig.value.lockScreenTime = 30;
+				themeConfig.value.lockScreenTime = 300;
 				setLocalThemeConfig();
 				return;
 			}
@@ -205,16 +205,14 @@ const onLockScreenSubmit = async () => {
 			const password = sm2.doEncrypt(state.lockScreenPassword, publicKey, 1);
 			const [err, res] = await feature(getAPI(SysAuthApi).apiSysAuthUnLockScreenPost(password));
 			if (err) {
-				console.log(err);
 				state.message = err.message;
 				state.showMessage = true;
 				state.lockScreenPassword = '';
-
 				return;
 			}
 			if (res.data.result) {
 				themeConfig.value.isLockScreen = false;
-				themeConfig.value.lockScreenTime = 30;
+				themeConfig.value.lockScreenTime = 300;
 				setLocalThemeConfig();
 			}
 		} catch (ex: any) {
@@ -244,8 +242,8 @@ onMounted(() => {
 					state.isFlags = true;
 					state.moveDifference = state.moveDifference - 10;
 					onMove();
-					//超过600像素则结束
-					if (state.moveDifference < -600) clearInterval(moveInterval);
+					//超过410像素则结束
+					if (state.moveDifference < -410) clearInterval(moveInterval);
 				}, 5);
 			}
 			//当显示消息时，按ENTER切到密码输入
@@ -278,7 +276,7 @@ onUnmounted(() => {
 }
 .layout-lock-screen-img {
 	@extend .layout-lock-screen-fixed;
-	background-image: url('https://i.hd-r.cn/e4a19d84364f185266666765ac21a5db.jpg');
+	background-image: url('/@/assets/lockscreen.img');
 	background-size: 100% 100%;
 	z-index: 9999991;
 }
@@ -418,7 +416,7 @@ onUnmounted(() => {
 	padding: 0px 15px;
 }
 :deep(.el-input__wrapper.is-focus) {
-	box-shadow: unset !important;
+	box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset !important;
 }
 :deep(.el-input__inner) {
 	border-right-color: var(--el-border-color-extra-light);

Web/src/layout/navBars/topBar/user.vue

@@ -75,6 +75,7 @@
 					<!-- <el-dropdown-item command="/dashboard/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item> -->
 					<el-dropdown-item :icon="Avatar" command="/system/userCenter">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
 					<el-dropdown-item :icon="Loading" command="clearCache">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
+					<el-dropdown-item :icon="Lock" divided command="lockScreen">{{ $t('message.layout.threeIsLockScreen') }}</el-dropdown-item>
 					<el-dropdown-item :icon="CircleCloseFilled" divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
@@ -98,7 +99,7 @@ import mittBus from '/@/utils/mitt';
 import { Local, Session } from '/@/utils/storage';
 import Push from 'push.js';
 import { signalR } from '/@/views/system/onlineUser/signalR';
-import { Avatar, CircleCloseFilled, Loading } from '@element-plus/icons-vue';
+import { Avatar, CircleCloseFilled, Loading, Lock } from '@element-plus/icons-vue';
 
 import { clearAccessTokens, getAPI } from '/@/utils/axios-utils';
 import { SysAuthApi, SysNoticeApi } from '/@/api-services/api';
@@ -158,6 +159,11 @@ const onHandleCommandClick = (path: string) => {
 		Local.clear();
 		Session.clear();
 		window.location.reload();
+	} else if (path === 'lockScreen') {
+		Local.remove('themeConfig');
+		themeConfig.value.isLockScreen = true;
+		themeConfig.value.lockScreenTime = 1;
+		Local.set('themeConfig', themeConfig.value);
 	} else if (path === 'logOut') {
 		ElMessageBox({
 			closeOnClickModal: false,