From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/layouts/TerminalLayout.vue | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/src/components/layouts/TerminalLayout.vue b/src/components/layouts/TerminalLayout.vue
index 01ef462..f334c74 100644
--- a/src/components/layouts/TerminalLayout.vue
+++ b/src/components/layouts/TerminalLayout.vue
@@ -2,17 +2,17 @@
<div class="full-screen-container">
<router-view class="router-view">
<template v-slot:function>
- <a-space>
- <button class="button" @click="handleLogout">鍒囨崲鐢ㄦ埛</button>
- <button class="button" @click="backToIndex">杩斿洖涓婚〉</button>
- <button class="button">璁剧疆</button>
+ <a-space class="common-button-container">
+ <a-button type="primary" @click="handleLogout" size="large">鍒囨崲鐢ㄦ埛</a-button>
+ <a-button @click="backToIndex" size="large">杩斿洖涓婚〉</a-button>
+ <!--<button class="button">璁剧疆</button>-->
</a-space>
</template>
</router-view>
<div class="footer" v-if="$route.path!=='/terminal/login'">
- <div>濮撳悕锛歿{nickname()}}</div>
- <div>褰撳墠鏃堕棿锛歿{currentDateAndTime}}</div>
+ <!--<div>濮撳悕锛歿{nickname()}}</div>-->
+ <div>{{currentDateAndTime}}</div>
</div>
</div>
</template>
@@ -26,7 +26,7 @@
name: 'TerminalLayout',
data() {
return {
- currentDateAndTime: null,
+ currentDateAndTime: moment().format('YYYY-MM-DD HH:mm:ss'),
getDateAndTimeInterval: null
}
},
@@ -90,37 +90,25 @@
display: flex;
flex-direction: column;
height: 100vh;
+ background-color: #fff;
.router-view {
flex: 1;
- padding: 24px;
+ padding: 1.25vw;
display: flex;
flex-direction: column;
}
}
- .button {
- font-weight: bold;
- padding: 15px 15px;
- border: 1px solid rgba(0, 0, 0, .2);
- border-radius: 5px;
- cursor: pointer;
- box-shadow: 6px 6px 16px rgba(0, 0, 0, 0.2),
- -6px -6px 16px rgba(255, 255, 255, 0.8),
- inset 0 0 0 transparent;
-
- &:hover {
- box-shadow: 0 0 0 transparent,
- inset 6px 6px 12px rgba(0, 0, 0, 0.2),
- inset -6px -6px 12px rgba(255, 255, 255, 0.8);
- }
+ .common-button-container {
+ margin-bottom: 1vw;
}
.footer {
- font-size: 16px;
- padding: 12px 24px;
+ font-size: 0.8vw;
+ padding: 0.5vw 0;
color: #000;
- display: flex;
- justify-content: space-between;
+ /*font-weight: bold;*/
+ text-align: center;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3