From cf991171e699d4e09185419fa45de25d486910d8 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 25 Mar 2024 11:47:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +-
 .../elevatorMonitoring/eleMonitor.vue         | 16 +++----
 src/views/sevenLargeScreen/indexL.vue         |  2 +-
 .../erectCrane/gantry-video.vue               | 10 ++---
 .../gantryCrane/gantry-video.vue              | 14 +++---
 .../towerCraneMonitoring/monitor.vue          | 14 +++---
 .../videoManagement/index.vue                 | 44 ++++++++++---------
 7 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/.env.development b/.env.development
index 1cb52ab..4367518 100644
--- a/.env.development
+++ b/.env.development
@@ -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='
diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue b/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue
index bba4c25..3c857da 100644
--- a/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue
+++ b/src/views/sevenLargeScreen/elevatorMonitoring/eleMonitor.vue
@@ -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;
diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index ce7b343..1ce7889 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -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> -->
diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue
index e492ae3..53ee743 100644
--- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/gantry-video.vue
@@ -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 = () => {
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue
index e492ae3..0e44dca 100644
--- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/gantry-video.vue
@@ -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 = () => {
diff --git a/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue b/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue
index 182b46b..8a3d3f8 100644
--- a/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue
+++ b/src/views/sevenLargeScreen/towerCraneMonitoring/monitor.vue
@@ -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 = () => {
diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue
index 85d1bf5..876d193 100644
--- a/src/views/sevenLargeScreen/videoManagement/index.vue
+++ b/src/views/sevenLargeScreen/videoManagement/index.vue
@@ -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;