From baa9153168df800fa567b66a94e3969ce9bef1f9 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 07 Jan 2022 10:31:17 +0800
Subject: [PATCH] 冲突

---
 src/components/map/index.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index b2b0db8..5c636e6 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -159,15 +159,15 @@
 
             that.$refs.leftNav.initialize(viewer)
 
-            const key = '0f7c1d161d7352116a21aacf0e9f44c1'
-            const vec = that.DC.ImageryLayerFactory.createTdtImageryLayer({
-                key
-            })
-            const cva = that.DC.ImageryLayerFactory.createTdtImageryLayer({
-                key,
-                style: 'cva'
-            })
-            viewer.addBaseLayer([vec, cva])
+            // const key = '0f7c1d161d7352116a21aacf0e9f44c1'
+            // const vec = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+            //     key
+            // })
+            // const cva = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+            //     key,
+            //     style: 'cva'
+            // })
+            // viewer.addBaseLayer([vec, cva])
 
             // const areaLayer = new that.DC.VectorLayer('areaLayer')
 

--
Gitblit v1.9.3