From ce8be993feda7a5d238944dc9abba4680f3db03c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 24 Dec 2021 17:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/designer/components/Layout.vue          | 1 +
 packages/bigscreen/designer/components/form/DataConfig.vue | 6 +++---
 packages/bigscreen/viewer/AppGigscreenViewer.vue           | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index 97f1c55d..60a9feb1 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -169,6 +169,7 @@
                   <el-select size="mini" v-model="currLayout.monitorType" placeholder="请选择" clearable>
                     <el-option label="中国移动" value="cmcc"></el-option>
                     <el-option label="海康威视" value="hik"></el-option>
+                    <el-option label="大华" value="dahua"></el-option>
                   </el-select>
                 </div>
               </div>
diff --git a/packages/bigscreen/designer/components/form/DataConfig.vue b/packages/bigscreen/designer/components/form/DataConfig.vue
index bf8210ed..8e04ad71 100644
--- a/packages/bigscreen/designer/components/form/DataConfig.vue
+++ b/packages/bigscreen/designer/components/form/DataConfig.vue
@@ -16,7 +16,7 @@
         </vue-json-editor>
       </div>
     </ai-dialog>
-    <div class="layout-config__group" v-if="options.monitorType !== 'hik'">
+    <div class="layout-config__group" v-if="options.monitorType !== 'hik' && options.monitorType !== 'dahua'">
       <h2>基础设置</h2>
       <div class="layout-config__item">
         <label>数据类型</label>
@@ -64,10 +64,10 @@
         </div>
       </template>
     </div>
-    <div class="layout-config__group" v-if="options.monitorType === 'hik'">
+    <div class="layout-config__group" v-if="options.monitorType === 'hik' || options.monitorType === 'dahua'">
       <h2>基础设置</h2>
       <div class="layout-config__item">
-        <label>视频ID</label>
+        <label>视频地址</label>
         <div class="layout-config__item--right">
           <el-input size="mini" v-model="options.src"></el-input>
         </div>
diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index fb177837..575aafea 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -82,7 +82,7 @@
                 if (item.dataType !== 'staticData' && ((item.type.indexOf('Chart') > -1) || item.type === 'table' || item.type === 'summary')) {
                   this.getSourceData(item, index)
                 }
-                if (item.type === 'monitor' && item.monitorType !== 'hik') {
+                if (item.type === 'monitor' && item.monitorType !== 'hik' && item.monitorType !== 'dahua') {
                   this.instance.post(`${this.urlPrefix}/appzyvideoequipment/getWebSdkUrl?deviceId=${item.moniterId}`).then(res => {
                     if (res.code == 0) {
                       this.$set(this.componentList[index], 'src', JSON.parse(res.data).url)