+ 建议的类型：
+
+ 行政区划（可选2位/4位/6位/8位/10位数字，例如：130432，表示河北省邯郸市广平县） +
+ 业务分组（第11、12、13位215，例如：34020000002150000001） +
+ 虚拟组织（第11、12、13位216，例如：34020000002160000001） +
+ + 行政区划（可选2位/4位/6位/8位/10位数字，例如：130432，表示河北省邯郸市广平县） +
+ 业务分组（第11、12、13位215，例如：34020000002150000001） +
+ 虚拟组织（第11、12、13位216，例如：34020000002160000001） +
设备列表
-
-
-
-
-
diff --git a/web_src/src/components/MediaServerManger.vue b/web_src/src/components/MediaServerManger.vue
index c412bcb9..2e3eeeff 100644
--- a/web_src/src/components/MediaServerManger.vue
+++ b/web_src/src/components/MediaServerManger.vue
@@ -1,45 +1,38 @@
-
- 云端录像
-
-
-
-
- 节点选择:
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 云端录像
+
+ 节点选择:
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 节点列表
-
-
- 添加节点
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index 9ecb9330..d5533927 100644
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -1,115 +1,108 @@
-
+
- 节点列表
+
+ 添加节点
+
+
- {{item.id}}
- 编辑
- 查看
- 移除
-
-
-
- 默认
-
- {{item.ip}}
- {{item.createTime}}
-
-
+ {{item.id}}
+ 编辑
+ 查看
+ 移除
+
+
+
+ 默认
+
+ {{item.ip}}
+ {{item.createTime}}
+
+
-
-
-
-
-
-
-
-
- 拉流代理列表
-
-
- 添加代理
- 搜索ONVIF
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 播放
- 停用
- 启用
- 删除
-
-
-
-
-
-
-
+
+
+ 播放
+ 停用
+ 启用
+ 删除
+
+
+
+
+
+
+
@@ -117,7 +110,7 @@
import streamProxyEdit from './dialog/StreamProxyEdit.vue'
import onvifEdit from './dialog/onvifEdit.vue'
import devicePlayer from './dialog/devicePlayer.vue'
- import uiHeader from './UiHeader.vue'
+ import uiHeader from '../layout/UiHeader.vue'
export default {
name: 'streamProxyList',
components: {
diff --git a/web_src/src/components/UiHeader.vue b/web_src/src/components/UiHeader.vue
deleted file mode 100644
index 828dda97..00000000
--- a/web_src/src/components/UiHeader.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
+
+
+
+
-
-
-
+
+
+ {{scope.row.url}}
+
+
+
+ {{scope.row.src_url}}
+
+
+
+
+
+
+ 拉流代理列表
+
+ 添加代理
+ 搜索ONVIF
+
+
-
-
- {{scope.row.url}}
-
-
-
- {{scope.row.src_url}}
-
-
-
-
- {{scope.row.type}}
-
-
-
+ {{scope.row.type}}
+
+
+
- 在线
- 离线
-
-
-
- 已启用
- 未启用
-
-
-
- 已启用
- 未启用
-
-
-
- 已启用
- 未启用
-
-
-
- 已启用
- 未启用
-
-
-
+ 在线
+ 离线
+
+
+
+ 已启用
+ 未启用
+
+
+
+ 已启用
+ 未启用
+
+
+
+ 已启用
+ 未启用
+
+
+
+ 已启用
+ 未启用
+
+
+
-
- 控制台
- 实时监控
- 国标设备
- 推流列表
- 拉流代理
- 云端录像
- 节点管理
- 国标级联
- 在线文档
-
-
-
-
-
-
-
- 欢迎，{{this.$cookies.get("session").username}}
- 修改密码
- 注销
-
-
-
-
-
-
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 6eae383d..59a6f740 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -1,393 +1,406 @@
-
-
-
-
-
-
+
+
+
+ 播放
+ 停止
+
+ 查看
+
+ 设备录象
+
+
+
+
+
+
+
+
+
diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue
index 742b0917..a0b2834f 100644
--- a/web_src/src/components/control.vue
+++ b/web_src/src/components/control.vue
@@ -1,584 +1,702 @@
-
- 通道列表({{parentChannelId ==0 ? deviceId:parentChannelId}})
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.longitude }},{{ scope.row.latitude }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 播放
- 停止
- 查看
- 设备录象
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.longitude}},{{scope.row.latitude}}
-
-
-
-
-
-
-
-
-
-
-
+ 通道类型:
+
+
+ 在线状态:
+
+
+
+ 自动刷新
+
+
+
+ 通道列表({{ parentChannelId == 0 ? deviceId : parentChannelId }})
-
-
- 返回
- 搜索:
+
+
+
+ 返回
+
+ 搜索:
+
-
- 在线状态:
-
- 自动刷新
-
-
- 开启
- 关闭
-
-
-
+ 开启
+ 关闭
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
index 05bb1ae6..356bc337 100644
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -1,5 +1,6 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
+import Layout from "../layout/index.vue"
import control from '../components/control.vue'
import deviceList from '../components/DeviceList.vue'
@@ -32,78 +33,86 @@ export default new VueRouter({
routes: [
{
path: '/',
- component: control,
- },
- {
- path: '/live',
- component: live,
- },
- {
- path: '/deviceList',
- component: deviceList,
- },
- {
- path: '/pushVideoList',
- component: pushVideoList,
- },
- {
- path: '/streamProxyList',
- component: streamProxyList,
+ name: 'home',
+ component: Layout,
+ redirect: '/control',
+ children: [
+ {
+ path: '/control',
+ component: control,
+ },
+ {
+ path: '/live',
+ component: live,
+ },
+ {
+ path: '/deviceList',
+ component: deviceList,
+ },
+ {
+ path: '/pushVideoList',
+ component: pushVideoList,
+ },
+ {
+ path: '/streamProxyList',
+ component: streamProxyList,
+ },
+ {
+ path: '/channelList/:deviceId/:parentChannelId/:count/:page',
+ name: 'channelList',
+ component: channelList,
+ },
+ {
+ path: '/parentPlatformList/:count/:page',
+ name: 'parentPlatformList',
+ component: parentPlatformList,
+ },
+ {
+ path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
+ name: 'devicePosition',
+ component: devicePosition,
+ },
+ {
+ path: '/cloudRecord',
+ name: 'cloudRecord',
+ component: cloudRecord,
+ },
+ {
+ path: '/mediaServerManger',
+ name: 'mediaServerManger',
+ component: mediaServerManger,
+ },
+ {
+ path: '/setting/web',
+ name: 'web',
+ component: web,
+ },
+ {
+ path: '/setting/sip',
+ name: 'sip',
+ component: sip,
+ },
+ {
+ path: '/setting/media',
+ name: 'media',
+ component: media,
+ },
+ {
+ path: '/play/wasm/:url',
+ name: 'wasmPlayer',
+ component: wasmPlayer,
+ },
+ {
+ path: '/play/rtc/:url',
+ name: 'rtcPlayer',
+ component: rtcPlayer,
+ },
+ ]
},
{
path: '/login',
name: '登录',
component: login,
},
- {
- path: '/channelList/:deviceId/:parentChannelId/:count/:page',
- name: 'channelList',
- component: channelList,
- },
- {
- path: '/parentPlatformList/:count/:page',
- name: 'parentPlatformList',
- component: parentPlatformList,
- },
- {
- path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
- name: 'devicePosition',
- component: devicePosition,
- },
- {
- path: '/cloudRecord',
- name: 'cloudRecord',
- component: cloudRecord,
- },
- {
- path: '/mediaServerManger',
- name: 'mediaServerManger',
- component: mediaServerManger,
- },
- {
- path: '/setting/web',
- name: 'web',
- component: web,
- },
- {
- path: '/setting/sip',
- name: 'sip',
- component: sip,
- },
- {
- path: '/setting/media',
- name: 'media',
- component: media,
- },
- {
- path: '/play/wasm/:url',
- name: 'wasmPlayer',
- component: wasmPlayer,
- },
- {
- path: '/play/rtc/:url',
- name: 'rtcPlayer',
- component: rtcPlayer,
- },
]
})
From 5d8f68ede7e6233aec1e0258af38f49b40cf9ee8 Mon Sep 17 00:00:00 2001
From: xiaoxie
Date: Thu, 21 Apr 2022 12:39:09 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E9=80=9A=E9=81=93=E9=A1=B5=E9=80=82?=
=?UTF-8?q?=E9=85=8D=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web_src/src/components/channelList.vue | 164 ++++++++++++-------------
1 file changed, 81 insertions(+), 83 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 59a6f740..34f540df 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -1,15 +1,12 @@
-
- 控制台
-
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
diff --git a/web_src/src/components/devicePosition.vue b/web_src/src/components/devicePosition.vue
index 777b11ed..0ffd5fa3 100644
--- a/web_src/src/components/devicePosition.vue
+++ b/web_src/src/components/devicePosition.vue
@@ -1,43 +1,35 @@
- 节点选择:
-
-
-
- {{loadCount}}
-
-
-
- 媒体服务器配置
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{key}}
-
-
-
- {{ getMediaKeyNameFromKey(key1) }}
-
- {{ value1 }}
-
-
-
-
-
-
-
-
- {{ getNameFromKey(key) }}
-
- {{ value }}
-
-
+ 信令服务器配置
+
+ 重启媒体服务器
+
+
+
+
+
-
-
-
-
-
-
-
-
- 移除
-
-
-
+
+ 控制台
+
+ 节点选择:
+
+
+
+
+ {{ loadCount }}
+
+
+
+ 媒体服务器配置
+
+
+
-
+
+
+ {{ key }}
+
+
+
+ {{ getMediaKeyNameFromKey(key1) }}
+
+ {{ value1 }}
+
+
+
+
+
+
+
+
+ {{ getNameFromKey(key) }}
+
+ {{ value }}
+
+
- 信令服务器配置
-
- 重启媒体服务器
-
+
+
-
-
-
-
- {{ getNameFromKey(key) }}
-
-
-
-
+
-
+
+
+
+
+ {{ getNameFromKey(key) }}
+
+
+ {{ value }}
+
+
+
+
+
+
查看
-
- {{value}}
-
-
-
-
-
+
- 已启用
-
-
- 未启用
-
-
- {{ value }}
-
-
+
-
-
-
+ 已启用
+
+
+ 未启用
+
+
+ {{ value }}
+
+
-
-
-
-
- {{ getNameFromKey(key) }}
-
- {{ value }}
-
-
-
-
-
- table1
- table2
-
+
+
+
+
+ {{ getNameFromKey(key) }}
+
+ {{ value }}
+
+
-
-
-
-
+ table1
+ table2
+
-
-
-
-
-
-
+
+
diff --git a/web_src/src/layout/index.vue b/web_src/src/layout/index.vue
new file mode 100644
index 00000000..4fdbc72e
--- /dev/null
+++ b/web_src/src/layout/index.vue
@@ -0,0 +1,90 @@
+
+
- 设备定位 ({{ parentChannelId == 0 ? deviceId : parentChannelId }})
-
-
- 返回
-
-
- 历史轨迹
- 最新位置
-
- 过期时间
- 上报周期
-
- 位置订阅
- 取消订阅
-
- 自动刷新
-
-
-
-
-
+ 设备定位 ({{ parentChannelId == 0 ? deviceId : parentChannelId }})
+
+
+ 返回
+
+
+ 历史轨迹
+ 最新位置
+
+ 过期时间
+ 上报周期
+
+ 位置订阅
+ 取消订阅
+
+ 自动刷新
+
+
+
+
-
- 通道列表({{ parentChannelId == 0 ? deviceId : parentChannelId }})
-
-
-
-
- 返回
-
+
Date: Thu, 21 Apr 2022 12:45:27 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=89=E4=B8=AA=E9=9A=90=E8=97=8F=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web_src/src/components/setting/Media.vue | 147 +++++++++++------------
web_src/src/components/setting/Sip.vue | 79 ++++++------
web_src/src/components/setting/Web.vue | 15 +--
3 files changed, 109 insertions(+), 132 deletions(-)
diff --git a/web_src/src/components/setting/Media.vue b/web_src/src/components/setting/Media.vue
index 0dc6c765..19465b96 100644
--- a/web_src/src/components/setting/Media.vue
+++ b/web_src/src/components/setting/Media.vue
@@ -1,85 +1,78 @@
-
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.longitude }},{{ scope.row.latitude }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 播放
- 停止
-
- 查看
-
- 设备录象
-
-
-
-
-
-
-
-
+
+
+
+
+ 播放
+ 停止
+
+ 查看
+
+ 设备录象
+
+
+
+
+
+
+
+
From fd1256acb1c21ac5971df03ab0f132b32e864f1c Mon Sep 17 00:00:00 2001
From: xiaoxie
+
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.longitude }},{{ scope.row.latitude }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 返回
+
+ 通道列表({{ parentChannelId == 0 ? deviceId : parentChannelId }})
+
搜索:
+
自动刷新
-
- 开启
- 关闭
-
-
-
+ 开启
+ 关闭
+
+
+
-
-
-
-
-
- 媒体服务
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 媒体服务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
+
+
+
- 保存
-
-
+
+ 保存
+
+
-