From 776539a32b43a6f6af3101db96d7a91ceb80c5b5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 29 Jan 2024 10:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E5=8D=A0=E4=B8=AA=E5=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiDvRender.vue                     |  3 ++
 components/AiMonitorCarousel.vue              | 20 ++++++++
 .../designer/components/componentConfig.vue   |  2 +-
 .../designer/components/datasourcePicker.vue  | 24 +++++-----
 packages/bigscreen/designer/config.js         | 47 ++++++++++---------
 5 files changed, 62 insertions(+), 34 deletions(-)
 create mode 100644 components/AiMonitorCarousel.vue

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index 12e3cfd3..51be2251 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -55,6 +55,7 @@
         <div v-if="data.showPingchangMapLegend" class="pingchangMapLegend"/>
       </ai-map>
       <ai-monitor :src="data.src" v-else-if="currentType === 'monitor'" :type="data.monitorType"/>
+      <ai-monitor-carousel :list="data.list" v-else-if="currentType === 'monitorCarousel'"/>
       <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay
              v-else-if="currentType === 'video'"/>
       <AiDvPartyOrg style="width: 100%; height: 100%;" v-else-if="currentType === 'partyOrg'" :instance="instance"/>
@@ -77,6 +78,7 @@ import AiDvPanel from "./layout/AiDvPanel/AiDvPanel";
 import AiDvSummary from "./layout/AiDvSummary/AiDvSummary";
 import AiDvPlot from "./layout/AiDvPlot/AiDvPlot.vue";
 import AiAssist from "./AiAssist.vue";
+import AiMonitorCarousel from "./AiMonitorCarousel.vue";
 
 Vue.use(scrollBoard)
 
@@ -84,6 +86,7 @@ export default {
   name: 'AiDvRender',
   props: ['data', 'index', 'theme', 'instance'],
   components: {
+    AiMonitorCarousel,
     AiAssist,
     AiDvPlot,
     // AiSprite,
diff --git a/components/AiMonitorCarousel.vue b/components/AiMonitorCarousel.vue
new file mode 100644
index 00000000..b7e70526
--- /dev/null
+++ b/components/AiMonitorCarousel.vue
@@ -0,0 +1,20 @@
+<script>
+export default {
+  name: "AiMonitorCarousel",
+  props: {
+    list: {default: () => []}
+  }
+}
+</script>
+
+<template>
+  <section class="AiMonitorCarousel">
+    <el-carousel height="100%" indicator-position="none" arrow="hover">
+
+    </el-carousel>
+  </section>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/packages/bigscreen/designer/components/componentConfig.vue b/packages/bigscreen/designer/components/componentConfig.vue
index 894d2882..b84e2106 100644
--- a/packages/bigscreen/designer/components/componentConfig.vue
+++ b/packages/bigscreen/designer/components/componentConfig.vue
@@ -223,7 +223,7 @@
           <el-input size="mini" clearable placeholder="请输入弹窗标题" v-model="config.dialogTitle"/>
         </config-item>
         <config-item label="内容" v-if="!['table','AiDvTable'].includes(config.type)">
-          <ai-dialog-btn dialog-title="弹窗内容" text="打开编辑器">
+          <ai-dialog-btn dialog-title="弹窗内容" text="打开编辑器" :modal="false">
             <ai-editor clearable placeholder="请输入弹窗内容" v-model="config.dialogContent" :instance="instance"/>
           </ai-dialog-btn>
         </config-item>
diff --git a/packages/bigscreen/designer/components/datasourcePicker.vue b/packages/bigscreen/designer/components/datasourcePicker.vue
index 2ef72d9e..ca035e16 100644
--- a/packages/bigscreen/designer/components/datasourcePicker.vue
+++ b/packages/bigscreen/designer/components/datasourcePicker.vue
@@ -75,18 +75,20 @@ export default {
     },
     initStaticDataProps() {
       const columnProp = "name"
-      this.options.staticData.map((row, i) => {
-        const prop = `c${i || ""}`
-        this.colConfigs.push({label: row[columnProp], prop})
-        Object.entries(row).map(([k, v]) => {
-          if (/^v/.test(k)) {
-            const item = this.tableData[k.substring(1) || 0] || {}
-            item[prop] = v
-            this.tableData[k.substring(1) || 0] = item
-          }
+      if (Array.isArray(this.options.staticData)) {
+        this.options.staticData.map((row, i) => {
+          const prop = `c${i || ""}`
+          this.colConfigs.push({label: row[columnProp], prop})
+          Object.entries(row).map(([k, v]) => {
+            if (/^v/.test(k)) {
+              const item = this.tableData[k.substring(1) || 0] || {}
+              item[prop] = v
+              this.tableData[k.substring(1) || 0] = item
+            }
+          })
         })
-      })
-      this.tableData = this.tableData.map(e => ({...e, $cellEdit: false}))
+        this.tableData = this.tableData.map(e => ({...e, $cellEdit: false}))
+      }
     }
   },
   created() {
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 4e295d8e..610d69e7 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -517,7 +517,7 @@ const components = [{
     ]
   },
   {
-    type: 'other', label: '其他', list: [{
+    label: '其他', list: [{
       label: '地图', type: 'map', list: [{
         type: 'map',
         label: '地图',
@@ -621,7 +621,7 @@ const components = [{
         }]
       }]
     }, {
-      label: '轮播图', type: 'swiper', list: [{
+      label: '轮播图', list: [{
         type: 'swiper',
         label: '轮播图',
         width: 400,
@@ -692,26 +692,29 @@ const components = [{
         thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/total.png'
       }]
     }, {
-      label: '视频监控', type: 'monitor', list: [{
-        type: 'monitor',
-        label: '视频监控',
-        src: '',
-        width: 480,
-        height: 240,
-        zIndex: 1,
-        top: 0,
-        left: 0,
-        title: '',
-        moniterId: '',
-        monitorType: 'cmcc',
-        api: '/app/appzyvideoequipment/list2',
-        border: 'border2',
-        sourceDataId: '',
-        dataType: 'staticData',
-        staticData: '',
-        dynamicData: '',
-        thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/video.png'
-      }]
+      label: '视频监控', list: [
+        {
+          type: 'monitor',
+          label: '视频监控',
+          src: '',
+          width: 480,
+          height: 240,
+          zIndex: 1,
+          top: 0,
+          left: 0,
+          title: '',
+          moniterId: '',
+          monitorType: 'cmcc',
+          api: '/app/appzyvideoequipment/list2',
+          border: 'border2',
+          sourceDataId: '',
+          dataType: 'staticData',
+          staticData: '',
+          dynamicData: '',
+          thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/video.png'
+        },
+        {type: "monitorCarousel", label: "视频轮播", width: 480, height: 480, zIndex: 1, title: "视频轮播", thumb: "https://cdn.cunwuyun.cn/dvcp/dv/tpl/video.png"}
+      ]
     }, customHtml]
   }]