From 50631a3e36d9eb7e4b09cb830a3f8ef79f55f49f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 10 Nov 2022 14:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9B=BE=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=8C=87=E5=AE=9A=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E7=9A=84=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index 27a62690..d1325095 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -23,7 +23,7 @@
                  :data="values"
                  :ops="chartList[data.config]"/>
       <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"/>
+              :map-style="`amap://styles/${data.mapStyle}`" :pulseLines="data.pulseLines==1" :map.sync="map" :lib.sync="lib" :onlyShowArea="data.limitArea==1"/>
       <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'"/>
       <AiDvPartyOrg style="width: 100%; height: 100%;" v-else-if="data.type === 'partyOrg'" :instance="instance"/>
@@ -127,7 +127,7 @@ export default {
       if (AMap) {
         let infoWin = new AMap.InfoWindow({content: ""})
         map.clearMap()
-        let markers = this.values.filter(e => e.lng).map(e => {
+        this.values.filter(e => e.lng).map(e => {
           return new AMap.Marker({
             map,
             content: e.content || `<div class="marker ${this.data.alwaysShow ? 'showLabel' : ''}">
@@ -148,7 +148,6 @@ export default {
             }
           })
         })
-        map.setFitView(markers)
         this.data.is3d && map.setPitch(65)
         if (this.data.is3dAround == 1) {
           this.timer = setInterval(() => map?.setRotation(360, false, 16000))
diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue
index 0995917c..83be93ba 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.limitArea" :selectList="dict.getDict('yesOrNo')"/>
+            </div>
+          </div>
           <div class="layout-config__item">
             <label>显示标签</label>
             <div class="layout-config__item--right">
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 357afea8..5e47f2ad 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -540,7 +540,8 @@ const components = [
             ],
             api: '',
             thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/map.png',
-            is3dAround: '0'
+            is3dAround: '0',
+            limitArea: '0',
           }
         ]
       },