Merge remote-tracking branch 'origin/dev' into dev

packages/bigscreen/designer/components/Layout.vue

@@ -403,7 +403,7 @@
           value: '0'
         }],
         images: [],
-        summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary5', 'summary7', 'summary9', 'summary10'],
+        summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10', 'summary11'],
         borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5']
       }
     },

packages/bigscreen/designer/components/RenderElement.vue

@@ -138,6 +138,7 @@
       <ai-map :markers="data[data.dataType]" v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId || user.info.areaId" map-style="amap://styles/e51987628aee5206d4c9ca8c6e98b4f7"/>
       <ai-monitor :src="data.src" v-else-if="data.type === 'monitor'" :type="data.monitorType"></ai-monitor>
       <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay v-else-if="data.type === 'video'"></video>
+      <AiDvPartyOrg style="width: 100%; height: 100%;" v-else-if="data.type === 'partyOrg'" :instance="instance"></AiDvPartyOrg>
     </ai-dv-panel>
   </div>
 </template>
@@ -155,7 +156,7 @@
   export default {
     name: 'RenderElement',
 
-    props: ['data', 'index', 'theme'],
+    props: ['data', 'index', 'theme', 'instance'],
 
     components: {
       AiSwiper
@@ -222,15 +223,6 @@
   .render-element {
     ::v-deep .dvScrollBoard1 {
 
-      .index {
-        color: #fff;
-        text-shadow: none;
-        background: transparent;
-        background-color: #BD4921!important;
-        -webkit-background-clip: inherit;
-        -webkit-text-fill-color: #fff;
-      }
-
       .header {
         background: rgba(0, 0, 0, 0.1)!important;
 
@@ -251,9 +243,19 @@
         background: linear-gradient(180deg, #FFF6C7 0%, #FF9A02 100%);
         -webkit-background-clip: text;
         -webkit-text-fill-color: transparent;
+
         & > div:nth-of-type(2n) {
           background: rgba(0, 0, 0, 0.1)!important;
         }
+
+        .index {
+          color: #fff;
+          text-shadow: none;
+          background: transparent;
+          background-color: #BD4921!important;
+          -webkit-background-clip: inherit;
+          -webkit-text-fill-color: #fff;
+        }
       }
     }
   }

packages/bigscreen/designer/config.js

@@ -543,6 +543,39 @@ const components = [
           }
         ]
       },
+      {
+        label: '党组织',
+        type: 'partyOrg',
+        list: [
+          {
+            type: 'partyOrg',
+            label: '党组织',
+            width: 840,
+            height: 800,
+            zIndex: 1,
+            top: 0,
+            left: 0,
+            dataX: '',
+            dataY: [],
+            title: '党组织',
+            border: 'border3',
+            sourceDataId: '',
+            dataType: 'staticData',
+            staticData: [
+              {
+                key: '个人服务办理',
+                value: 247
+              },
+              {
+                key: '同比上月',
+                value: 247
+              }
+            ],
+            dynamicData: [],
+            thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/total.png'
+          }
+        ]
+      },
       {
         label: '边框',
         type: 'panel',

packages/bigscreen/viewer/AppGigscreenViewer.vue

@@ -14,7 +14,7 @@
         }"
           v-for="(item, index) in componentList"
           :key="index">
-        <RenderElement :data="item" :index="index" :theme="dashboard.theme"></RenderElement>
+        <RenderElement :instance="instance" :data="item" :index="index" :theme="dashboard.theme"></RenderElement>
       </div>
     </div>
     <components v-else :is="component" :dict="dict" :instance="instance" :nav="meta"/>