From 076cd08a4abcae33957e4de5b15babfcb6fed8ce Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 15:32:39 +0800
Subject: [PATCH] [viewer]解决合并冲突
---
src/components/index.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/components/index.vue b/src/components/index.vue
index 641ca3b..7506958 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -45,8 +45,6 @@
:show-tooltip="false"
@input="changeAlpha"
></el-slider> -->
-
- <lefttop ref="lefttop" />
<right ref="Right" />
<leftpanel ref="Left" />
<menupanel />
@@ -61,7 +59,6 @@
import viewer from "@/components/map/viewer";
import viewer1 from "@/components/map/viewer1";
// import left from "@/components/left/left";
-import lefttop from "@/components/left/lefttop";
import leftpanel from "@/components/left/index";
import right from "@/components/right/right";
// import bottom from "@/components/bottom/bottom";
@@ -82,7 +79,6 @@
leftpanel,
right,
// bottom,
- lefttop,
yqfk,
menupanel,
bottommenu,
--
Gitblit v1.9.3