XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并开源主线

Browse Source
This commit is contained in:
648540858
2023-04-04 09:09:07 +08:00
parent 786c76ba71 053cd130aa
commit b4048fbe80
165 changed files with 3017 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web_src/src/components/dialog/MediaServerEdit.vue
View File

@@ -78,7 +78,7 @@
<el-switch v-model="mediaServerForm.autoConfig" :disabled="mediaServerForm.defaultServer"></el-switch>
</el-form-item>
<el-form-item label="收流端口模式" >
<el-switch active-text="多端口" inactive-text="单端口" v-model="mediaServerForm.rtpEnable" :disabled="mediaServerForm.defaultServer"></el-switch>
<el-switch active-text="多端口" inactive-text="单端口" @change="portRangeChange" v-model="mediaServerForm.rtpEnable" :disabled="mediaServerForm.defaultServer"></el-switch>
</el-form-item>
<el-form-item v-if="!mediaServerForm.rtpEnable" label="收流端口" prop="rtpProxyPort">
@@ -335,7 +335,7 @@ export default {
var that = this;
await that.$axios({
method: 'get',
url:`./api/platform/exit/${deviceGbId}`
url:`/api/platform/exit/${deviceGbId}`
}).then(function (res) {
result = res.data;
}).catch(function (error) {
@@ -349,8 +349,10 @@ export default {
}
},
portRangeChange: function() {
this.mediaServerForm.rtpPortRange = this.rtpPortRange1 + "," + this.rtpPortRange2
console.log(this.mediaServerForm.rtpPortRange)
if (this.mediaServerForm.rtpEnable) {
this.mediaServerForm.rtpPortRange = this.rtpPortRange1 + "," + this.rtpPortRange2
console.log(this.mediaServerForm.rtpPortRange)
}
}
},
};

8
web_src/src/components/dialog/StreamProxyEdit.vue
View File

