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/CatalogData.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
index c74fb87..338f8ad 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
@@ -4,10 +4,26 @@
import java.util.List;
public class CatalogData {
+ private int sn; // 鍛戒护搴忓垪鍙�
private int total;
private List<DeviceChannel> channelList;
private Date lastTime;
private Device device;
+ private String errorMsg;
+
+ public enum CatalogDataStatus{
+ ready, runIng, end
+ }
+ private CatalogDataStatus status;
+
+
+ public int getSn() {
+ return sn;
+ }
+
+ public void setSn(int sn) {
+ this.sn = sn;
+ }
public int getTotal() {
return total;
@@ -40,4 +56,20 @@
public void setDevice(Device device) {
this.device = device;
}
+
+ public String getErrorMsg() {
+ return errorMsg;
+ }
+
+ public void setErrorMsg(String errorMsg) {
+ this.errorMsg = errorMsg;
+ }
+
+ public CatalogDataStatus getStatus() {
+ return status;
+ }
+
+ public void setStatus(CatalogDataStatus status) {
+ this.status = status;
+ }
}
--
Gitblit v1.8.0