From 14d77c9bb703abedaf182a4c69138c9eebd2ffcd Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 05 八月 2024 20:26:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/view/index.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 38dc5a4..41f2471 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -394,6 +394,7 @@
</span>
</el-dialog>
<notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
+ <timer></timer>
</div>
</template>
@@ -411,9 +412,10 @@
import menus from '../../static/js/menu.js'
import nullFace from '../view/404.vue'
import notice from './notice.vue'
+ import timer from './timer.vue';
comObj['nullFace'] = nullFace
export default {
- components: {...comObj,notice},
+ components: {...comObj,notice,timer},
data() {
return {
userName: "value",
--
Gitblit v1.9.3