样式优化

This commit is contained in:
BianLzhaoMin 2025-07-22 17:19:16 +08:00
parent c6c1224059
commit 42735cc9fe
3 changed files with 26 additions and 8 deletions

View File

@ -86,7 +86,7 @@ import AddOrEditMarkerForm from './modal-content/add-or-edit-marker-form.vue'
import FlvPlayer from '@/components/FlvPlayer/index.vue' import FlvPlayer from '@/components/FlvPlayer/index.vue'
const presetSettingVisible = ref(false) // const presetSettingVisible = ref(false) //
const addMarkerVisible = ref(false) // const addMarkerVisible = ref(true) //
const inspectionTaskVisible = ref(false) // const inspectionTaskVisible = ref(false) //
const addInspectionTaskVisible = ref(false) // const addInspectionTaskVisible = ref(false) //
const markerInfo = ref({}) // const markerInfo = ref({}) //

View File

@ -117,16 +117,25 @@
</n-grid> </n-grid>
</n-form> </n-form>
<n-flex justify="space-between" style="flex: 1; margin-top: 6px"> <!-- <n-flex justify="space-between" style="flex: 1; margin-top: 6px">
<div class="left-box" style="width: 49%"> <div class="left-box" style="width: 49%">
<!-- 放置video -->
<FlvPlayer :cameraNode="cameraNode" :videoId="`video-3`" /> <FlvPlayer :cameraNode="cameraNode" :videoId="`video-3`" />
</div> </div>
<div class="right-box" style="width: 46%"> <div class="right-box" style="width: 46%">
<!-- 放置操控面板 -->
<ControlDeck :deviceToken="deviceToken" :deviceInfo="deviceInfo" /> <ControlDeck :deviceToken="deviceToken" :deviceInfo="deviceInfo" />
</div> </div>
</n-flex> </n-flex> -->
<div class="video-container">
<div class="left-box" style="width: 49%">
<FlvPlayer :cameraNode="cameraNode" :videoId="`video-3`" />
</div>
<div class="right-box" style="width: 46%">
<ControlDeck :deviceToken="deviceToken" :deviceInfo="deviceInfo" />
</div>
</div>
</div> </div>
</DialogModal> </DialogModal>
</template> </template>
@ -397,11 +406,12 @@ onBeforeUnmount(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.add-or-edit-marker-form { .add-or-edit-marker-form {
// width: 100%; // width: 100%;
// padding: 0 10px; padding: 0 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh; height: 100%;
overflow: auto; overflow: auto;
// //
// //
&::-webkit-scrollbar { &::-webkit-scrollbar {
@ -418,5 +428,13 @@ onBeforeUnmount(() => {
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
background-color: #6e90a9; background-color: #6e90a9;
} }
.video-container {
margin-top: 12px;
flex: 1;
display: flex;
justify-content: space-between;
}
} }
</style> </style>

View File

@ -12,7 +12,7 @@
ref="planeMapContainer" ref="planeMapContainer"
:class="{ 'can-drag': canDrag() }" :class="{ 'can-drag': canDrag() }"
:style="{ height: INITIAL_HEIGHT + 'px' }" :style="{ height: INITIAL_HEIGHT + 'px' }"
style="min-height: 60vh" style="min-height: 70vh"
@mousemove="handleMouseMove" @mousemove="handleMouseMove"
> >
<svg <svg