From ba8a936772e4e2c58dd515d64d7cb7d7817bbe88 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 28 十月 2023 18:50:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/views/dashboard/index.vue | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c2f2e8a..b927f26 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,8 @@
<template>
<DashboardLayout>
- <template #leftBlock1>浠诲姟绛涢�塼abs</template>
+ <template #leftBlock1>
+ <TaskTabs v-model="activeTaskTab" style="margin-top: 20px" :list="taskTabsTitle"></TaskTabs>
+ </template>
<template #leftBlock2>
<ChannelCollapse :channels="channels"></ChannelCollapse>
</template>
@@ -14,19 +16,26 @@
>浜哄憳淇℃伅
<PersonInfo :person="person"></PersonInfo>
</template>
- <template #rightBlock1>鏃堕棿</template>
+ <template #rightBlock1>
+ <div class="date-time">
+ <CurrentDateTime></CurrentDateTime>
+ </div>
+ </template>
<template #rightBlock2>鐘舵�侀潰鏉�</template>
<template #rightBlock3>鐭ヨ瘑搴�</template>
</DashboardLayout>
</template>
<script setup lang="ts">
import { getTaskList } from '@/api'
-import { computed, ref } from 'vue'
+import { computed, ref, watchEffect } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
import type { Task } from '@/api/task'
import { chain } from 'lodash-es'
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
import PersonInfo from '@/views/dashboard/components/PersonInfo.vue'
+import TaskTabs from '@/views/dashboard/components/TaskTabs.vue'
+import CurrentDateTime from '@/views/dashboard/components/CurrentDateTime.vue'
+
defineOptions({
name: 'DashboardView'
})
@@ -59,6 +68,20 @@
}
})
getChannels()
+const taskTabsTitle = ['鏈畬鎴�', '浠婃棩浠诲姟', '宸插畬鎴�']
+const activeTaskTab = ref('鏈畬鎴�')
+
+watchEffect(() => {
+ // console.log(activeTaskTab?.value, 111111)
+})
</script>
-<style scoped></style>
+<style scoped>
+.date-time {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding-top: 12px;
+}
+</style>
--
Gitblit v1.8.0