From 35498105ec707133a982b66b68abcbcc9f7ae40f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 9 Nov 2022 16:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8F=90=E4=BE=9B3D=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiDvRender.vue                                   | 3 ++-
 .../bigscreen/designer/components/form/componentConfig.vue  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index 274fefbc..b5f3d5c8 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -22,7 +22,7 @@
                  :theme="theme"
                  :data="values"
                  :ops="chartList[data.config]"/>
-      <ai-map v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId || user.info.areaId"
+      <ai-map v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId || user.info.areaId" :is3d="data.is3d==1"
               :map-style="`amap://styles/${data.mapStyle}`" :pulseLines="data.pulseLines==1" :map.sync="map" :lib.sync="lib"/>
       <ai-monitor :src="data.src" v-else-if="data.type === 'monitor'" :type="data.monitorType"/>
       <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay v-else-if="data.type === 'video'"/>
@@ -147,6 +147,7 @@ export default {
           })
         })
         map.setFitView(markers)
+        this.data.is3d && map.setPitch(60)
       } else if (count < 10) {
         console.log("正在加载...%s", count)
         setTimeout(() => this.renderMap(++count), 1000)
diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue
index d6d34a7e..2898fa34 100644
--- a/packages/bigscreen/designer/components/form/componentConfig.vue
+++ b/packages/bigscreen/designer/components/form/componentConfig.vue
@@ -113,6 +113,12 @@
               <el-input size="mini" v-model="config.mapStyle" clearable placeholder="请输入地图样式ID,从UI处获取.."/>
             </div>
           </div>
+          <div class="layout-config__item layout-config__item--input">
+            <label>3D地图</label>
+            <div class="layout-config__item--right">
+              <ai-select v-model="config.is3d" :selectList="dict.getDict('yesOrNo')"/>
+            </div>
+          </div>
         </template>
         <div class="layout-config__item" v-if="config.type === 'summary'">
           <label>数据汇总</label>