From 022b16dbbe17acf56a0e84f994e7819da12b7c3c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 21 Oct 2024 12:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E9=81=93=E6=A0=91=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=A8=E7=BA=BF=E7=A6=BB=E7=BA=BF=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/gb28181/bean/GroupTree.java | 3 +++ .../com/genersoft/iot/vmp/gb28181/bean/RegionTree.java | 3 +++ .../iot/vmp/gb28181/dao/CommonGBChannelMapper.java | 2 ++ .../com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java | 3 ++- .../com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java | 1 + web_src/src/components/GBRecordDetail.vue | 8 +++++--- web_src/src/components/common/GroupTree.vue | 3 ++- web_src/src/components/common/RegionTree.vue | 3 ++- 8 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java index 8ac1278e..1f0f3658 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java @@ -19,4 +19,7 @@ public class GroupTree extends Group{ @Schema(description = "类型, 行政区划:0 摄像头: 1") private int type; + @Schema(description = "在线状态") + private String status; + } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java index b771a603..125bd3da 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java @@ -18,4 +18,7 @@ public class RegionTree extends Region { @Schema(description = "类型, 行政区划:0 摄像头: 1") private int type; + + @Schema(description = "在线状态") + private String status; } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java index 52213d64..50206786 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java @@ -267,6 +267,7 @@ public interface CommonGBChannelMapper { " coalesce(gb_device_id, device_id) as device_id," + " coalesce(gb_name, name) as name, " + " coalesce(gb_parent_id, parent_id) as parent_device_id, " + + " coalesce(gb_status, status) as status, " + " 1 as type, " + " true as is_leaf " + " from wvp_device_channel " + @@ -358,6 +359,7 @@ public interface CommonGBChannelMapper { " coalesce(gb_name, name) as name, " + " coalesce(gb_parent_id, parent_id) as parent_device_id, " + " coalesce(gb_business_group_id, business_group_id) as business_group, " + + " coalesce(gb_status, status) as status, " + " 1 as type, " + " true as is_leaf " + " from wvp_device_channel " + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java index 5fb64468..a2b8bc9d 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java @@ -69,7 +69,8 @@ public interface GroupMapper { " * , " + " concat('group', id) as tree_id," + " 0 as type," + - " false as is_leaf" + + " false as is_leaf," + + " 'ON' as status" + " from wvp_common_group " + " where 1=1 " + " and parent_id = #{parentId} " + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java index 42db7bbf..cc0ac795 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/RegionMapper.java @@ -74,6 +74,7 @@ public interface RegionMapper { " *, " + " concat('region', id) as tree_id," + " 0 as type," + + " 'ON' as status," + " false as is_leaf" + " from wvp_common_region " + " where " + diff --git a/web_src/src/components/GBRecordDetail.vue b/web_src/src/components/GBRecordDetail.vue index 37ec377f..4d58d7a8 100755 --- a/web_src/src/components/GBRecordDetail.vue +++ b/web_src/src/components/GBRecordDetail.vue @@ -30,13 +30,14 @@ -
+
@@ -136,10 +137,11 @@ overflow: "auto", margin: "10px auto 10px auto" }, - playerStyle: { + playerBoxStyle: { "margin": "0 auto 20px auto", "height": this.winHeight + "px", }, + playerHeight: this.winHeight, winHeight: window.innerHeight - 240, playTime: null, timeRange: null, @@ -179,7 +181,7 @@ }, mounted() { this.recordListStyle.height = this.winHeight + "px"; - this.playerStyle["height"] = this.winHeight + "px"; + this.playerBoxStyle["height"] = this.winHeight + "px"; this.chooseDate = moment().format('YYYY-MM-DD') this.dateChange(); window.addEventListener('beforeunload', this.stopPlayRecord) diff --git a/web_src/src/components/common/GroupTree.vue b/web_src/src/components/common/GroupTree.vue index 88a5945e..f86973ec 100755 --- a/web_src/src/components/common/GroupTree.vue +++ b/web_src/src/components/common/GroupTree.vue @@ -32,7 +32,8 @@ {{''}} - + + {{ node.label }}（编号：{{ node.data.deviceId }}） {{ node.label }} diff --git a/web_src/src/components/common/RegionTree.vue b/web_src/src/components/common/RegionTree.vue index 97fac821..2012e0c8 100755 --- a/web_src/src/components/common/RegionTree.vue +++ b/web_src/src/components/common/RegionTree.vue @@ -32,7 +32,8 @@ {{''}} - + + {{ node.label }}（编号：{{ node.data.deviceId }}） {{ node.label }}