From 7330da14ebef641113091fae80a14a86a32825a3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 11 Apr 2023 16:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E9=87=8D=E6=96=B0=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=9C=B0=E5=9B=BE,=E5=B9=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=97=A7=E6=A0=B7=E5=BC=8F=E7=9A=84=E5=9F=8B?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiDvRender.vue                         |  8 ++------
 packages/bigscreen/designer/components/Layout.vue | 12 +++++++++++-
 ui/packages/tools/AiMap.vue                       |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index eccf80c8..5a749dc3 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -111,10 +111,7 @@ export default {
   watch: {
     values: {
       immediate: true,
-      deep: true, handler(v) {
-        if (this.currentType == 'map') {
-          this.renderMap()
-        }
+      deep: true, handler() {
         if (this.currentType === 'AiDvTable') {
           this.dvTableConfig = this.data[this.data.dataType].map((v, i) => {
             return {
@@ -123,7 +120,6 @@ export default {
               align: this.data.config[i] ? (this.data.config[i].align || '') : ''
             }
           })
-
           this.data.config = this.dvTableConfig
         }
       }
@@ -168,7 +164,7 @@ export default {
     renderMap(count = 0) {
       let {lib: AMap, map} = this
       this.timer && clearInterval(this.timer)
-      if (AMap) {
+      if (AMap && map) {
         let infoWin = new AMap.InfoWindow({content: ""})
         map.clearMap()
         this.values.filter(e => e.lng).map(e => {
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index 85ff1039..51bb8c6f 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -146,6 +146,15 @@
                 </el-select>
               </div>
             </div>
+            <div class="layout-config__item">
+              <label>样式设置</label>
+              <div class="layout-config__item--right">
+                <el-select size="mini" v-model="dashboard.style" placeholder="请选择">
+                  <el-option label="默认" value="black"/>
+                  <el-option label="经典" value="classic"/>
+                </el-select>
+              </div>
+            </div>
             <div class="layout-config__item">
               <label>背景图</label>
               <div class="layout-config__item--right layout-config__item--bg">
@@ -261,7 +270,8 @@ export default {
         height: 1080,
         theme: '0',
         backgroundColor: '',
-        backgroundImage: []
+        backgroundImage: [],
+        style: 'black'
       },
       menuX: 0,
       menuY: 0,
diff --git a/ui/packages/tools/AiMap.vue b/ui/packages/tools/AiMap.vue
index fb5e2dc9..9636551e 100644
--- a/ui/packages/tools/AiMap.vue
+++ b/ui/packages/tools/AiMap.vue
@@ -72,7 +72,7 @@ export default {
           this.$emit("loaded")
           this.mapLoaded()
         }
-      })
+      }).catch(this.initMap)
     },
     getMapArea() {
       const {mapLib: AMap} = this