From 84167d13f951358315d13609de426ebb318a3c9a Mon Sep 17 00:00:00 2001
From: gerson <1405270578@qq.com>
Date: 星期日, 09 二月 2025 23:19:34 +0800
Subject: [PATCH] 面板样式调整
---
src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/Map.vue | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/Map.vue b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/Map.vue
index a7d0384..949e851 100644
--- a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/Map.vue
+++ b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/Map.vue
@@ -4,28 +4,40 @@
<BasicMap
ref="normalMapRef"
v-show="!isFullscreen"
+ :isFullscreen="false"
class="h-full"
:data="data"
@markerClick="markerClick"
@closeInfoWindow="closeInfoWindow"
+ @toggleFullScreen="toggleFullScreen"
+
/>
<!-- 鍏ㄥ睆鎸夐挳 -->
- <div class="absolute right-2 top-2 cursor-pointer" @click="toggleFullScreen">
+ <!-- <div class="absolute right-2 top-2 cursor-pointer" @click="toggleFullScreen">
<el-tooltip content="鍏ㄥ睆灞曞紑" placement="top">
- <div class="ywifont text-[20px] text-black rounded-lg ywicon-fullscreen"></div>
+ <div class="ywifont !text-[20px] text-black rounded-lg ywicon-fullscreen"></div>
</el-tooltip>
- </div>
+ </div> -->
<!-- Teleport 鍏ㄥ睆鍦板浘 -->
<Teleport to=".layout-parent">
<Transition name="fullscreen">
<div v-if="isRenderFullscreen" v-show="isFullscreen" class="absolute inset-0 z-50 w-full h-full">
- <BasicMap ref="fullScreenMapRef" :config="fullScreenMapConfig" class="h-full" :data="data" @markerClick="markerClick" @closeInfoWindow="closeInfoWindow" />
- <div class="absolute right-2 top-2 cursor-pointer" @click="toggleFullScreen">
+ <BasicMap
+ ref="fullScreenMapRef"
+ :config="fullScreenMapConfig"
+ :isFullscreen="true"
+ class="h-full"
+ :data="data"
+ @markerClick="markerClick"
+ @closeInfoWindow="closeInfoWindow"
+ @toggleFullScreen="toggleFullScreen"
+ />
+ <!-- <div class="absolute right-2 top-2 cursor-pointer" @click="toggleFullScreen">
<el-tooltip content="閫�鍑哄叏灞忥紙Esc锛�" placement="top">
- <div class="ywifont text-[20px] text-black rounded-lg ywicon-tuichuquanping"></div>
+ <div class="ywifont !text-[20px] text-black rounded-lg ywicon-tuichuquanping"></div>
</el-tooltip>
- </div>
+ </div> -->
<div class="absolute bottom-0 w-full">
<EquipCurve
v-model:isShow="chartDlgIsShow"
@@ -36,6 +48,7 @@
:tableHeight="240"
/>
</div>
+ <SmallChat class="absolute bottom-0 right-[50%] " :olMap="fullScreenOlMap" />
</div>
</Transition>
</Teleport>
@@ -44,17 +57,19 @@
<script setup lang="ts">
import 'ol/ol.css';
-import { nextTick, onDeactivated, onMounted, onUnmounted, ref } from 'vue';
+import { computed, nextTick, onDeactivated, onMounted, onUnmounted, ref } from 'vue';
import EquipCurve from '../components/EquipCurve.vue';
import BasicMap from './BasicMap.vue';
-import { useCompRef } from '/@/utils/types';
+import SmallChat from '/@/components/chat/smallChat/index.vue';
import { GaoDeSourceType } from '/@/model/map/OLMap';
+import { useCompRef } from '/@/utils/types';
const isRenderFullscreen = ref(false);
const isFullscreen = ref(false);
const props = defineProps(['data']);
const normalMapRef = useCompRef(BasicMap);
const fullScreenMapRef = useCompRef(BasicMap);
+const fullScreenOlMap = computed(() => fullScreenMapRef.value?.olMap);
const emit = defineEmits(['equipClick', 'closeInfoWindow']);
const markerClick = (row) => {
@@ -71,7 +86,6 @@
emit('closeInfoWindow');
}
};
-
const fullScreenMapConfig = ref({
sourceType: GaoDeSourceType.Vector,
@@ -121,6 +135,7 @@
onMounted(async () => {
// 娣诲姞 ESC 閿洃鍚�
document.addEventListener('keydown', handleEscKey);
+ toggleFullScreen();
});
onDeactivated(async () => {
--
Gitblit v1.9.3