From 7430e479cdd84a729cc975aea5a9ccca805eab76 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 27 Mar 2025 13:36:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/components/CommonTitle.vue | 91 ++++++++++++++++++------------
src/views/Home/components/HomeRight/HomeRight.vue | 80 +++++++++++++++++++++++---
2 files changed, 123 insertions(+), 48 deletions(-)
diff --git a/src/components/CommonTitle.vue b/src/components/CommonTitle.vue
index 6dc1a5e..7ebdbc3 100644
--- a/src/components/CommonTitle.vue
+++ b/src/components/CommonTitle.vue
@@ -1,43 +1,60 @@
<template>
- <div class="overview-title">
- <div class="left">{{ title }}</div>
- <div class="right">详情 ></div>
+ <div class="overview-title">
+ <div class="left">
+ {{ title }}
</div>
+ <div class="right">详情 ></div>
+ </div>
</template>
<script setup>
- const props = defineProps({
- title: {
- type: String,
- default: '机巢概况'
- }
- })
+const props = defineProps({
+ title: {
+ type: String,
+ default: '机巢概况',
+ },
+});
</script>
<style scoped lang="scss">
- .overview-title {
- border: 1px solid red;
- height: hToV(42);
- background-image: url(@/assets/images/title-bg.png);
- background-repeat: no-repeat;
- display: flex;
- justify-content: space-between;
- margin-bottom: 18px;
- .left {
- margin-left: 66px;
- font-weight: 400;
- font-size: 20px;
- color: #FFFFFF;
- // line-height: 23px;
- text-shadow: 0px 0px 7px rgba(75,180,229,0.69), 0px 2px 8px rgba(5,28,55,0.42);
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
- .right {
- width: 42px;
- font-weight: 500;
- font-size: 14px;
- color: #0BE7F6;
- line-height: hToV(42);
- }
- }
-</style>
\ No newline at end of file
+.overview-title {
+ position: relative;
+ width: 404px;
+ height: hToV(43);
+ background-image: url(@/assets/images/title-bg.png);
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 18px;
+
+ .left {
+ position: absolute;
+ left: 49px;
+ bottom: hToV(16);
+ font-weight: 400;
+ font-size: 20px;
+ color: #ffffff;
+ text-shadow: 0px 0px 7px rgba(75, 180, 229, 0.69), 0px 2px 8px rgba(5, 28, 55, 0.42);
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ font-family: YouSheBiaoTiHei, YouSheBiaoTiHei, serif;
+ height: hToV(26);
+ line-height: hToV(23);
+ }
+
+ .right {
+ position: absolute;
+ font-weight: 500;
+ font-size: 14px;
+ color: #0be7f6;
+ height: hToV(21);
+ line-height: hToV(21);
+ font-family: Source Han Sans CN, Source Han Sans CN, serif;
+ text-align: right;
+ font-style: normal;
+ text-transform: none;
+ bottom: hToV(16);
+ right: 11px;
+ }
+}
+</style>
diff --git a/src/views/Home/components/HomeRight/HomeRight.vue b/src/views/Home/components/HomeRight/HomeRight.vue
index b7af16c..71cb391 100644
--- a/src/views/Home/components/HomeRight/HomeRight.vue
+++ b/src/views/Home/components/HomeRight/HomeRight.vue
@@ -1,17 +1,75 @@
<template>
- <div class="home-right-index">
- <div class="">
- 哒哒哒
- </div>
- </div>
+ <div class="home-right">
+ <CommonTitle title="协同" />
+ <div class="synergy"></div>
+
+ <CommonTitle title="协同" />
+ <div class="taskAchievements"></div>
+
+ <CommonTitle title="协同" />
+ <div class="eventOverview"></div>
+ </div>
</template>
-<script></script>
+<script>
+import { defineComponent } from 'vue';
+import CommonTitle from '@/components/CommonTitle.vue';
+
+export default defineComponent({
+ components: { CommonTitle },
+});
+</script>
<style scoped lang="scss">
-.home-right-index {
- position: absolute;
- top: 88px;
- right: 58px;
+.home-right {
+ position: absolute;
+ top: hToV(122);
+ right: 31px;
+ width: 404px;
+ height: 43px;
+
+ .titleBox {
+ width: 404px;
+ height: hToV(43);
+ }
+
+ .synergy {
+ width: 390px;
+ height: 108px;
+ background: linear-gradient(
+ 90deg,
+ #1f3e7a 0%,
+ rgba(31, 62, 122, 0.35) 79%,
+ rgba(31, 62, 122, 0) 100%
+ );
+ border-radius: 0px 0px 0px 0px;
+ opacity: 0.85;
+ }
+
+ .taskAchievements {
+ width: 390px;
+ height: hToV(204);
+ background: linear-gradient(
+ 90deg,
+ #1f3e7a 0%,
+ rgba(31, 62, 122, 0.35) 79%,
+ rgba(31, 62, 122, 0) 100%
+ );
+ border-radius: 0px 0px 0px 0px;
+ opacity: 0.85;
+ }
+
+ .eventOverview {
+ width: 390px;
+ height: hToV(445);
+ background: linear-gradient(
+ 90deg,
+ #1f3e7a 0%,
+ rgba(31, 62, 122, 0.35) 79%,
+ rgba(31, 62, 122, 0) 100%
+ );
+ border-radius: 0px 0px 0px 0px;
+ opacity: 0.85;
+ }
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3