From b2b85d4f2d75d4d3864b0d2d8d25c5afba96b29d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 9 Nov 2022 18:00:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B3D=E6=97=8B=E8=BD=AC=E5=92=8C?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=89=A9=E6=A0=87=E7=AD=BE=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?/=E6=98=BE=E7=A4=BA=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiDvRender.vue                           | 13 +++++++++----
 .../designer/components/form/componentConfig.vue    | 12 ++++++++++++
 packages/bigscreen/designer/config.js               |  5 +++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index 567b48c2..27a62690 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -59,7 +59,8 @@ export default {
       // mods,
       chartList,
       map: null,
-      lib: null
+      lib: null,
+      timer: null
     }
   },
   computed: {
@@ -122,13 +123,14 @@ export default {
     },
     renderMap(count = 0) {
       let {lib: AMap, map} = this
+      this.timer && clearInterval(this.timer)
       if (AMap) {
         let infoWin = new AMap.InfoWindow({content: ""})
         map.clearMap()
         let markers = this.values.filter(e => e.lng).map(e => {
           return new AMap.Marker({
             map,
-            content: e.content || `<div class="marker">
+            content: e.content || `<div class="marker ${this.data.alwaysShow ? 'showLabel' : ''}">
                         <img src="${e.icon}"/>
                         <span>${e.label}</span>
                       </div>`,
@@ -147,7 +149,10 @@ export default {
           })
         })
         map.setFitView(markers)
-        this.data.is3d && map.setPitch(60)
+        this.data.is3d && map.setPitch(65)
+        if (this.data.is3dAround == 1) {
+          this.timer = setInterval(() => map?.setRotation(360, false, 16000))
+        }
       } else if (count < 10) {
         console.log("正在加载...%s", count)
         setTimeout(() => this.renderMap(++count), 1000)
@@ -220,7 +225,7 @@ export default {
       display: none;
     }
 
-    &:hover > span {
+    &:hover > span, &.showLabel > span {
       position: absolute;
       left: 50%;
       bottom: 0;
diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue
index 2898fa34..0995917c 100644
--- a/packages/bigscreen/designer/components/form/componentConfig.vue
+++ b/packages/bigscreen/designer/components/form/componentConfig.vue
@@ -101,6 +101,12 @@
               <AiAreaGet :instance="instance" :valueLevel="3" v-model="config.areaId" placeholder="地图展示的中心"/>
             </div>
           </div>
+          <div class="layout-config__item">
+            <label>显示标签</label>
+            <div class="layout-config__item--right">
+              <ai-select v-model="config.alwaysShow" :selectList="dict.getDict('yesOrNo')"/>
+            </div>
+          </div>
           <div class="layout-config__item">
             <label>展示光轨</label>
             <div class="layout-config__item--right">
@@ -119,6 +125,12 @@
               <ai-select v-model="config.is3d" :selectList="dict.getDict('yesOrNo')"/>
             </div>
           </div>
+          <div class="layout-config__item layout-config__item--input" v-if="config.is3d==1">
+            <label>3D环绕</label>
+            <div class="layout-config__item--right">
+              <ai-select v-model="config.is3dAround" :selectList="dict.getDict('yesOrNo')"/>
+            </div>
+          </div>
         </template>
         <div class="layout-config__item" v-if="config.type === 'summary'">
           <label>数据汇总</label>
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 907f6003..357afea8 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -533,13 +533,14 @@ const components = [
             dynamicData: [],
             staticData: [
               {
-                content: '中卫慧通',
+                label: '中卫慧通',
                 lng: 117.1339399,
                 lat: 36.7190487,
               }
             ],
             api: '',
-            thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/map.png'
+            thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/map.png',
+            is3dAround: '0'
           }
         ]
       },