fengsen/4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加rtmp播放

Browse Source
This commit is contained in:
zh
2025-11-17 17:09:02 +08:00
parent 2c83d29ce6
commit 1e1725bf82
20 changed files with 3529 additions and 5896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/back/ipcMain.js
View File

@ -86,8 +86,8 @@ export default {
"1300",
"-y",
"730",
"-rtsp_transport",
"tcp",
// "-rtsp_transport",
// "tcp",
obj.url,
],
{
@ -99,6 +99,9 @@ export default {
console.log("out");
console.log(err);
e.sender.send("openFFPlayOut", err);
if(obj.id) {
e.sender.send("openFFPlayOut_"+obj.id, err, obj.id);
}
});
/* .on("stdout", function(err, m) {

4
src/renderer/components/LeftMenu/firstMenu.vue
View File

@ -141,7 +141,7 @@ export default {
break
}*/
let menusHeight = this.menuList.length * 65 + "px";
let height = this.menuList.length * 65 + 30 + "px";
let height = this.menuList.length * 65 + 40 + "px";
$(".leftBox")[0].style.height = height;
$(".left .menus")[0].style.height = menusHeight;
@ -268,7 +268,7 @@ export default {
/* bottom: 10vh;
padding: 35px 10px 15px 0;*/
height: 350px;
margin-top: 20px;
margin-top: 25px;
//align-self: center;
padding: 0 8px 0 5px;

2
src/renderer/components/LeftMenu/secondMenuFun.js
View File

@ -1461,7 +1461,7 @@ const secondMenuFun = {
window.clicknum = 0;
let host = new URL(getIP()).host;
let routePlanning = new YJ.Obj.RoutePlanning(window.Earth1, {
gps: true,
gps: false,
host,
});
routePlanning.Dialog.queryCallBack = async (v) => {

41
src/renderer/components/Tree/entityClick.js
View File

@ -74,6 +74,11 @@ function leftClick(nodes) {
? node.detail.attribute.vr.content
: []
: [],
rtmp: node.detail.attribute
? node.detail.attribute.rtmp
? node.detail.attribute.rtmp.content
: []
: [],
goods: node.detail.attribute
? node.detail.attribute.goods
? node.detail.attribute.goods.content
@ -100,6 +105,7 @@ function leftClick(nodes) {
!node.detail.richTextContent &&
(!info.hrefs || !info.hrefs.length) &&
(!info.vr || !info.vr.length) &&
(!info.rtmp || !info.rtmp.length) &&
(!info.goods || !info.goods.length) &&
(!info.camera || !info.camera.length)
) {
@ -183,6 +189,41 @@ function leftClick(nodes) {
}
//if (info.type == "vr")
}
if (info.rtmp && info.rtmp.length) {
let isExistent = false
let isNoExistent = false
for(let i=0;i<info.rtmp.length;i++) {
if(!window._winMap.has(info.rtmp[i].id)) {
isNoExistent = true
window._winMap.set(info.rtmp[i].id, info.rtmp[i].id);
$root_home.$sendElectronChanel("openFFPlay", {
id: info.rtmp[i].id,
url: info.rtmp[i].url,
name: info.rtmp[i].name,
});
$root_home.$recvElectronChanel(
"openFFPlayOut_"+info.rtmp[i].id,
(e, err, id) => {
if (err) {
$root_home.$message.error("视频流错误，打开失败！");
}
if(id) {
window._winMap.delete(id);
}
}
);
}
else {
isExistent = true
}
}
if(isNoExistent) {
$root_home.$message.success("视频流打开中请稍后");
}
if(isExistent) {
$root_home.$message.info("视频已打开");
}
}
}
}
}

4
src/renderer/components/myHeaderAll/systemPopup/systemPopup.vue
View File

@ -220,7 +220,7 @@
</div>
</el-tab-pane>
<!-- 头部设置 -->
<!-- <el-tab-pane :label="$t('headerTitles.Header.title')" class="headerTab">
<el-tab-pane :label="$t('headerTitles.Header.title')" class="headerTab">
<el-dialog :visible.sync="headerAddDialogVisible" :modal="false" :title="$t('headerTitles.Header.add')"
width="100%" style="width: 680px; height: 420px;" center :before-close="headerAddClose">
<div style="display: flex;align-items: center;margin: 10px 0;">
@ -297,7 +297,7 @@
:page-size="paginationHeader.pageSize" layout="total, sizes, prev, pager, next, jumper"
:total="paginationHeader.total"/>
</div>
</el-tab-pane> -->
</el-tab-pane>
<!-- 卫星状态 -->
<!-- <el-tab-pane :label="$t('headerTitles.Satellite')">
<div class="auth_info custom_scroll_bar content_h">

19
src/renderer/icons/svg/firstMenu_x/leftMenuBg9.svg Normal file
View File

@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="110" height="615" viewBox="0 0 110 615">
<defs>
<style>
.cls-1, .cls-2 {
fill-rule: evenodd;
}
.cls-1 {
opacity: 0.5;
}
.cls-2 {
fill: aqua;
}
</style>
</defs>
<path id="bg" class="cls-1" d="M5.777,1h96.477l7.111,27.415V588.474L103.234,610.7H4.972L0,588.474V28.415Z"/>
<path id="形状_1" data-name="形状 1" class="cls-2" d="M27.359,610.951H5l-5-22.7V26.932l0.019-.088L5.811,0.572H30.528V2.235H7.152L1.668,27.112V588.07l4.675,21.217H27.359v1.664Zm77.643,0H82.645v-1.664h21.016l4.674-21.217V27.112L102.851,2.235H79.475V0.572h24.718L110,26.932V588.25l-0.019.089Zm-4.107-6.332H77.307v-1.331H99.761L104,588.216V27.185L98.924,6.643H10.679L6.006,27.185V561.959H4.671V27.185H4.688L9.617,5.313H99.9l5.432,21.872-0.008,561.193ZM33.472,0h1.891L33.981,2.734H32.074Zm4.29,0h1.891L38.271,2.734H36.364Zm4.29,0h1.892L42.561,2.734H40.654Zm4.29,0h1.892L46.852,2.734H44.944Zm4.29,0h1.891L51.142,2.734H49.234Zm4.29,0h1.892L55.432,2.734H53.525Zm4.29,0H61.1L59.722,2.734H57.815ZM63.5,0h1.891L64.012,2.734H62.1Zm4.29,0h1.891L68.3,2.734H66.395Zm4.29,0h1.892L72.592,2.734H70.685Zm4.29,0h1.892L76.882,2.734H74.975ZM48.862,16V15.9H38.812V11.647h9.95V16h0.1v0h0.1v-4.55H38.613V16.1H48.961V16h-0.1ZM81.5,16V15.9H71.451V11.647H81.4V16h0.1v0h0.1v-4.55H71.251V16.1H81.6V16H81.5Zm-21.759.254H49.592V11.294H59.741v4.958Zm10.879,0H60.472V11.294H70.62v4.958Zm21.759,0H82.23V11.294H92.379v4.958ZM20.3,29.308A10.544,10.544,0,1,1,30.873,18.764,10.57,10.57,0,0,1,20.3,29.308Zm0-20.138a9.595,9.595,0,1,0,9.621,9.595A9.619,9.619,0,0,0,20.3,9.17Zm0,16.44a6.845,6.845,0,1,1,6.864-6.845A6.862,6.862,0,0,1,20.3,25.609Zm0-13.216a6.371,6.371,0,1,0,6.388,6.371A6.387,6.387,0,0,0,20.3,12.394Zm4.263,4.852a2.736,2.736,0,1,1-2.736-2.729A2.733,2.733,0,0,1,24.563,17.245Zm-5.68,7.149a1.649,1.649,0,1,1,1.654-1.65A1.654,1.654,0,0,1,18.884,24.394Zm0-2.824a1.175,1.175,0,1,0,1.178,1.175A1.178,1.178,0,0,0,18.884,21.57ZM16.608,604.192a7.5,7.5,0,1,1,7.519-7.5A7.517,7.517,0,0,1,16.608,604.192Zm0-14.321a6.823,6.823,0,1,0,6.842,6.823A6.841,6.841,0,0,0,16.608,589.871Zm0,11.691a4.868,4.868,0,1,1,4.881-4.868A4.881,4.881,0,0,1,16.608,601.562Zm0-9.4a4.531,4.531,0,1,0,4.543,4.53A4.542,4.542,0,0,0,16.608,592.164Zm3.032,3.45a1.946,1.946,0,1,1-1.946-1.941A1.944,1.944,0,0,1,19.64,595.614ZM15.6,600.7a1.173,1.173,0,1,1,1.176-1.173A1.176,1.176,0,0,1,15.6,600.7Zm0-2.009a0.836,0.836,0,1,0,.838.836A0.838,0.838,0,0,0,15.6,598.689ZM10.619,586.03h2.238l3.552-3.382,3.868,3.382H22.6L16.408,580.6Zm5.79-9.49-5.79,5.425h2.238l3.552-3.381,3.868,3.381H22.6l-6.189-5.425m0-4.065-5.79,5.426h2.238l3.552-3.382,3.868,3.382H22.6l-6.189-5.426m0-4.064-5.79,5.426h2.238l3.552-3.383,3.868,3.383H22.6l-6.189-5.426m0-4.065-5.79,5.426h2.238l3.552-3.382,3.868,3.382H22.6l-6.189-5.426m12.586,42.485v1.5l2.278,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.278,1.952-2.278,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.474,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.278,1.952-2.278,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.474,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.277,1.952-2.277,2.165V614l3.654-3.719Zm3.475,0v1.5l2.278,1.952-2.278,2.165V614l3.654-3.719Zm3.475,0v1.5l2.278,1.952-2.278,2.165V614l3.654-3.719Z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

4
src/renderer/views/dashboard/index.vue
View File

@ -249,7 +249,7 @@
</template>
<template v-else> -->
<div id="goodSearchEchart"></div>
<!-- <div style="height: 60px;position: relative;">
<div style="height: 60px;position: relative;">
<el-button class="export-btn" style="
background: rgba(var(--color-sdk-base-rgb), 0.2);
border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5);
@ -258,7 +258,7 @@
right: 20px;
bottom: 20px;
">导出Excel</el-button>
</div> -->
</div>
<!-- </template> -->
</div>
</div>