From 40f2cc4bdc91f63954c8b2bbd351bc650657affc Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 12 Nov 2024 14:25:15 +0800
Subject: [PATCH] 配置更改； 图层默认显示调整； 弹窗关闭相关调整；
---
src/components/global/publicBox.vue | 2 +-
src/pages/layout/components/scomponents/layersControl.vue | 15 +++++++++++----
vite.config.js | 6 +++---
src/pages/layout/components/mainTool.vue | 4 +++-
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/components/global/publicBox.vue b/src/components/global/publicBox.vue
index 1f8ca2f..2d77239 100644
--- a/src/components/global/publicBox.vue
+++ b/src/components/global/publicBox.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-29 13:33:11
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-10-29 19:58:45
+ * @LastEditTime: 2024-11-12 14:24:37
* @FilePath: \bigScreen\src\components\global\publicBox.vue
* @Description:
*
diff --git a/src/pages/layout/components/mainTool.vue b/src/pages/layout/components/mainTool.vue
index 61108a1..e971bd6 100644
--- a/src/pages/layout/components/mainTool.vue
+++ b/src/pages/layout/components/mainTool.vue
@@ -7,7 +7,7 @@
</div>
<base-map v-show="currentComponent == 'map'" @close="closeBox"></base-map>
- <layers-control v-show="currentComponent == 'layers'" @close="closeBox"></layers-control>
+ <layers-control :show="currentComponent == 'layers'" @close="closeBox"></layers-control>
<tool-list :moreToolShow="moreToolShow" @close="closeBox"></tool-list>
</template>
@@ -57,6 +57,8 @@
} else {
currentComponent.value = ''
}
+
+ console.log(type, currentComponent.value, 4444)
}
</script>
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 96eea44..84cc8a4 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -2,20 +2,20 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-31 10:47:29
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-12 13:29:29
+ * @LastEditTime: 2024-11-12 14:20:54
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
* Copyright (c) 2024 by shuishen, All Rights Reserved.
-->
<template>
- <public-box>
+ <public-box v-show="showLayerControl">
<template #name>
<div class="name"><i class="fa fa-tasks"></i> 图层</div>
</template>
<template #close>
- <div class="close" @click="$emit('close', 'layers')"><i class="fa fa-close"></i></div>
+ <div class="close cursor-p" @click="$emit('close', 'layers')"><i class="fa fa-close"></i></div>
</template>
<template #content>
@@ -49,6 +49,13 @@
</template>
<script setup>
+const {
+ show: showLayerControl
+} = defineProps({
+ show: {
+ default: false
+ }
+})
import panorama from './popup/panorama.vue'
import { getPage } from '@/api/indParkInfo'
import { getList } from "@/api/space/space"
@@ -302,7 +309,7 @@
) {
attrParams.url = attrParams.url.replace(
"http://vr.jxpskj.com:180",
- "/panorama/url"
+ "/panorama"
)
}
diff --git a/vite.config.js b/vite.config.js
index fb47a1e..3ec3704 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-25 10:56:27
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-11 17:48:23
+ * @LastEditTime: 2024-11-12 14:02:19
* @FilePath: \bigScreen\vite.config.js
* @Description:
*
@@ -85,11 +85,11 @@
// overlay:false
// },
proxy: {
- '/panorama/url': {
+ '/panorama': {
// target: 'http://localhost',
target: 'http://vr.jxpskj.com:180',
changeOrigin: true,
- rewrite: path => path.replace(/^\/panorama\/url/, ''),
+ rewrite: path => path.replace(/^\/panorama/, ''),
},
'/zhyq/mx': {
--
Gitblit v1.9.3