diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue index 9e5f080e..6ba91195 100644 --- a/src/layout/components/ToolHeader.vue +++ b/src/layout/components/ToolHeader.vue @@ -52,7 +52,7 @@ export default defineComponent({ 'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between', 'dark:bg-[var(--el-bg-color)]' ]} - style="height:61px" + style="height:51px" > {layout.value !== 'top' ? (
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx index 927a369a..6358e243 100644 --- a/src/layout/components/useRenderLayout.tsx +++ b/src/layout/components/useRenderLayout.tsx @@ -55,7 +55,7 @@ export const useRenderLayout = () => { 'w-[var(--left-menu-max-width)]': !appStore.getCollapse } ]} - style="transition: all var(--transition-time-02);height:60px;display: flex; + style="transition: all var(--transition-time-02);height:50px;display: flex; align-items: center;" > ) : undefined} diff --git a/src/styles/var.css b/src/styles/var.css index ef44c1f7..d854bd1d 100644 --- a/src/styles/var.css +++ b/src/styles/var.css @@ -34,7 +34,7 @@ --top-header-hover-color: #215bd8; /* --top-tool-height: var(--logo-height); */ - --top-tool-height: 60px; + --top-tool-height: 50px; --top-tool-p-x: 0; diff --git a/src/views/mapPage/realTimeMap/components-tool/textFormToolDialog.vue b/src/views/mapPage/realTimeMap/components-tool/textFormToolDialog.vue index 61bfcbd2..00f2cd48 100644 --- a/src/views/mapPage/realTimeMap/components-tool/textFormToolDialog.vue +++ b/src/views/mapPage/realTimeMap/components-tool/textFormToolDialog.vue @@ -77,7 +77,7 @@ const emit = defineEmits(['textFormSuccess']) .text-form-dialog { background-color: #fff; position: absolute; - top: 76px; + top: 62px; left: 30%; box-shadow: rgba(0, 0, 0, 0.05) 0px 0px 0px 1px; padding: 18px 20px 0 20px; diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index 81aca361..e54cf667 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -1033,7 +1033,7 @@ onBeforeUnmount(() => { } .is-full-screen { - height: calc(100vh - 8.125rem) !important; + height: calc(100vh - 120px); overflow: auto; } } diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 1972ad89..3499f8c5 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -22,7 +22,7 @@ " @click="toolbarClick(item)" > - +
{{ item.name }}
@@ -75,6 +75,40 @@ + + + + + + + + + + + + + + - +
{{ item.name }}
@@ -136,7 +170,7 @@ " @click="toolbarClick(item)" > - +
{{ item.name }}
@@ -175,7 +209,7 @@ " @click="toolbarClick(item)" > - +
{{ item.name }}
@@ -230,7 +264,7 @@ " @click="toolbarClick(item)" > - +
{{ item.name }}
@@ -278,8 +312,38 @@ " @click="toolbarClick(item)" > - -
{{ item.name }}
+ + + + + + + + + + + + + + +
+ +
{{ item.name }}
+
@@ -308,11 +372,7 @@ ref="mapBackgroundRef" class="map-box-inner" @click="mapClick" - :class="state.isShowGrid ? 'grid-show' : ''" - :style="{ - width: imgBgObj.width + 'px', - height: imgBgObj.height + 'px' - }" + :style="gradientBackground" v-if="interfaceRefreshed" >