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/left/layerTree/Layer.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/components/left/layerTree/Layer.vue b/src/components/left/layerTree/Layer.vue
index d133a86..db0c791 100644
--- a/src/components/left/layerTree/Layer.vue
+++ b/src/components/left/layerTree/Layer.vue
@@ -437,11 +437,13 @@
});
let that = this;
axios({
- method: "POST",
+ method: "GET",
+ // method: "POST",
+ // url: "/api/PM20221203225_OpenAPI3_Service-0.0.1-SNAPSHOT/biaoHui/list",
url: "http://10.10.4.121:8070/PM20221203225_OpenAPI3_Service-0.0.1-SNAPSHOT/biaoHui/list",
- data: {
- userId: this.$store.state.userId,
- },
+ // data: {
+ // userId: this.$store.state.userId,
+ // },
}).then(
(response) => {
setTimeout(() => {
@@ -1031,7 +1033,7 @@
color: #ffffff !important;
}
.historyBtn {
- margin-left: 28px;
+ margin-left: 10px;
}
.closeBtn {
color: white;
--
Gitblit v1.9.3