From 5fae9a7b34cc096d6becc514f3dd6e6fa6606451 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 15 Jun 2022 10:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../vmp/service/impl/GbStreamServiceImpl.java | 3 +-
web_src/src/components/CloudRecord.vue | 16 +++--
web_src/src/components/DeviceList.vue | 41 ++++++-------
web_src/src/components/ParentPlatformList.vue | 32 +++++-----
web_src/src/components/PushVideoList.vue | 51 +++++++++-------
web_src/src/components/StreamProxyList.vue | 50 ++++++++-------
web_src/src/components/channelList.vue | 61 ++++++++-----------
7 files changed, 127 insertions(+), 127 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
index a7a55281..c813b115 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
@@ -106,7 +106,8 @@ public class GbStreamServiceImpl implements IGbStreamService {
deviceChannel.setStatus(1);
deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId);
deviceChannel.setRegisterWay(1);
- if (catalogId.length() <= 10) { // 父节点是行政区划,则设置CivilCode使用此行政区划
+ if (catalogId.length() > 0 && catalogId.length() <= 10) {
+ // 父节点是行政区划,则设置CivilCode使用此行政区划
deviceChannel.setCivilCode(catalogId);
}else {
deviceChannel.setCivilCode(platform.getAdministrativeDivision());
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index 1d0819b0..897e142b 100644
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -18,19 +18,17 @@
-
-
+
+
-
+
-
+
-
+
-
- 查看
-
-
+ 查看
+
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index d268b8a3..c9742745 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -7,34 +7,33 @@
@click="getDeviceList()">
-
-
+
-
+
-
+
{{ scope.row.hostAddress }}
-
+
-
+
-
+
-
+
-
+
在线
@@ -42,32 +41,32 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
+
- 刷新
- 通道
- 定位
- 编辑
+ 编辑
- 删除
+ 删除
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 20a3e823..3ae0b657 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -4,14 +4,15 @@
上级平台列表
-
-
-
-
+
+
+
+
已启用
@@ -19,7 +20,7 @@
-
+
在线
@@ -27,17 +28,17 @@
-
+
{{ scope.row.serverIP}}:{{scope.row.serverPort }}
-
-
-
-
+
+
+
+
@@ -48,11 +49,11 @@
-
+
- 编辑
- 选择通道
- 删除
+ 编辑
+ 选择通道
+ 删除
@@ -168,6 +169,9 @@ export default {
console.log(error);
});
+ },
+ refresh: function (){
+ this.initData();
}
}
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 7b5a406b..678d13f5 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -34,52 +34,54 @@
批量移除
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{{ dateFormat(parseInt(scope.row.createStamp)) }}
-
+
{{ (scope.row.status == false && scope.row.gbId == null) || scope.row.status ? '是' : '否' }}
-
+
-
- 播放
-
- 移除
- 加入国标
-
- 移出国标
-
-
+ 播放
+
+
+ 移除
+
+ 加入国标
+
+
+ 移出国标
+
@@ -284,6 +286,9 @@ export default {
handleSelectionChange: function (val) {
this.multipleSelection = val;
},
+ refresh: function () {
+ this.initData();
+ },
}
};
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index d5533927..9f7ed61e 100644
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -5,14 +5,15 @@
-
-
-
-
-
+
+
+
+
+
@@ -27,8 +28,8 @@
-
-
+
+
{{scope.row.type}}
@@ -36,8 +37,8 @@
-
-
+
+
在线
@@ -45,7 +46,7 @@
-
+
已启用
@@ -53,8 +54,8 @@
-
-
+
+
已启用
@@ -62,7 +63,7 @@
-
+
已启用
@@ -70,7 +71,7 @@
-
+
已启用
@@ -80,14 +81,15 @@
-
+
-
- 播放
- 停用
- 启用
- 删除
-
+ 播放
+
+ 停用
+
+ 启用
+
+ 删除
@@ -305,8 +307,10 @@
console.log(error);
that.getListLoading = false;
});
- }
-
+ },
+ refresh: function (){
+ this.initData();
+ }
}
};
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index f0888c1b..7828678a 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -2,10 +2,8 @@
-
+
-
+
-
+
+
+
+ :fit="'contain'"
+ style="width: 60px">
-
+
-
+
-
+
{{ scope.row.longitude }},
{{ scope.row.latitude }}
无
-
-
+
+
-
+
- 开启
- 关闭
+ 在线
+ 离线
-
+
- 播放
- 播放
+ 停止
- 查看
- 设备录像
+ 设备录像
-
@@ -130,17 +128,12 @@ export default {
total: 0,
beforeUrl: "/deviceList",
isLoging: false,
- autoList: true,
loadSnap: {}
};
},
mounted() {
this.initData();
- if (this.autoList) {
- this.updateLooper = setInterval(this.initData, 5000);
- }
-
},
destroyed() {
this.$destroy('videojs');
@@ -342,12 +335,8 @@ export default {
console.log(JSON.stringify(res));
});
},
- autoListChange: function () {
- if (this.autoList) {
- this.updateLooper = setInterval(this.initData, 1500);
- } else {
- window.clearInterval(this.updateLooper);
- }
+ refresh: function () {
+ this.initData();
}
}