From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
web_src/src/components/devicePosition.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/web_src/src/components/devicePosition.vue b/web_src/src/components/devicePosition.vue
index 16675c9..db19677 100644
--- a/web_src/src/components/devicePosition.vue
+++ b/web_src/src/components/devicePosition.vue
@@ -59,7 +59,7 @@
},
data() {
return {
- onOff: typeof window.mapParam !== "undefined",
+ onOff: typeof window.mapParam !== "undefined" && window.mapParam.enable,
deviceService: new DeviceService(),
layer: null,
lineLayer: null,
--
Gitblit v1.8.0