Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

components/AiDvRender.vue

@@ -111,10 +111,7 @@ export default {
   watch: {
     values: {
       immediate: true,
-      deep: true, handler(v) {
+      deep: true, handler() {
-        if (this.currentType == 'map') {
-          this.renderMap()
-        }
         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 => {

packages/bigscreen/designer/components/Layout.vue

@@ -61,6 +61,7 @@
               }">
               <ai-dv-wrapper
                   style="height: 100%"
+                  :type="dashboard.style"
                   :title="$route.query.name"
                   :theme="dashboard.theme"
                   :background="dashboard.theme == 1 ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj_bg.png' : (dashboard.backgroundImage.length ? dashboard.backgroundImage[0].url : '')">
@@ -146,6 +147,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 +271,8 @@ export default {
         height: 1080,
         theme: '0',
         backgroundColor: '',
-        backgroundImage: []
+        backgroundImage: [],
+        style: 'black'
       },
       menuX: 0,
       menuY: 0,

ui/packages/tools/AiMap.vue

@@ -72,7 +72,7 @@ export default {
           this.$emit("loaded")
           this.mapLoaded()
         }
-      })
+      }).catch(this.initMap)
     },
     getMapArea() {
       const {mapLib: AMap} = this