From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index 8aa7b37..7c23a2f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -129,6 +129,21 @@
*/
private boolean mobilePositionSubscribe;
+ /**
+ * 鐐规挱鏈帹娴佺殑璁惧鏃舵槸鍚︿娇鐢╮edis閫氱煡鎷夎捣
+ */
+ private boolean startOfflinePush;
+
+ /**
+ * 鐩綍鍒嗙粍-姣忔鍚戜笂绾у彂閫侀�氶亾淇℃伅鏃跺崟涓寘鎼哄甫鐨勯�氶亾鏁伴噺锛屽彇鍊�1,2,4,8
+ */
+ private int catalogGroup;
+
+ /**
+ * 琛屾斂鍖哄垝
+ */
+ private String administrativeDivision;
+
public Integer getId() {
return id;
}
@@ -329,4 +344,28 @@
public void setMobilePositionSubscribe(boolean mobilePositionSubscribe) {
this.mobilePositionSubscribe = mobilePositionSubscribe;
}
+
+ public boolean isStartOfflinePush() {
+ return startOfflinePush;
+ }
+
+ public void setStartOfflinePush(boolean startOfflinePush) {
+ this.startOfflinePush = startOfflinePush;
+ }
+
+ public int getCatalogGroup() {
+ return catalogGroup;
+ }
+
+ public void setCatalogGroup(int catalogGroup) {
+ this.catalogGroup = catalogGroup;
+ }
+
+ public String getAdministrativeDivision() {
+ return administrativeDivision;
+ }
+
+ public void setAdministrativeDivision(String administrativeDivision) {
+ this.administrativeDivision = administrativeDivision;
+ }
}
--
Gitblit v1.8.0