kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大屏设计

Browse Source
This commit is contained in:
yanran200730
2021-12-24 17:42:43 +08:00
parent 4a7895b0e2
commit ce8be993fe
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/bigscreen/designer/components/Layout.vue
View File

@@ -169,6 +169,7 @@
<el-select size="mini" v-model="currLayout.monitorType" placeholder="请选择" clearable> <el-select size="mini" v-model="currLayout.monitorType" placeholder="请选择" clearable>
<el-option label="中国移动" value="cmcc"></el-option> <el-option label="中国移动" value="cmcc"></el-option>
<el-option label="海康威视" value="hik"></el-option> <el-option label="海康威视" value="hik"></el-option>
<el-option label="大华" value="dahua"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>

6
packages/bigscreen/designer/components/form/DataConfig.vue
View File

@@ -16,7 +16,7 @@
</vue-json-editor> </vue-json-editor>
</div> </div>
</ai-dialog> </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> <h2>基础设置</h2>
<div class="layout-config__item"> <div class="layout-config__item">
<label>数据类型</label> <label>数据类型</label>
@@ -64,10 +64,10 @@
</div> </div>
</template> </template>
</div> </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> <h2>基础设置</h2>
<div class="layout-config__item"> <div class="layout-config__item">
<label>视频ID</label> <label>视频地址</label>
<div class="layout-config__item--right"> <div class="layout-config__item--right">
<el-input size="mini" v-model="options.src"></el-input> <el-input size="mini" v-model="options.src"></el-input>
</div> </div>

2
packages/bigscreen/viewer/AppGigscreenViewer.vue
View File

@@ -82,7 +82,7 @@
if (item.dataType !== 'staticData' && ((item.type.indexOf('Chart') > -1) || item.type === 'table' || item.type === 'summary')) { if (item.dataType !== 'staticData' && ((item.type.indexOf('Chart') > -1) || item.type === 'table' || item.type === 'summary')) {
this.getSourceData(item, index) 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 => { this.instance.post(`${this.urlPrefix}/appzyvideoequipment/getWebSdkUrl?deviceId=${item.moniterId}`).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.$set(this.componentList[index], 'src', JSON.parse(res.data).url) this.$set(this.componentList[index], 'src', JSON.parse(res.data).url)