admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-03-25 11:47:22 +08:00
parent 8cea1162bd
commit cf991171e6
7 changed files with 48 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -13,9 +13,9 @@ NODE_ENV = 'development'
# 沈阳合盈线上
# VITE_API_URL = "http://101.43.164.214:45022"
# 演示平台
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 百色七参数线上地址
VITE_API_URL = 'http://101.43.164.214:11111'
# VITE_API_URL = 'http://101.43.164.214:11111'
# 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

16
src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue
View File

@ -107,15 +107,12 @@ onMounted(async () => {
});
onBeforeUnmount(() => {
if (oWebControl.value === undefined) {
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
}
});
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
const initPlugin = () => {
oWebControl = new WebControl({
@ -295,7 +292,6 @@ const previewVideo = (data: string | null) => {
};
</script>
<style lang="scss" scoped>
.main {
border-radius: 8px;

2
src/views/sevenLargeScreen/indexL.vue
View File

@ -1,5 +1,5 @@
<template>
<ScaleBox :width="1920" :height="1080" bgc="transparent" :delay="100" :isFlat="false" @scaleChange="scaleChange" v-show="false">
<ScaleBox :width="1920" :height="1080" bgc="transparent" :delay="100" :isFlat="false" @scaleChange="scaleChange">
<div class="largeScreen" ref="dataScreenRef">
<div class="header">
<!-- <div class="hearderIcon"><img src="@/assets/images/jxjLogo.png" alt="" /></div> -->

10
src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue
View File

@ -107,14 +107,12 @@ onMounted(async () => {
});
onBeforeUnmount(() => {
if (oWebControl.value === undefined) {
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
}
oWebControl.JS_Disconnect();
});
const initPlugin = () => {

14
src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue
View File

@ -107,14 +107,12 @@ onMounted(async () => {
});
onBeforeUnmount(() => {
if (oWebControl.value === undefined) {
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
}
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
});
const initPlugin = () => {

14
src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue
View File

@ -149,14 +149,12 @@ onMounted(async () => {
});
onBeforeUnmount(() => {
if (oWebControl.value === undefined) {
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
}
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
});
const initPlugin = () => {

44
src/views/sevenLargeScreen/videoManagement/index.vue
View File

@ -4,7 +4,15 @@
<div class="videoListBig">
<Card title="监控设备列表">
<el-scrollbar style="height: 100%">
<el-tree ref="treeRef" default-expand-all icon="ArrowRight" :data="shipinList" node-key="name" :props="defaultProps" @node-click="checkVideo">
<el-tree
ref="treeRef"
default-expand-all
icon="ArrowRight"
:data="shipinList"
node-key="name"
:props="defaultProps"
@node-click="checkVideo"
>
</el-tree>
<!-- <div class="decivList">
<div
@ -40,11 +48,7 @@
</div>
<!-- 播放海康 -->
<div ref="playWndBox" style="width: 90%; height: 100%; margin: 0 5% 2% 5%">
<div
id="playWnd"
class="playWnd"
style="width: 100%;height: 100%;"
></div>
<div id="playWnd" class="playWnd" style="width: 100%; height: 100%"></div>
<!-- :style="{
height: playWndHeight + 'px',
width: playWndWidth + 'px'
@ -113,7 +117,7 @@ let objData = ref({
//设备列表的点击操作
const checkVideo = async (item: any) => {
// 避免点击父节点导致无法出现视频
if(item.serialNumber){
if (item.serialNumber) {
ysyParams.value = item;
cameraIndexCode.value = item.serialNumber;
if (videoType.value !== 1) {
@ -184,14 +188,12 @@ onMounted(async () => {
});
onBeforeUnmount(() => {
if (oWebControl.value === undefined) {
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
}
// 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
oWebControl.JS_HideWnd();
// 销毁当前播放的视频
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
// 断开与插件服务连接
oWebControl.JS_Disconnect();
});
const initPlugin = () => {
@ -481,12 +483,12 @@ const previewVideo = (data: string | null) => {
.el-tree {
background-color: transparent;
}
.el-tree>.el-tree-node:focus > .el-tree-node__content {
.el-tree > .el-tree-node:focus > .el-tree-node__content {
// background-color: #141E2B;
background: url("@/assets/images/dustNoise/listImg.png") no-repeat;
background-size: 100% 100%;
}
.el-tree>.el-tree-node>.el-tree-node__content {
.el-tree > .el-tree-node > .el-tree-node__content {
// background-color: #141E2B;
background: url("@/assets/images/dustNoise/listImg.png") no-repeat;
background-size: 100% 100%;
@ -499,20 +501,20 @@ const previewVideo = (data: string | null) => {
.el-tree-node__children .el-tree-node {
margin-top: 3%;
}
.el-tree>.el-tree-node>.el-tree-node__content:hover {
.el-tree > .el-tree-node > .el-tree-node__content:hover {
// background-color: #141E2B;
background: url("@/assets/images/dustNoise/listImg.png") no-repeat;
background-size: 100% 100%;
}
.el-tree-node__label{
.el-tree-node__label {
color: white;
font-size: 16px;
margin-bottom: 1px;
}
.el-tree>.el-tree-node>.el-tree-node__content>.el-tree-node__label {
.el-tree > .el-tree-node > .el-tree-node__content > .el-tree-node__label {
margin-left: 8%;
}
.el-tree>.el-tree-node>.el-tree-node__content>.el-tree-node__expand-icon {
.el-tree > .el-tree-node > .el-tree-node__content > .el-tree-node__expand-icon {
color: white;
font-size: 16px;
position: absolute;