增加rtmp播放
This commit is contained in:
@ -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;
|
||||
|
||||
|
||||
@ -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) => {
|
||||
|
||||
@ -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("视频已打开");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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">
|
||||
|
||||
Reference in New Issue
Block a user