From 39747a03ff43680995107831f99f79287830a372 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 03 Apr 2025 14:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/components/MachineRight/MachineStatus.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue b/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue
index 197277b..b952909 100644
--- a/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue
+++ b/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue
@@ -66,7 +66,7 @@
</div>
</div>
</div>
- <!-- <MachineTableDetails :dialogVisible="isShowDetails" /> -->
+ <MachineTableDetails v-model:show="isShowDetails"/>
</template>
<script setup>
@@ -75,6 +75,7 @@
import { EModeCode, EDockModeText, EModeText } from '@/utils/staticData/device';
import { getLnglatAltitude } from '@/utils/cesium/mapUtil.js';
import { useStore } from 'vuex';
+import MachineTableDetails from '@/views/SignMachineNest/components/MachineRight/MachineTableDetails/MachineTableDetails.vue';
const store = useStore();
// 获取机巢信息
@@ -269,7 +270,7 @@
);
opacity: 0.85;
margin: 2px 0 13 0;
-
+
padding: 8px 0px 20px 18px;
.info {
display: flex;
@@ -323,16 +324,16 @@
color: #FFB26A;
margin-right: 10px;
}
- .wb {
+ .wb {
width: 60px;
- height: 20px;
+ height: 20px;
background: rgba(255,106,106,0.2);
border-radius: 4px 4px 4px 4px;
border: 1px solid #FF6A6A;
color: #FF6A6A;
}
}
-
+
}
}
.status {
@@ -341,7 +342,7 @@
gap: 10px 20px;
margin-top: 18px;
.card {
- width: calc(33.33% - 14px);
+ width: calc(33.33% - 14px);
}
img {
width: 16px;
@@ -370,4 +371,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3