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

Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
This commit is contained in:
648540858
2022-07-12 16:28:51 +08:00
parent 5364db2982 0b1cae75fe
commit 66e6756909
66 changed files with 1614 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@ export default {
this.getListLoading = true;
this.$axios({
method: 'get',
url: '/api/media/stream_info_by_app_and_stream',
url: '/api/push/getPlayUrl',
params: {
app: row.app,
stream: row.stream,

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

@@ -87,7 +87,7 @@
<el-divider direction="vertical"></el-divider>
<el-button size="medium" icon="el-icon-switch-button" type="text" v-if="scope.row.enable" @click="stop(scope.row)">停用</el-button>
<el-divider direction="vertical"></el-divider>
<el-button size="medium" icon="el-icon-check" type="text" :loading="startBtnLaoding" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
<el-button size="medium" icon="el-icon-check" type="text" :loading="scope.row.startBtnLoading" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
<el-divider v-if="!scope.row.enable" direction="vertical"></el-divider>
<el-button size="medium" icon="el-icon-delete" type="text" style="color: #f56c6c" @click="deleteStreamProxy(scope.row)">删除</el-button>
</template>
@@ -132,7 +132,7 @@
count:15,
total:0,
getListLoading: false,
startBtnLaoding: false
startBtnLoading: false
};
},
computed: {
@@ -169,7 +169,10 @@
}
}).then(function (res) {
that.total = res.data.total;
that.streamProxyList = res.data.list;
for (let i = 0; i < res.data.list.length; i++) {
res.data.list[i]["startBtnLoading"] = false;
}
that.streamProxyList = res.data.list;
that.getListLoading = false;
}).catch(function (error) {
console.log(error);
@@ -263,7 +266,7 @@
start: function(row){
let that = this;
this.getListLoading = true;
this.startBtnLaoding = true;
this.$set(row, 'startBtnLoading', true)
this.$axios({
method: 'get',
url:`/api/proxy/start`,
@@ -273,7 +276,7 @@
}
}).then(function (res) {
that.getListLoading = false;
that.startBtnLaoding = false;
that.$set(row, 'startBtnLoading', false)
if (res.data == "success"){
that.initData()
}else {
@@ -287,7 +290,7 @@
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
that.startBtnLaoding = false;
that.$set(row, 'startBtnLoading', false)
});
},
stop: function(row){

8
web_src/src/components/common/MapComponent.vue
View File

@@ -11,6 +11,7 @@ import VectorSource from 'ol/source/Vector';
import Tile from 'ol/layer/Tile';
import VectorLayer from 'ol/layer/Vector';
import Style from 'ol/style/Style';
import Stroke from 'ol/style/Stroke';
import Icon from 'ol/style/Icon';
import View from 'ol/View';
import Feature from 'ol/Feature';
@@ -230,7 +231,12 @@ export default {
}
let line = new LineString(points)
let lineFeature = new Feature(line);
lineFeature.setStyle(new Style({
stroke: new Stroke({
width: 4 ,
color: "#0c6d6a",
})
}))
let source = new VectorSource();
source.addFeature(lineFeature);
let vectorLayer = new VectorLayer({

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

@@ -10,8 +10,8 @@
@close="close()"
>
<div v-loading="isLoging">
<el-date-picker v-model="searchFrom" type="datetime" placeholder="选择开始日期时间" default-time="00:00:00" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker>
<el-date-picker v-model="searchTo" type="datetime" placeholder="选择结束日期时间" default-time="00:00:00" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker>
<el-date-picker v-model="searchFrom" type="datetime" placeholder="选择开始日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker>
<el-date-picker v-model="searchTo" type="datetime" placeholder="选择结束日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker>
<el-button icon="el-icon-search" size="mini" type="primary" @click="onSubmit">查询</el-button>
</div>
@@ -72,7 +72,11 @@ export default {
onSubmit: function () {
console.log("onSubmit");
this.isLoging = true;
this.$axios.get(`/api/position/history/${this.channel.deviceId}/${this.channel.channelId}`, {
let url = `/api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`;
if (this.channel.channelId) {
url+="&channelId=${this.channel.channelId}"
}
this.$axios.get(url, {
}).then((res)=> {
this.isLoging = false;
if (typeof this.callback == "function") {

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

@@ -186,6 +186,14 @@ export default {
this.deviceService.getAllSubChannel(false, data.deviceId, data.channelId, this.channelsHandler)
}
}
},
{
label: "查询轨迹",
icon: "el-icon-map-location",
disabled: false,
onClick: () => {
this.getTrace(data)
}
}
],
event, // 鼠标事件信息
@@ -320,8 +328,8 @@ export default {
} else {
let positions = [];
for (let i = 0; i < channelPositions.length; i++) {
if (channelPositions[i].cnLng * channelPositions[i].cnLat > 0) {
positions.push([channelPositions[i].cnLng, channelPositions[i].cnLat])
if (channelPositions[i][this.longitudeStr] * channelPositions[i][this.latitudeStr] > 0) {
positions.push([channelPositions[i][this.longitudeStr], channelPositions[i][this.latitudeStr]])
}
}

12
web_src/src/layout/UiHeader.vue
View File

@@ -13,17 +13,20 @@
<el-menu-item index="/cloudRecord">云端录像</el-menu-item>
<el-menu-item index="/mediaServerManger">节点管理</el-menu-item>
<el-menu-item index="/parentPlatformList/15/1">国标级联</el-menu-item>
<el-menu-item @click="openDoc">在线文档</el-menu-item>
<!-- <el-submenu index="/setting">-->
<!-- <template slot="title">系统设置</template>-->
<!-- <el-menu-item index="/setting/web">WEB服务</el-menu-item>-->
<!-- <el-menu-item index="/setting/sip">国标服务</el-menu-item>-->
<!-- <el-menu-item index="/setting/media">媒体服务</el-menu-item>-->
<!-- </el-submenu>-->
<el-switch v-model="alarmNotify" active-text="报警信息推送" @change="alarmNotifyChannge"></el-switch>
<!-- <el-menu-item style="float: right;" @click="loginout">退出</el-menu-item>-->
<el-submenu index="" style="float: right;">
<template slot="title">欢迎，{{ this.$cookies.get("session").username }}</template>
<el-menu-item @click="openDoc">在线文档</el-menu-item>
<el-menu-item >
<el-switch v-model="alarmNotify" inactive-text="报警信息推送" @change="alarmNotifyChannge"></el-switch>
</el-menu-item>
<el-menu-item @click="changePassword">修改密码</el-menu-item>
<el-menu-item @click="loginout">注销</el-menu-item>
</el-submenu>
@@ -145,7 +148,10 @@ export default {
</script>
<style>
#UiHeader .el-switch__label {
color: white;
color: white ;
}
.el-menu--popup .el-menu-item .el-switch .el-switch__label {
color: white !important;
}
#UiHeader .el-switch__label.is-active{
color: #409EFF;