From de09ee0ec82c5b07bb5f79ce65a6d1466c1c9ecb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 02 Feb 2023 11:32:19 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

---
 src/components/map/index.vue |   59 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 1afd33e..99f2843 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -15,21 +15,38 @@
         <!-- 全屏控制按钮 -->
         <div class="screen-full-btn">
             <el-tooltip v-if="isFullscreen" content="缩放" placement="bottom" effect="dark">
-                <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
+                <i
+                    class="fa fa-compress"
+                    style="vertical-align: middle; cursor: pointer"
+                    @click="fullscreenchange"
+                ></i>
             </el-tooltip>
             <el-tooltip v-if="!isFullscreen" content="全屏" placement="bottom" effect="dark">
-                <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
+                <i
+                    class="fa fa-expand"
+                    style="vertical-align: middle; cursor: pointer"
+                    @click="fullscreenchange"
+                ></i>
             </el-tooltip>
         </div>
         <!-- 切换矢量图按钮 -->
-        <div style="display: none !important;" class="image-switch-icon-btn" title="切换影像" @mouseover="showImgBtn = true"
-            @mouseleave="showImgBtn = false">
+        <div
+            style="display: none !important;"
+            class="image-switch-icon-btn"
+            title="切换影像"
+            @mouseover="showImgBtn = true"
+            @mouseleave="showImgBtn = false"
+        >
             <div class="icon-box">
                 <img src="/img/base_map.png" alt />
             </div>
 
-            <div class="image-switch-img-btn" v-show="showImgBtn" @mouseover="showImgBtn = true"
-                @mouseleave="showImgBtn = false">
+            <div
+                class="image-switch-img-btn"
+                v-show="showImgBtn"
+                @mouseover="showImgBtn = true"
+                @mouseleave="showImgBtn = false"
+            >
                 <div class="img" @click="switchImg">
                     <span :class="{ on: imgtype == 0 }">影像</span>
                 </div>
@@ -139,23 +156,23 @@
             global.viewer.addLayer(tilesetLayer)
 
             // 加载围栏
-            let layer = new global.DC.VectorLayer('layer')
-            global.viewer.addLayer(layer)
+            // let layer = new global.DC.VectorLayer('layer')
+            // global.viewer.addLayer(layer)
 
-            let wall = new global.DC.Wall(
-                '116.018142,28.688089,100.0; 116.017756,28.684648,100.0; 116.019507,28.677570,100.0; 116.033653,28.675634,100.0; 116.034223,28.681389,100.0; 116.033483,28.687265,100.0; 116.018142,28.688089,100.0'
-            )
+            // let wall = new global.DC.Wall(
+            //     '116.018142,28.688089,100.0; 116.017756,28.684648,100.0; 116.019507,28.677570,100.0; 116.033653,28.675634,100.0; 116.034223,28.681389,100.0; 116.033483,28.687265,100.0; 116.018142,28.688089,100.0'
+            // )
 
-            wall.setStyle({
-                material: new global.DC.WallTrailMaterialProperty({
-                    color: global.DC.Namespace.Cesium.Color.fromBytes(
-                        33, 150, 243,
-                        200
-                    ),
-                    speed: 8
-                })
-            })
-            layer.addOverlay(wall)
+            // wall.setStyle({
+            //     material: new global.DC.WallTrailMaterialProperty({
+            //         color: global.DC.Namespace.Cesium.Color.fromBytes(
+            //             33, 150, 243,
+            //             200
+            //         ),
+            //         speed: 8
+            //     })
+            // })
+            // layer.addOverlay(wall)
 
 
 

--
Gitblit v1.9.3