From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue b/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue
index 2271e7d..a524faa 100644
--- a/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue
@@ -12,7 +12,16 @@
</div>
<div class="content">
- <component :is="currentComponent" />
+ <RealWarning
+ v-if="activeIdModel === 1"
+ :data="realWarningData"
+ :loading="realWarningLoading"
+ @signal="emit('real-warning-signal', $event)"
+ @counter="emit('real-warning-counter', $event)"
+ @favorite="emit('real-warning-favorite', $event)"
+ />
+ <EquipmentWarning v-else-if="activeIdModel === 2" />
+ <HistoryWarning v-else />
</div>
</div>
@@ -24,11 +33,11 @@
<script setup>
import TitleTemplate from './templateComponents/TitleTemplate.vue'
-import RealWarning from './RealWarning.vue'
import EquipmentWarning from './EquipmentWarning.vue'
import HistoryWarning from './HistoryWarning.vue'
import { alarmStatisticsApi } from '@/api/dataCockpit'
-import { onMounted } from 'vue'
+import { computed, onMounted, ref } from 'vue'
+import RealWarning from './RealWarning.vue'
const props = defineProps({
activeId: {
@@ -38,10 +47,24 @@
collapsed: {
type: Boolean,
default: false
+ },
+ realWarningData: {
+ type: Array,
+ default: () => []
+ },
+ realWarningLoading: {
+ type: Boolean,
+ default: false
}
})
-const emit = defineEmits(['update:activeId', 'update:collapsed'])
+const emit = defineEmits([
+ 'update:activeId',
+ 'update:collapsed',
+ 'real-warning-signal',
+ 'real-warning-counter',
+ 'real-warning-favorite'
+])
const activeIdModel = computed({
get: () => props.activeId,
@@ -73,10 +96,6 @@
component: HistoryWarning
}
])
-
-const currentComponent = computed(() => {
- return categoryList.value.find(i => i.id === activeIdModel.value)?.component
-})
const toggleCollapse = () => {
collapsedModel.value = !collapsedModel.value
@@ -113,7 +132,7 @@
.collapse-btn {
position: absolute;
- top: 50%;
+ bottom: 454px;
left: 300px;
cursor: pointer;
display: flex;
@@ -121,11 +140,11 @@
justify-content: center;
color: #fff;
z-index: 10;
- transform: translateY(-50%);
+ transform: translateY(50%);
.arrow {
- width: 32px;
- height: 32px;
+ width: 36px;
+ height: 36px;
background: url('@/assets/images/dataCockpit/left-btn.png') center / 100% 100% no-repeat;
}
@@ -195,7 +214,7 @@
.badge {
position: absolute;
top: 16px;
- right: 4px;
+ right: -4px;
min-width: 18px;
line-height: 18px;
font-size: 12px;
--
Gitblit v1.9.3