@@ -195,7 +195,7 @@ export default {
let that = this;
this.$axios({
method: 'get',
url:`./api/platform/query/10000/1`
url:`/api/platform/query/10000/1`
}).then(function (res) {
that.platformList = res.data.data.list;
}).catch(function (error) {
@@ -212,7 +212,7 @@ export default {
if (that.proxyParam.mediaServerId !== "auto"){
that.$axios({
method: 'get',
url:`./api/proxy/ffmpeg_cmd/list`,
url:`/api/proxy/ffmpeg_cmd/list`,
params: {
mediaServerId: that.proxyParam.mediaServerId
}
@@ -230,7 +230,7 @@ export default {
this.noneReaderHandler();
this.$axios({
method: 'post',
url:`./api/proxy/save`,
url:`/api/proxy/save`,
data: this.proxyParam
}).then((res)=> {
this.dialogLoading = false;
@@ -261,7 +261,7 @@ export default {
var that = this;
await that.$axios({
method: 'get',
url:`./api/platform/exit/${deviceGbId}`
url:`/api/platform/exit/${deviceGbId}`
}).then(function (res) {
result = res.data;
}).catch(function (error) {

2
web_src/src/components/dialog/SyncChannelProgress.vue
View File

@@ -55,7 +55,7 @@ export default {
getProgress(){
this.$axios({
method: 'get',
url:`./api/device/query/${this.deviceId}/sync_status/`,
url:`/api/device/query/${this.deviceId}/sync_status/`,
}).then((res) => {
if (res.data.code === 0) {
if (!this.syncFlag) {

4
web_src/src/components/dialog/addUser.vue
View File

@@ -100,7 +100,7 @@ export default {
onSubmit: function () {
this.$axios({
method: 'post',
url: "./api/user/add",
url: "/api/user/add",
params: {
username: this.username,
password: this.password,
@@ -139,7 +139,7 @@ export default {
this.$axios({
method: 'get',
url: "./api/role/all"
url: "/api/role/all"
}).then((res) => {
this.loading = true;
if (res.data.code === 0) {

2
web_src/src/components/dialog/catalogEdit.vue
View File

@@ -116,7 +116,7 @@ export default {
console.log(this.form);
this.$axios({
method:"post",
url:`./api/platform/catalog/${!this.isEdit? "add":"edit"}`,
url:`/api/platform/catalog/${!this.isEdit? "add":"edit"}`,
data: this.form
}).then((res)=> {
if (res.data.code === 0) {

5
web_src/src/components/dialog/changePassword.vue
View File

@@ -35,6 +35,7 @@
<script>
import crypto from 'crypto'
import userService from "../service/UserService";
export default {
name: "changePassword",
props: {},
@@ -90,7 +91,7 @@ export default {
onSubmit: function () {
this.$axios({
method: 'post',
url:"./api/user/changePassword",
url:"/api/user/changePassword",
params: {
oldPassword: crypto.createHash('md5').update(this.oldPassword, "utf8").digest('hex'),
password: this.newPassword
@@ -105,7 +106,7 @@ export default {
this.showDialog = false;
setTimeout(()=>{
// 删除cookie，回到登录页面
this.$cookies.remove("session");
userService.clearUserInfo();
this.$router.push('/login');
this.sseSource.close();
},800)

2
web_src/src/components/dialog/changePasswordForAdmin.vue
View File

@@ -85,7 +85,7 @@ export default {
onSubmit: function () {
this.$axios({
method: 'post',
url:"./api/user/changePasswordForAdmin",
url:"/api/user/changePasswordForAdmin",
params: {
password: this.newPassword,
userId: this.form.id,

2
web_src/src/components/dialog/changePushKey.vue
View File

@@ -65,7 +65,7 @@ export default {
onSubmit: function () {
this.$axios({
method: 'post',
url:"./api/user/changePushKey",
url:"/api/user/changePushKey",
params: {
pushKey: this.newPushKey,
userId: this.form.id,

2
web_src/src/components/dialog/channelMapInfobox.vue
View File

@@ -44,7 +44,7 @@ export default {
let that = this;
this.$axios({
method: 'get',
url: './api/play/start/' + deviceId + '/' + channelId
url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
that.isLoging = false;
if (res.data.code === 0) {

16
web_src/src/components/dialog/chooseChannel.vue
View File

@@ -1,7 +1,7 @@
<template>
<div id="chooseChannel" v-loading="isLoging">
<div id="chooseChannel" >
<el-dialog title="选择通道" v-if="showDialog" top="2rem" width="90%" :close-on-click-modal="false" :visible.sync="showDialog" :destroy-on-close="true" @close="close()">
<el-dialog title="选择通道" v-loading="loading" v-if="showDialog" top="2rem" width="90%" :close-on-click-modal="false" :visible.sync="showDialog" :destroy-on-close="true" @close="close()">
<el-row>
<el-col :span="10">
<el-tabs v-model="catalogTabActiveName" >
@@ -56,7 +56,7 @@ export default {
},
data() {
return {
isLoging: false,
loading: false,
tabActiveName: "gbChannel",
catalogTabActiveName: "catalog",
platformId: "",
@@ -94,18 +94,17 @@ export default {
},
save: function() {
var that = this;
this.$axios({
method:"post",
url:"./api/platform/update_channel_for_gb",
url:"/api/platform/update_channel_for_gb",
data:{
platformId: that.platformId,
channelReduces: that.chooseData
platformId: this.platformId,
channelReduces: this.chooseData
}
}).then((res)=>{
if (res.data.code === 0) {
that.$message({
this.$message({
showClose: true,
message: '保存成功,',
type: 'success'
@@ -114,6 +113,7 @@ export default {
}).catch(function (error) {
console.log(error);
});
},
catalogIdChange: function (id, name) {
this.catalogId = id;

8
web_src/src/components/dialog/chooseChannelForCatalog.vue
View File

@@ -82,7 +82,7 @@ export default {
let that = this;
this.$axios({
method:"get",
url:`./api/platform/catalog`,
url:`/api/platform/catalog`,
params: {
platformId: that.platformId,
parentId: parentId
@@ -134,7 +134,7 @@ export default {
removeCatalog: function (id, node){
this.$axios({
method:"delete",
url:`./api/platform/catalog/del`,
url:`/api/platform/catalog/del`,
params: {
id: id,
platformId: this.platformId,
@@ -156,7 +156,7 @@ export default {
setDefaultCatalog: function (id){
this.$axios({
method:"post",
url:`./api/platform/catalog/default/update`,
url:`/api/platform/catalog/default/update`,
params: {
platformId: this.platformId,
catalogId: id,
@@ -201,7 +201,7 @@ export default {
onClick: () => {
this.$axios({
method:"delete",
url:"./api/platform/catalog/relation/del",
url:"/api/platform/catalog/relation/del",
data: data
}).then((res)=>{
console.log("移除成功")

25
web_src/src/components/dialog/chooseChannelForGb.vue
View File

@@ -1,5 +1,5 @@
<template>
<div id="chooseChannelForGb" >
<div id="chooseChannelForGb" v-loading="loading">
<div style="font-size: 17px; color: #606060; white-space: nowrap; line-height: 30px; font-family: monospace;">
<span v-if="catalogId == null">{{catalogName}}的国标通道</span>
<span v-if="catalogId != null">{{catalogName}}({{catalogId}})的国标通道</span>
@@ -79,6 +79,7 @@ export default {
},
data() {
return {
loading: false,
gbChannels: [],
gbChoosechannel:{},
searchSrt: "",
@@ -118,10 +119,12 @@ export default {
},
add: function (row) {
let all = typeof(row) === "undefined"
this.getCatalogFromUser((catalogId)=> {
let task = null;
this.$axios({
method:"post",
url:"./api/platform/update_channel_for_gb",
url:"/api/platform/update_channel_for_gb",
data:{
platformId: this.platformId,
all: all,
@@ -130,12 +133,20 @@ export default {
}
}).then((res)=>{
console.log("保存成功")
window.clearTimeout(task);
this.loading = false;
this.getChannelList();
}).catch(function (error) {
}).catch((error)=> {
window.clearTimeout(task);
this.loading = false;
console.log(error);
});
task= setTimeout(()=>{
this.loading = true;
}, 200)
})
},
remove: function (row) {
let all = typeof(row) === "undefined"
@@ -149,7 +160,7 @@ export default {
this.$axios({
method:"delete",
url:"./api/platform/del_channel_for_gb",
url:"/api/platform/del_channel_for_gb",
data:{
platformId: this.platformId,
all: all,
@@ -248,7 +259,7 @@ export default {
this.$axios({
method:"get",
url:`./api/platform/channel_list`,
url:`/api/platform/channel_list`,
params: {
page: that.currentPage,
count: that.count,
@@ -290,7 +301,7 @@ export default {
}).then(() => {
this.$axios({
method:"delete",
url:"./api/platform/del_channel_for_gb",
url:"/api/platform/del_channel_for_gb",
data:{
platformId: this.platformId,
channelReduces: this.multipleSelection
@@ -310,7 +321,7 @@ export default {
this.$axios({
method: "post",
url: "./api/platform/update_channel_for_gb",
url: "/api/platform/update_channel_for_gb",
data: {
platformId: this.platformId,
channelReduces: this.multipleSelection,

21
web_src/src/components/dialog/chooseChannelForStream.vue
View File

@@ -1,5 +1,5 @@
<template>
<div id="chooseChannelFoStream" >
<div id="chooseChannelFoStream" v-loading="loading">
<div style="font-size: 17px; color: #606060; white-space: nowrap; line-height: 30px; font-family: monospace;">
<span v-if="catalogId == null">{{catalogName}}的直播通道</span>
<span v-if="catalogId != null">{{catalogName}}({{catalogId}})的直播通道</span>
@@ -85,6 +85,7 @@ export default {
},
data() {
return {
loading: false,
gbStreams: [],
gbChoosechannel:{},
channelType: "",
@@ -132,9 +133,10 @@ export default {
add: function (row, scope) {
let all = typeof(row) === "undefined"
this.getCatalogFromUser((catalogId)=>{
let task = null;
this.$axios({
method:"post",
url:"./api/gbStream/add",
url:"/api/gbStream/add",
data:{
platformId: this.platformId,
catalogId: catalogId,
@@ -143,11 +145,18 @@ export default {
}
}).then((res)=>{
console.log("保存成功")
window.clearTimeout(task);
this.loading = false;
// this.gbStreams.splice(scope.$index,1)
this.getChannelList();
}).catch(function (error) {
window.clearTimeout(task);
this.loading = false;
console.log(error);
});
task= setTimeout(()=>{
this.loading = true;
}, 200)
})
@@ -163,7 +172,7 @@ export default {
this.$axios({
method:"delete",
url:"./api/gbStream/del",
url:"/api/gbStream/del",
data:{
platformId: this.platformId,
all: all,
@@ -186,7 +195,7 @@ export default {
this.$axios({
method: 'get',
url:`./api/gbStream/list`,
url:`/api/gbStream/list`,
params: {
page: that.currentPage,
count: that.count,
@@ -222,7 +231,7 @@ export default {
}).then(() => {
this.$axios({
method:"delete",
url:"./api/gbStream/del",
url:"/api/gbStream/del",
data:{
platformId: this.platformId,
gbStreams: this.multipleSelection,
@@ -242,7 +251,7 @@ export default {
this.getCatalogFromUser((catalogId)=>{
this.$axios({
method:"post",
url:"./api/gbStream/add",
url:"/api/gbStream/add",
data:{
platformId: this.platformId,
catalogId: catalogId,

2
web_src/src/components/dialog/configInfo.vue
View File

@@ -13,7 +13,7 @@
<el-descriptions title="国标服务信息" v-if="configInfoData.sip" :span="2">
<el-descriptions-item label="编号" >{{configInfoData.sip.id}}</el-descriptions-item>
<el-descriptions-item label="域">{{configInfoData.sip.domain}}</el-descriptions-item>
<el-descriptions-item label="IP">{{configInfoData.sip.ip}}</el-descriptions-item>
<el-descriptions-item label="IP">{{configInfoData.sip.showIp}}</el-descriptions-item>
<el-descriptions-item label="端口">{{configInfoData.sip.port}}</el-descriptions-item>
<el-descriptions-item label="密码">
<el-tag size="small">{{configInfoData.sip.password}}</el-tag>

3
web_src/src/components/dialog/deviceEdit.vue
View File

@@ -69,6 +69,7 @@
</el-form-item>
<el-form-item label="其他选项">
<el-checkbox label="SSRC校验" v-model="form.ssrcCheck" style="float: left"></el-checkbox>
<el-checkbox label="作为消息通道" v-model="form.asMessageChannel" style="float: left"></el-checkbox>
</el-form-item>
<el-form-item>
<div style="float: right;">
@@ -134,7 +135,7 @@ export default {
this.form.mobilePositionSubmissionInterval = this.form.mobilePositionSubmissionInterval||0
this.$axios({
method: 'post',
url:`./api/device/query/device/${this.isEdit?'update':'add'}/`,
url:`/api/device/query/device/${this.isEdit?'update':'add'}/`,
params: this.form
}).then((res) => {
console.log(res.data)

4
web_src/src/components/dialog/getCatalog.vue
View File

@@ -89,7 +89,7 @@ export default {
let that = this;
this.$axios({
method:"get",
url:`./api/platform/catalog`,
url:`/api/platform/catalog`,
params: {
platformId: that.platformId,
parentId: parentId
@@ -111,7 +111,7 @@ export default {
if (node.level === 0) {
this.$axios({
method:"get",
url:`./api/platform/info/` + this.platformId,
url:`/api/platform/info/` + this.platformId,
})
.then((res)=> {
if (res.data.code === 0) {

10
web_src/src/components/dialog/importChannel.vue
View File

@@ -16,6 +16,7 @@
drag
:action="uploadUrl"
name="file"
:headers="headers"
:on-success="successHook"
:on-error="errorHook"
>
@@ -33,6 +34,8 @@
import ShowErrorData from './importChannelShowErrorData.vue'
import userService from "../service/UserService";
export default {
name: "importChannel",
components: {
@@ -47,7 +50,10 @@ export default {
isEdit: false,
errorStreams: [],
errorGBIds: [],
uploadUrl: process.env.NODE_ENV === 'development'?`debug/api/push/upload`:`api/push/upload`,
headers: {
"access-token": userService.getToken()
},
uploadUrl: process.env.NODE_ENV === 'development'? `http://127.0.0.1:8080/debug/api/push/upload`: (window.baseUrl ? window.baseUrl : "") + `/api/push/upload`,
};
},
methods: {
@@ -60,7 +66,7 @@ export default {
console.log(this.form);
this.$axios({
method:"post",
url:`./api/platform/catalog/${!this.isEdit? "add":"edit"}`,
url:`/api/platform/catalog/${!this.isEdit? "add":"edit"}`,
data: this.form
})
.then((res)=> {

2
web_src/src/components/dialog/onvifEdit.vue
View File

@@ -81,7 +81,7 @@ export default {
console.log(this.form);
this.$axios({
method: 'get',
url:`./api/onvif/rtsp`,
url:`/api/onvif/rtsp`,
params: {
hostname: this.form.hostName,
timeout: 3000,

20
web_src/src/components/dialog/platformEdit.vue
View File

@@ -96,9 +96,10 @@
</el-form-item>
<el-form-item label="其他选项">
<el-checkbox label="启用" v-model="platform.enable" @change="checkExpires"></el-checkbox>
<el-checkbox label="云台控制" v-model="platform.ptz"></el-checkbox>
<!-- <el-checkbox label="云台控制" v-model="platform.ptz"></el-checkbox>-->
<el-checkbox label="拉起离线推流" v-model="platform.startOfflinePush"></el-checkbox>
<el-checkbox label="RTCP保活" v-model="platform.rtcp" @change="rtcpCheckBoxChange"></el-checkbox>
<el-checkbox label="作为消息通道" v-model="platform.asMessageChannel" ></el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">{{
@@ -138,13 +139,14 @@ export default {
showDialog: false,
isLoging: false,
onSubmit_text: "立即创建",
saveUrl: "./api/platform/save",
saveUrl: "/api/platform/save",
platform: {
id: null,
enable: true,
ptz: true,
rtcp: false,
asMessageChannel: false,
name: null,
serverGBId: null,
serverGBDomain: null,
@@ -155,7 +157,7 @@ export default {
devicePort: null,
username: null,
password: null,
expires: 300,
expires: 3600,
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
@@ -192,7 +194,7 @@ export default {
this.saveUrl = "/api/platform/add";
this.$axios({
method: 'get',
url:`./api/platform/server_config`
url:`/api/platform/server_config`
}).then(function (res) {
console.log(res);
if (res.data.code === 0) {
@@ -213,6 +215,7 @@ export default {
this.platform.enable = platform.enable;
this.platform.ptz = platform.ptz;
this.platform.rtcp = platform.rtcp;
this.platform.asMessageChannel = platform.asMessageChannel;
this.platform.name = platform.name;
this.platform.serverGBId = platform.serverGBId;
this.platform.serverGBDomain = platform.serverGBDomain;
@@ -290,6 +293,7 @@ export default {
enable: true,
ptz: true,
rtcp: false,
asMessageChannel: false,
name: null,
serverGBId: null,
administrativeDivision: null,
@@ -301,7 +305,7 @@ export default {
devicePort: null,
username: null,
password: null,
expires: 300,
expires: 3600,
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
@@ -315,7 +319,7 @@ export default {
var that = this;
await that.$axios({
method: 'get',
url:`./api/platform/exit/${deviceGbId}`})
url:`/api/platform/exit/${deviceGbId}`})
.then(function (res) {
if (res.data.code === 0) {
result = res.data.data;
@@ -327,8 +331,8 @@ export default {
return result;
},
checkExpires: function() {
if (this.platform.enable && this.platform.expires == "0") {
this.platform.expires = "300";
if (this.platform.enable && this.platform.expires === "0") {
this.platform.expires = "3600";
}
},
rtcpCheckBoxChange: function (result){

6
web_src/src/components/dialog/pushStreamEdit.vue
View File

@@ -109,7 +109,7 @@ export default {
if (this.edit) {
this.$axios({
method:"post",
url:`./api/push/save_to_gb`,
url:`/api/push/save_to_gb`,
data: this.proxyParam
}).then( (res) => {
if (res.data.code === 0) {
@@ -129,7 +129,7 @@ export default {
}else {
this.$axios({
method:"post",
url:`./api/push/add`,
url:`/api/push/add`,
data: this.proxyParam
}).then( (res) => {
if (res.data.code === 0) {
@@ -159,7 +159,7 @@ export default {
var that = this;
await that.$axios({
method:"get",
url:`./api/platform/exit/${deviceGbId}`
url:`/api/platform/exit/${deviceGbId}`
}).then(function (res) {
result = res.data;
}).catch(function (error) {

2
web_src/src/components/dialog/queryTrace.vue
View File

@@ -72,7 +72,7 @@ export default {
onSubmit: function () {
console.log("onSubmit");
this.isLoging = true;
let url = `./api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`;
let url = `/api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`;
if (this.channel.channelId) {
url+="&channelId=${this.channel.channelId}"
}

8
web_src/src/components/dialog/recordDownload.vue
View File

@@ -71,7 +71,7 @@ export default {
getProgress: function (callback){
this.$axios({
method: 'get',
url: `./api/gb_record/download/progress/${this.deviceId}/${this.channelId}/${this.stream}`
url: `/api/gb_record/download/progress/${this.deviceId}/${this.channelId}/${this.stream}`
}).then((res)=> {
console.log(res)
if (res.data.code === 0) {
@@ -124,7 +124,7 @@ export default {
stopDownloadRecord: function (callback) {
this.$axios({
method: 'get',
url: './api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.stream
url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.stream
}).then((res)=> {
if (callback) callback(res)
});
@@ -132,7 +132,7 @@ export default {
getFileDownload: function (){
this.$axios({
method: 'get',
url:`./record_proxy/${this.mediaServerId}/api/record/file/download/task/add`,
url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/add`,
params: {
app: this.app,
stream: this.stream,
@@ -164,7 +164,7 @@ export default {
getProgressForFile: function (callback){
this.$axios({
method: 'get',
url:`./record_proxy/${this.mediaServerId}/api/record/file/download/task/list`,
url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/list`,
params: {
app: this.app,
stream: this.stream,