Merge branch 'wvp-28181-2.0' into wvp-pro-record

This commit is contained in:
648540858
2022-02-25 20:33:38 +08:00
19 changed files with 142 additions and 82 deletions

View File

@@ -28,9 +28,7 @@
<devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
<!--设备列表-->
<el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
<el-table-column prop="channelId" label="通道编号" width="210">
</el-table-column>
<el-table-column prop="deviceId" label="设备编号" width="210">
<el-table-column prop="channelId" label="通道编号" width="200">
</el-table-column>
<el-table-column prop="name" label="通道名称">
</el-table-column>