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

Merge branch 'wvp-28181-2.0'

Browse Source 
# Conflicts:
#	doc/_content/introduction/deployment.md
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
This commit is contained in:
648540858
2023-02-10 16:24:27 +08:00
parent bb49f1f0d6 b010e63dc0
commit f2c6210539
95 changed files with 2176 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web_src/src/components/CloudRecord.vue
View File

@@ -133,7 +133,7 @@
let that = this;
this.$axios({
method: 'get',
url:`/record_proxy/${that.mediaServerId}/api/record/list`,
url:`./record_proxy/${that.mediaServerId}/api/record/list`,
params: {
page: that.currentPage,
count: that.count
@@ -185,7 +185,7 @@
let that = this;
this.$axios({
method: 'delete',
url:`/record_proxy/api/record/delete`,
url:`./record_proxy/api/record/delete`,
params: {
page: that.currentPage,
count: that.count

60
web_src/src/components/CloudRecordDetail.vue
View File

@@ -1,14 +1,15 @@
<template>
<div id="recordDetail">
<el-container>
<el-aside width="300px">
<el-aside width="260px">
<div class="record-list-box-box">
<el-date-picker size="mini" v-model="chooseDate" :picker-options="pickerOptions" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()"></el-date-picker>
<div style="margin-top: 20px">
<el-date-picker size="mini" style="width: 160px" v-model="chooseDate" :picker-options="pickerOptions" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()"></el-date-picker>
<el-button size="mini" type="primary" icon="fa fa-cloud-download" style="margin: auto; margin-left: 12px " title="裁剪合并" @click="drawerOpen"></el-button>
</div>
<div class="record-list-box" :style="recordListStyle">
<ul v-if="detailFiles.length >0" class="infinite-list record-list" v-infinite-scroll="infiniteScroll" >
<li v-for="item in detailFiles" class="infinite-list-item record-list-item" >
<li v-for="(item,index) in detailFiles" :key="index" class="infinite-list-item record-list-item" >
<el-tag v-if="choosedFile != item" @click="chooseFile(item)">
<i class="el-icon-video-camera" ></i>
{{ item.substring(0,17)}}
@@ -24,9 +25,7 @@
<div v-if="detailFiles.length ==0" class="record-list-no-val" >暂无数据</div>
</div>
<div class="record-list-option">
<el-button size="mini" type="primary" icon="fa fa-cloud-download" style="margin: auto; " title="裁剪合并" @click="drawerOpen"></el-button>
</div>
</el-aside>
<el-main style="padding: 22px">
<div class="playBox" :style="playerStyle">
@@ -45,7 +44,7 @@
:marks="playTimeSliderMarks">
</el-slider>
<div class="slider-val-box">
<div class="slider-val" v-for="item of detailFiles" :style="'width:' + getDataWidth(item) + '%; left:' + getDataLeft(item) + '%'"></div>
<div class="slider-val" v-for="(item,index) of detailFiles" :key="index" :style="'width:' + getDataWidth(item) + '%; left:' + getDataLeft(item) + '%'"></div>
</div>
</div>
@@ -62,7 +61,7 @@
<el-tab-pane name="running">
<span slot="label"><i class="el-icon-scissors"></i>进行中</span>
<ul class="task-list">
<li class="task-list-item" v-for="item in taskListForRuning">
<li class="task-list-item" v-for="(item,index) in taskListForRuning" :key="index">
<div class="task-list-item-box">
<span>{{ item.startTime.substr(10) }}-{{item.endTime.substr(10)}}</span>
<el-progress :percentage="(parseFloat(item.percentage)*100).toFixed(1)"></el-progress>
@@ -74,10 +73,10 @@
<el-tab-pane name="ended">
<span slot="label"><i class="el-icon-finished"></i>已完成</span>
<ul class="task-list">
<li class="task-list-item" v-for="item in taskListEnded">
<li class="task-list-item" v-for="(item, index) in taskListEnded" :key="index">
<div class="task-list-item-box" style="height: 2rem;line-height: 2rem;">
<span>{{ item.startTime.substr(10) }}-{{item.endTime.substr(10)}}</span>
<a class="el-icon-download download-btn" :href="basePath + '/download.html?url=../' + item.recordFile" target="_blank">
<a class="el-icon-download download-btn" :href="mediaServerPath + '/download.html?url=../' + item.recordFile" target="_blank">
</a>
</div>
</li>
@@ -116,7 +115,7 @@
props: ['recordFile', 'mediaServerId', 'dateFiles', 'mediaServerPath'],
data() {
return {
basePath: `${this.mediaServerPath}`,
basePath: `${this.mediaServerPath}/record`,
dateFilesObj: [],
detailFiles: [],
chooseDate: null,
@@ -147,6 +146,7 @@
"margin-bottom": "20px",
"height": this.winHeight + "px",
},
timeFormat:'00:00:00',
winHeight: window.innerHeight - 240,
playTime: 0,
playTimeSliderMarks: {
@@ -213,7 +213,7 @@
this.currentPage = 1;
this.sliderMIn= 0;
this.sliderMax= 86400;
let chooseFullDate = new Date(this.chooseDate + " " + "00:00:00");
let chooseFullDate = new Date(this.chooseDate +" " + this.timeFormat);
if (chooseFullDate.getFullYear() !== this.queryDate.getFullYear()
|| chooseFullDate.getMonth() !== this.queryDate.getMonth()){
// this.getDateInYear()
@@ -222,8 +222,8 @@
if (this.detailFiles.length > 0){
let timeForFile = this.getTimeForFile(this.detailFiles[0]);
let lastTimeForFile = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1]);
let timeNum = timeForFile[0].getTime() - new Date(this.chooseDate + " " + "00:00:00").getTime()
let lastTimeNum = lastTimeForFile[1].getTime() - new Date(this.chooseDate + " " + "00:00:00").getTime()
let timeNum = timeForFile[0].getTime() - new Date(this.chooseDate + " " + this.timeFormat).getTime()
let lastTimeNum = lastTimeForFile[1].getTime() - new Date(this.chooseDate + " " + this.timeFormat).getTime()
this.playTime = parseInt(timeNum/1000)
this.sliderMIn = parseInt(timeNum/1000 - timeNum/1000%(60*60))
@@ -241,7 +241,7 @@
let that = this;
that.$axios({
method: 'get',
url:`/record_proxy/${that.mediaServerId}/api/record/file/list`,
url:`./record_proxy/${that.mediaServerId}/api/record/file/list`,
params: {
app: that.recordFile.app,
stream: that.recordFile.stream,
@@ -281,14 +281,14 @@
},
getDataLeft(item){
let timeForFile = this.getTimeForFile(item);
let differenceTime = timeForFile[0].getTime() - new Date(this.chooseDate + " 00:00:00").getTime()
let differenceTime = timeForFile[0].getTime() - new Date(this.chooseDate + " " + this.timeFormat).getTime()
return parseFloat((differenceTime - this.sliderMIn * 1000)/((this.sliderMax - this.sliderMIn)*1000))*100 ;
},
playTimeChange(val){
let minTime = this.getTimeForFile(this.detailFiles[0])[0]
let maxTime = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1])[1];
this.chooseFile(null);
let timeMilli = new Date(this.chooseDate + " 00:00:00").getTime() + val*1000
let timeMilli = new Date(this.chooseDate + " " + this.timeFormat).getTime() + val*1000
if (timeMilli >= minTime.getTime() && timeMilli <= maxTime.getTime()){
for (let i = 0; i < this.detailFiles.length; i++) {
let timeForFile = this.getTimeForFile(this.detailFiles[i]);
@@ -302,10 +302,20 @@
},
getTimeForFile(file){
let timeStr = file.substring(0,17);
let starTime = new Date(this.chooseDate + " " + timeStr.split("-")[0]);
let endTime = new Date(this.chooseDate + " " + timeStr.split("-")[1]);
if(timeStr.indexOf("~") > 0){
timeStr = timeStr.replaceAll("-",":")
}
let timeArr = timeStr.split("~");
let starTime = new Date(this.chooseDate + " " + timeArr[0]);
let endTime = new Date(this.chooseDate + " " + timeArr[1]);
if(this.checkIsOver24h(starTime,endTime)){
endTime = new Date(this.chooseDate + " " + "23:59:59");
}
return [starTime, endTime, endTime.getTime() - starTime.getTime()];
},
checkIsOver24h(starTime,endTime){
return starTime > endTime;
},
playTimeFormat(val){
let h = parseInt(val/3600);
let m = parseInt((val - h*3600)/60);
@@ -330,7 +340,7 @@
let that = this;
this.$axios({
method: 'delete',
url:`/record_proxy/${that.mediaServerId}/api/record/delete`,
url:`./record_proxy/${that.mediaServerId}/api/record/delete`,
params: {
page: that.currentPage,
count: that.count
@@ -349,7 +359,7 @@
that.dateFilesObj = {};
this.$axios({
method: 'get',
url:`/record_proxy/${that.mediaServerId}/api/record/date/list`,
url:`./record_proxy/${that.mediaServerId}/api/record/date/list`,
params: {
app: that.recordFile.app,
stream: that.recordFile.stream
@@ -398,7 +408,7 @@
let that = this;
this.$axios({
method: 'get',
url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/add`,
url:`./record_proxy/${that.mediaServerId}/api/record/file/download/task/add`,
params: {
app: that.recordFile.app,
stream: that.recordFile.stream,
@@ -423,7 +433,7 @@
let that = this;
this.$axios({
method: 'get',
url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/list`,
url:`./record_proxy/${that.mediaServerId}/api/record/file/download/task/list`,
params: {
isEnd: isEnd,
}

10
web_src/src/components/DeviceList.vue
View File

@@ -152,7 +152,7 @@ export default {
this.getDeviceListLoading = true;
this.$axios({
method: 'get',
url: `/api/device/query/devices`,
url: `./api/device/query/devices`,
params: {
page: this.currentPage,
count: this.count
@@ -182,7 +182,7 @@ export default {
}).then(() => {
this.$axios({
method: 'delete',
url: `/api/device/query/devices/${row.deviceId}/delete`
url: `./api/device/query/devices/${row.deviceId}/delete`
}).then((res) => {
this.getDeviceList();
}).catch((error) => {
@@ -208,7 +208,7 @@ export default {
let that = this;
this.$axios({
method: 'get',
url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
url: './api/device/query/devices/' + itemData.deviceId + '/sync'
}).then((res) => {
console.log("刷新设备结果：" + JSON.stringify(res));
if (res.data.code !== 0) {
@@ -242,7 +242,7 @@ export default {
await this.$axios({
method: 'get',
async: false,
url: `/api/device/query/${deviceId}/sync_status/`,
url: `./api/device/query/${deviceId}/sync_status/`,
}).then((res) => {
if (res.data.code == 0) {
if (res.data.data.errorMsg !== null) {
@@ -261,7 +261,7 @@ export default {
let that = this;
this.$axios({
method: 'post',
url: '/api/device/query/transport/' + row.deviceId + '/' + row.streamMode
url: './api/device/query/transport/' + row.deviceId + '/' + row.streamMode
}).then(function (res) {
}).catch(function (e) {

16
web_src/src/components/GBRecordDetail.vue
View File

@@ -197,7 +197,7 @@
this.detailFiles = [];
this.$axios({
method: 'get',
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' + this.endTime
url: './api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' + this.endTime
}).then((res)=>{
this.recordsLoading = false;
if(res.data.code === 0) {
@@ -249,7 +249,7 @@
} else {
this.$axios({
method: 'get',
url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' +
url: './api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' +
this.endTime
}).then((res)=> {
if (res.data.code === 0) {
@@ -273,7 +273,7 @@
console.log('前端控制：播放');
this.$axios({
method: 'get',
url: '/api/playback/resume/' + this.streamId
url: './api/playback/resume/' + this.streamId
}).then((res)=> {
this.$refs["recordVideoPlayer"].play(this.videoUrl)
});
@@ -282,14 +282,14 @@
console.log('前端控制：暂停');
this.$axios({
method: 'get',
url: '/api/playback/pause/' + this.streamId
url: './api/playback/pause/' + this.streamId
}).then(function (res) {});
},
gbScale(command){
console.log('前端控制：倍速 ' + command);
this.$axios({
method: 'get',
url: `/api/playback/speed/${this.streamId }/${command}`
url: `./api/playback/speed/${this.streamId }/${command}`
}).then(function (res) {});
},
downloadRecord: function (row) {
@@ -311,7 +311,7 @@
}else {
this.$axios({
method: 'get',
url: '/api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
url: './api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime + '&downloadSpeed=4'
}).then( (res)=> {
if (res.data.code === 0) {
@@ -332,7 +332,7 @@
this.videoUrl = '';
this.$axios({
method: 'get',
url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
url: './api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
}).then((res)=> {
if (callback) callback(res)
});
@@ -342,7 +342,7 @@
this.videoUrl = '';
this.$axios({
method: 'get',
url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
url: './api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
}).then(function (res) {
if (callback) callback()
});

2
web_src/src/components/Login.vue
View File

@@ -81,7 +81,7 @@ export default {
this.$axios({
method: 'get',
url:"/api/user/login",
url:"./api/user/login",
params: loginParam
}).then(function (res) {
window.clearTimeout(timeoutTask)

4
web_src/src/components/ParentPlatformList.vue
View File

@@ -128,7 +128,7 @@ export default {
var that = this;
that.$axios({
method: 'delete',
url:`/api/platform/delete/${platform.serverGBId}`
url:`./api/platform/delete/${platform.serverGBId}`
}).then(function (res) {
if (res.data.code === 0) {
that.$message({
@@ -162,7 +162,7 @@ export default {
this.$axios({
method: 'get',
url:`/api/platform/query/${that.count}/${that.currentPage}`
url:`./api/platform/query/${that.count}/${that.currentPage}`
}).then(function (res) {
if (res.data.code === 0) {
that.total = res.data.data.total;

10
web_src/src/components/PushVideoList.vue
View File

@@ -171,7 +171,7 @@ export default {
this.getDeviceListLoading = true;
this.$axios({
method: 'get',
url: `/api/push/list`,
url: `./api/push/list`,
params: {
page: that.currentPage,
count: that.count,
@@ -197,7 +197,7 @@ export default {
this.getListLoading = true;
this.$axios({
method: 'get',
url: '/api/push/getPlayUrl',
url: './api/push/getPlayUrl',
params: {
app: row.app,
stream: row.stream,
@@ -223,7 +223,7 @@ export default {
let that = this;
that.$axios({
method: "post",
url: "/api/push/stop",
url: "./api/push/stop",
params: {
app: row.app,
streamId: row.stream
@@ -247,7 +247,7 @@ export default {
let that = this;
that.$axios({
method: "delete",
url: "/api/push/remove_form_gb",
url: "./api/push/remove_form_gb",
data: row
}).then((res) => {
if (res.data.code === 0) {
@@ -274,7 +274,7 @@ export default {
let that = this;
that.$axios({
method: "delete",
url: "/api/push/batchStop",
url: "./api/push/batchStop",
data: {
gbStreams: this.multipleSelection
}

12
web_src/src/components/StreamProxyList.vue
View File

@@ -167,7 +167,7 @@
let that = this;
this.$axios({
method: 'get',
url:`/api/proxy/list`,
url:`./api/proxy/list`,
params: {
page: that.currentPage,
count: that.count
@@ -190,7 +190,7 @@
addOnvif: function(){
this.$axios({
method: 'get',
url:`/api/onvif/search?timeout=3000`,
url:`./api/onvif/search?timeout=3000`,
}).then((res) =>{
if (res.data.code === 0 ){
if (res.data.data.length > 0) {
@@ -218,7 +218,7 @@
let that = this;
this.$axios({
method: 'get',
url:`/api/push/getPlayUrl`,
url:`./api/push/getPlayUrl`,
params: {
app: row.app,
stream: row.stream,
@@ -247,7 +247,7 @@
let that = this;
that.$axios({
method:"delete",
url:"/api/proxy/del",
url:"./api/proxy/del",
params:{
app: row.app,
stream: row.stream
@@ -263,7 +263,7 @@
this.$set(row, 'startBtnLoading', true)
this.$axios({
method: 'get',
url:`/api/proxy/start`,
url:`./api/proxy/start`,
params: {
app: row.app,
stream: row.stream
@@ -295,7 +295,7 @@
let that = this;
this.$axios({
method: 'get',
url:`/api/proxy/stop`,
url:`./api/proxy/stop`,
params: {
app: row.app,
stream: row.stream

4
web_src/src/components/UserManager.vue
View File

@@ -99,7 +99,7 @@ export default {
this.getUserListLoading = true;
this.$axios({
method: 'get',
url: `/api/user/users`,
url: `./api/user/users`,
params: {
page: that.currentPage,
count: that.count
@@ -141,7 +141,7 @@ export default {
}).then(() => {
this.$axios({
method: 'delete',
url: `/api/user/delete?id=${row.id}`
url: `./api/user/delete?id=${row.id}`
}).then((res) => {
this.getUserList();
}).catch((error) => {

12
web_src/src/components/channelList.vue
View File

@@ -206,7 +206,7 @@ export default {
if (typeof (this.$route.params.deviceId) == "undefined") return;
this.$axios({
method: 'get',
url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
url: `./api/device/query/devices/${this.$route.params.deviceId}/channels`,
params: {
page: that.currentPage,
count: that.count,
@@ -238,7 +238,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) {
console.log(res)
that.isLoging = false;
@@ -278,7 +278,7 @@ export default {
var that = this;
this.$axios({
method: 'get',
url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId
url: './api/play/stop/' + this.deviceId + "/" + itemData.channelId
}).then(function (res) {
that.initData();
}).catch(function (error) {
@@ -334,7 +334,7 @@ export default {
if (!this.showTree) {
this.$axios({
method: 'get',
url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
url: `./api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
params: {
page: this.currentPage,
count: this.count,
@@ -358,7 +358,7 @@ export default {
}else {
this.$axios({
method: 'get',
url: `/api/device/query/tree/channel/${this.deviceId}`,
url: `./api/device/query/tree/channel/${this.deviceId}`,
params: {
parentId: this.parentChannelId,
page: this.currentPage,
@@ -387,7 +387,7 @@ export default {
updateChannel: function (row) {
this.$axios({
method: 'post',
url: `/api/device/query/channel/update/${this.deviceId}`,
url: `./api/device/query/channel/update/${this.deviceId}`,
params: row
}).then(function (res) {
console.log(JSON.stringify(res));

8
web_src/src/components/console.vue
View File

@@ -114,7 +114,7 @@ export default {
getSystemInfo: function (){
this.$axios({
method: 'get',
url: `/api/server/system/info`,
url: `./api/server/system/info`,
}).then( (res)=> {
if (res.data.code === 0) {
this.$refs.consoleCPU.setData(res.data.data.cpu)
@@ -128,7 +128,7 @@ export default {
getLoad: function (){
this.$axios({
method: 'get',
url: `/api/server/media_server/load`,
url: `./api/server/media_server/load`,
}).then( (res)=> {
if (res.data.code === 0) {
this.$refs.consoleNodeLoad.setData(res.data.data)
@@ -139,7 +139,7 @@ export default {
getResourceInfo: function (){
this.$axios({
method: 'get',
url: `/api/server/resource/info`,
url: `./api/server/resource/info`,
}).then( (res)=> {
if (res.data.code === 0) {
this.$refs.consoleResource.setData(res.data.data)
@@ -151,7 +151,7 @@ export default {
this.$axios({
method: 'get',
url: `/api/server/system/configInfo`,
url: `./api/server/system/configInfo`,
}).then( (res)=> {
console.log(res)
if (res.data.code === 0) {

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

@@ -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) {

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) {

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

@@ -90,7 +90,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

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) {

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

@@ -98,7 +98,7 @@ export default {
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

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("移除成功")

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

@@ -121,7 +121,7 @@ export default {
this.getCatalogFromUser((catalogId)=> {
this.$axios({
method:"post",
url:"/api/platform/update_channel_for_gb",
url:"./api/platform/update_channel_for_gb",
data:{
platformId: this.platformId,
all: all,
@@ -149,7 +149,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 +248,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 +290,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 +310,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,

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

@@ -134,7 +134,7 @@ export default {
this.getCatalogFromUser((catalogId)=>{
this.$axios({
method:"post",
url:"/api/gbStream/add",
url:"./api/gbStream/add",
data:{
platformId: this.platformId,
catalogId: catalogId,
@@ -163,7 +163,7 @@ export default {
this.$axios({
method:"delete",
url:"/api/gbStream/del",
url:"./api/gbStream/del",
data:{
platformId: this.platformId,
all: all,
@@ -186,7 +186,7 @@ export default {
this.$axios({
method: 'get',
url:`/api/gbStream/list`,
url:`./api/gbStream/list`,
params: {
page: that.currentPage,
count: that.count,
@@ -222,7 +222,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 +242,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/deviceEdit.vue
View File

@@ -134,7 +134,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) {

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

@@ -60,7 +60,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,

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

@@ -138,7 +138,7 @@ export default {
showDialog: false,
isLoging: false,
onSubmit_text: "立即创建",
saveUrl: "/api/platform/save",
saveUrl: "./api/platform/save",
platform: {
id: null,
@@ -192,7 +192,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) {
@@ -315,7 +315,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;

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,

2
web_src/src/components/live.vue
View File

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

2
web_src/src/components/map.vue
View File

@@ -298,7 +298,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) {

10
web_src/src/components/service/DeviceService.js
View File

@@ -9,7 +9,7 @@ class DeviceService{
getDeviceList(currentPage, count, callback, errorCallback){
this.$axios({
method: 'get',
url:`/api/device/query/devices`,
url:`./api/device/query/devices`,
params: {
page: currentPage,
count: count
@@ -25,7 +25,7 @@ class DeviceService{
getDevice(deviceId, callback, errorCallback){
this.$axios({
method: 'get',
url:`/api/device/query/devices/${deviceId}`,
url:`./api/device/query/devices/${deviceId}`,
}).then((res) => {
if (typeof (callback) == "function") callback(res.data)
}).catch((error) => {
@@ -82,7 +82,7 @@ class DeviceService{
getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, callback, errorCallback) {
this.$axios({
method: 'get',
url: `/api/device/query/devices/${deviceId}/channels`,
url: `./api/device/query/devices/${deviceId}/channels`,
params:{
page: currentPage,
count: count,
@@ -121,7 +121,7 @@ class DeviceService{
getSubChannel(isCatalog, deviceId, channelId, currentPage, count, callback, errorCallback) {
this.$axios({
method: 'get',
url: `/api/device/query/sub_channels/${deviceId}/${channelId}/channels`,
url: `./api/device/query/sub_channels/${deviceId}/${channelId}/channels`,
params:{
page: currentPage,
count: count,
@@ -161,7 +161,7 @@ class DeviceService{
}
this.$axios({
method: 'get',
url: `/api/device/query/tree/${deviceId}`,
url: `./api/device/query/tree/${deviceId}`,
params:{
page: currentPage,
count: count,

14
web_src/src/components/service/MediaServer.js
View File

@@ -9,7 +9,7 @@ class MediaServer{
getOnlineMediaServerList(callback){
this.$axios({
method: 'get',
url:`/api/server/media_server/online/list`,
url:`./api/server/media_server/online/list`,
}).then((res) => {
if (typeof (callback) == "function") callback(res.data)
}).catch((error) => {
@@ -19,7 +19,7 @@ class MediaServer{
getMediaServerList(callback){
this.$axios({
method: 'get',
url:`/api/server/media_server/list`,
url:`./api/server/media_server/list`,
}).then(function (res) {
if (typeof (callback) == "function") callback(res.data)
}).catch(function (error) {
@@ -30,7 +30,7 @@ class MediaServer{
getMediaServer(id, callback){
this.$axios({
method: 'get',
url:`/api/server/media_server/one/` + id,
url:`./api/server/media_server/one/` + id,
}).then(function (res) {
if (typeof (callback) == "function") callback(res.data)
}).catch(function (error) {
@@ -41,7 +41,7 @@ class MediaServer{
checkServer(param, callback){
this.$axios({
method: 'get',
url:`/api/server/media_server/check`,
url:`./api/server/media_server/check`,
params: {
ip: param.ip,
port: param.httpPort,
@@ -57,7 +57,7 @@ class MediaServer{
checkRecordServer(param, callback){
this.$axios({
method: 'get',
url:`/api/server/media_server/record/check`,
url:`./api/server/media_server/record/check`,
params: {
ip: param.ip,
port: param.recordAssistPort
@@ -72,7 +72,7 @@ class MediaServer{
addServer(param, callback){
this.$axios({
method: 'post',
url:`/api/server/media_server/save`,
url:`./api/server/media_server/save`,
data: param
}).then(function (res) {
if (typeof (callback) == "function") callback(res.data)
@@ -84,7 +84,7 @@ class MediaServer{
delete(id, callback) {
this.$axios({
method: 'delete',
url:`/api/server/media_server/delete`,
url:`./api/server/media_server/delete`,
params: {
id: id
}