From cbec4308b61d0147cd60abfcbbb90db24c4a8e7f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 08 Apr 2025 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/TaskManage/TaskTop/TaskTop.vue |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/TaskManage/TaskLeft/TaskLeft.vue b/src/views/TaskManage/TaskTop/TaskTop.vue
similarity index 60%
rename from src/views/TaskManage/TaskLeft/TaskLeft.vue
rename to src/views/TaskManage/TaskTop/TaskTop.vue
index f0117c5..b3c7374 100644
--- a/src/views/TaskManage/TaskLeft/TaskLeft.vue
+++ b/src/views/TaskManage/TaskTop/TaskTop.vue
@@ -2,18 +2,23 @@
   <div class="task-left">
     <TaskTotal />
     <TaskIndustry />
+    <TaskTime />
+    <TaskEvent />
   </div>
 </template>
 
 <script setup>
 import TaskTotal from './TaskTotal.vue';
 import TaskIndustry from './TaskIndustry.vue';
+import TaskTime from './TaskTime.vue';
+import TaskEvent from './TaskEvent.vue';
 </script>
 
 <style lang="scss" scoped>
 .task-left {
-  // width: 300px;
   position: relative;
-  top: 20px;
+  display: flex;
+  justify-content: space-between;
+  margin: 40px;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.9.3