From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/pages/page-web/projects/layer.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/pages/page-web/projects/layer.vue b/src/pages/page-web/projects/layer.vue
index eb10e53..eb7acf3 100644
--- a/src/pages/page-web/projects/layer.vue
+++ b/src/pages/page-web/projects/layer.vue
@@ -1,12 +1,13 @@
<template>
- <div class="project-layer-wrapper">
+ <div class="project-layer-wrapper height-100">
<div style="height: 50px; line-height: 50px; border-bottom: 1px solid #4f4f4f; font-weight: 450;">
<a-row>
<a-col :span="1"></a-col>
- <a-col :span="22">Annotations</a-col>
+ <a-col :span="22">标注</a-col>
<a-col :span="1"></a-col>
</a-row>
</div>
+ <div class="scrollbar" :style="{ height: scorllHeight + 'px'}">
<LayersTree
:layer-data="mapLayers"
class="project-layer-content"
@@ -15,8 +16,9 @@
v-model:selectedKeys="selectedKeys"
v-model:checkedKeys="checkedKeys"
/>
+ </div>
<a-drawer
- title="Map Element"
+ title="地图元素"
placement="right"
:closable="true"
v-model:visible="visible"
@@ -102,8 +104,7 @@
const root = getRoot()
const store = useMyStore()
-let useGMapCoverHook = useGMapCover(store)
-console.log('store', store)
+const useGMapCoverHook = useGMapCover(store)
const mapLayers = ref(store.state.Layers)
const checkedKeys = ref<string[]>([])
const selectedKeys = ref<string[]>([])
@@ -128,11 +129,12 @@
{ id: 5, name: 'RED', color: '#E23C39', selected: false },
{ id: 6, name: 'NAME_DEFAULT', color: '#212121', selected: false }
])
+const scorllHeight = ref()
async function getAllElement () {
getElementGroups('init')
setTimeout(() => {
- useGMapCoverHook = useGMapCover()
+ // useGMapCoverHook = useGMapCover()
initMapCover()
}, 1000)
}
@@ -245,7 +247,10 @@
}
}
onMounted(() => {
- getAllElement()
+ const element = document.getElementsByClassName('scrollbar').item(0) as HTMLDivElement
+ const parent = element?.parentNode as HTMLDivElement
+ scorllHeight.value = parent.clientHeight - parent.firstElementChild!.clientHeight
+ // getAllElement()
})
function closeDrawer () {
store.commit('SET_DRAW_VISIBLE_INFO', false)
@@ -439,4 +444,7 @@
margin-bottom: 10px;
}
}
+.scrollbar {
+ overflow: auto;
+}
</style>
--
Gitblit v1.9.3