XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复推流设备位置信息入库以及页面添加位置信息展示

Browse Source
This commit is contained in:
648540858
2024-10-23 14:25:14 +08:00
parent 9b81f8d70d
commit a316a12187
8 changed files with 86 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web_src/src/components/StreamPushList.vue
View File

@@ -46,7 +46,7 @@
</el-table-column>
<el-table-column prop="gbName" label="名称" min-width="200">
</el-table-column>
<el-table-column prop="app" label="应用名" min-width="200">
<el-table-column prop="app" label="应用名" min-width="100">
</el-table-column>
<el-table-column prop="stream" label="流ID" min-width="200">
</el-table-column>
@@ -58,6 +58,12 @@
</el-table-column>
<el-table-column prop="gbDeviceId" label="国标编码" min-width="200" >
</el-table-column>
<el-table-column label="位置信息" min-width="200">
<template slot-scope="scope">
<span size="medium" v-if="scope.row.gbLongitude && scope.row.gbLatitude">{{scope.row.gbLongitude}}<br/>{{scope.row.gbLatitude}}</span>
<span size="medium" v-if="!scope.row.gbLongitude || !scope.row.gbLatitude">无</span>
</template>
</el-table-column>
<el-table-column prop="mediaServerId" label="流媒体" min-width="200" >
</el-table-column>
<el-table-column label="开始时间" min-width="200">
@@ -181,6 +187,12 @@ export default {
if (res.data.code === 0) {
that.total = res.data.data.total;
that.pushList = res.data.data.list;
that.pushList.forEach(e => {
that.$set(e, "location", "");
if (e.gbLongitude && e.gbLatitude) {
that.$set(e, "location", e.gbLongitude + "," + e.gbLatitude);
}
});
}
}).catch(function (error) {

14
web_src/src/components/channelList.vue
View File

@@ -72,7 +72,11 @@
</el-table-column>
<el-table-column prop="manufacturer" label="厂家" min-width="100">
</el-table-column>
<el-table-column prop="location" label="位置信息" min-width="120">
<el-table-column label="位置信息" min-width="120">
<template slot-scope="scope">
<span size="medium" v-if="scope.row.longitude && scope.row.latitude">{{scope.row.longitude}}<br/>{{scope.row.latitude}}</span>
<span size="medium" v-if="!scope.row.longitude || !scope.row.latitude">无</span>
</template>
</el-table-column>
<el-table-column prop="ptzType" label="云台类型" min-width="100">
<template v-slot:default="scope">
@@ -275,10 +279,6 @@ export default {
that.deviceChannelList = res.data.data.list;
that.deviceChannelList.forEach(e => {
e.ptzType = e.ptzType + "";
that.$set(e, "location", "");
if (e.longitude && e.latitude) {
that.$set(e, "location", e.longitude + "," + e.latitude);
}
});
// 防止出现表格错位
that.$nextTick(() => {
@@ -429,10 +429,6 @@ export default {
this.deviceChannelList = res.data.data.list;
this.deviceChannelList.forEach(e => {
e.ptzType = e.ptzType + "";
this.$set(e, "location", "");
if (e.longitude && e.latitude) {
this.$set(e, "location", e.longitude + "," + e.latitude);
}
});
// 防止出现表格错位
this.$nextTick(() => {