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 @@ + 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 @@ -
+

基础设置

@@ -64,10 +64,10 @@
-
+

基础设置

- +
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)