gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、调整dockerfile文件 2、调整锁屏模式 3、增加Startup执行顺序

Browse Source
This commit is contained in:
zuohuaijun 2024-10-13 17:45:52 +08:00
parent 4a4e5d7a79
commit 308d7bd34a
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin.NET/Admin.NET.Web.Core/Startup.cs
View File

@ -32,6 +32,7 @@ using System.Threading.Tasks;
namespace Admin.NET.Web.Core;
[AppStartup(int.MaxValue)]
public class Startup : AppStartup
{
public void ConfigureServices(IServiceCollection services)

4
Admin.NET/Admin.NET.Web.Entry/Dockerfile
View File

@ -8,8 +8,10 @@ COPY . .
ENV LANG zh-Hans
# 使用阿里云的镜像源进行更新
# .NET6使用
RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list
# .NET8使用
# RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list.d/debian.sources
# 更新包管理器并安装free命令
RUN apt-get update && apt-get install -y procps

BIN
Web/src/assets/lockscreen.img Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 KiB

18
Web/src/layout/lockScreen/index.vue
View File

@ -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;
}
@ -208,12 +208,11 @@ const onLockScreenSubmit = async () => {
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) {
@ -234,20 +233,21 @@ onMounted(() => {
initGetElement();
initSetTime();
initLockScreen();
//侦听ENTER按钮事件
// 侦听ENTER按钮事件
document.onkeydown = (e) => {
if (e.key === 'Enter') {
//当显示锁屏页时，按ENTER切到密码输入
// 当显示锁屏页时，按ENTER切到密码输入
if (state.isShowLoockLogin == false) {
const moveInterval = setInterval(() => {
state.isFlags = true;
state.moveDifference = state.moveDifference - 10;
onMove();
//超过600像素则结束
// 超过410像素则结束
if (state.moveDifference < -410 && moveInterval) clearInterval(moveInterval);
}, 5);
}
//当显示消息时，按ENTER切到密码输入
// 当显示消息时，按ENTER切到密码输入
if (state.showMessage == true) hideMessage();
}
};
@ -277,7 +277,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;
}
@ -417,7 +417,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);

8
Web/src/layout/navBars/topBar/user.vue
View File

@ -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>
@ -100,7 +101,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';
@ -162,6 +163,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,