From 9b178c3f200efa15fbfee7aa67d09177bca84d47 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 28 Mar 2025 17:09:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/Home/Home.vue | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue
index 9348361..efd6de6 100644
--- a/src/views/Home/Home.vue
+++ b/src/views/Home/Home.vue
@@ -1,27 +1,21 @@
-<script setup></script>
-
<template>
- <div class="left">10</div>
- <div class="right">20</div>
+ <HomeLeft></HomeLeft>
+ <!-- <div>中间搜索</div> -->
+ <HomeRight></HomeRight>
+
+ <SearchBox />
</template>
-<style scoped lang="scss">
-div {
- font-size: 20px;
-}
+<script setup>
+import HomeRight from './components/HomeRight/HomeRight.vue';
+import HomeLeft from '@/views/Home/components/HomeLeft/HomeLeft.vue';
+import { getAggregation } from '@/views/Home/aggregation';
+import SearchBox from '@/views/Home/SearchBox.vue';
-.left {
- left: 0;
- position: absolute;
- width: 300px;
- height: 100%;
- background: #2b373d;
-}
-.right{
- right: 0;
- position: absolute;
- width: 300px;
- height: 100%;
- background: #2b373d;
-}
-</style>
+onMounted(() => {
+ nextTick(() => {
+ getAggregation();
+ });
+});
+</script>
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3