样式优化
This commit is contained in:
parent
c6c1224059
commit
42735cc9fe
|
|
@ -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({}) // 新增预置点位信息
|
||||||
|
|
|
||||||
|
|
@ -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>
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue