From 65494b72a7272842a3c1c07fda8b2e1a9eefeac1 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 31 十月 2023 17:02:59 +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 | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 5597a04..e086940 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -18,9 +18,14 @@
<el-tab-pane label="鐗╂枡娓呭崟" name="鐗╂枡娓呭崟">Role</el-tab-pane>
</el-tabs>
</template>
- <template #middleBlock3> 浠诲姟璇︽儏 </template>
- <template #middleBlock4
- >浜哄憳淇℃伅
+ <template #middleBlock3>
+ <SubTitle>浠诲姟璇︽儏</SubTitle>
+ <div class="task-detail">
+ <TaskControl :task="activeTask"></TaskControl>
+ </div>
+ </template>
+ <template #middleBlock4>
+ <SubTitle>浜哄憳淇℃伅</SubTitle>
<PersonInfo :person="person"></PersonInfo>
</template>
<template #rightBlock1>
@@ -29,7 +34,9 @@
</div>
</template>
<template #rightBlock2>鐘舵�侀潰鏉�</template>
- <template #rightBlock3>鐭ヨ瘑搴�</template>
+ <template #rightBlock3>
+ <SubTitle>鐭ヨ瘑搴�</SubTitle>
+ </template>
</DashboardLayout>
</template>
<script setup lang="ts">
@@ -44,6 +51,8 @@
import { useTasksStore } from '@/stores/tasks'
import { storeToRefs } from 'pinia'
import ProcessingInfo from '@/views/dashboard/components/ProcessingInfo.vue'
+import TaskControl from '@/views/dashboard/components/TaskControl.vue'
+import SubTitle from '@/views/dashboard/components/SubTitle.vue'
defineOptions({
name: 'DashboardView'
--
Gitblit v1.8.0