From 26846e6d7b1a2346aff449b7e24cb9ff349059d0 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sun, 5 May 2024 01:44:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=90=88=E8=82=A5?=
 =?UTF-8?q?=E5=90=AF=E7=A8=8B=E4=B8=B4=E8=BE=B9=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=B8=BA=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E7=9B=91=E6=8E=A7=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routers/modules/staticRouter.ts           | 10 +++---
 .../videoManagement/index.vue                 | 32 ++++++++++++++-----
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts
index 93a541cd..09a23d50 100644
--- a/src/routers/modules/staticRouter.ts
+++ b/src/routers/modules/staticRouter.ts
@@ -130,11 +130,11 @@ export const staticRouter: RouteRecordRaw[] = [
 				name: "外墙脚手架监测",
 				component: () => import("@/views/sevenLargeScreen/safetyManagement/wallScaffold/wallScaffold.vue")
 			},
-			// {
-			// 	path: "/edgeProtection2",
-			// 	name: "临边防护",
-			// 	component: () => import("@/views/sevenLargeScreen/safetyManagement/edgeProtection/index_wdzs.vue")
-			// },
+			{
+				path: "/edgeProtection2",
+				name: "临边防护",
+				component: () => import("@/views/sevenLargeScreen/safetyManagement/edgeProtection/index_wdzs.vue")
+			},
 			{
 				path: "/toxicGasMonitor",
 				name: "有毒气体监测",
diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue
index 057ff771..09318488 100644
--- a/src/views/sevenLargeScreen/videoManagement/index.vue
+++ b/src/views/sevenLargeScreen/videoManagement/index.vue
@@ -161,10 +161,18 @@ const getVideoList = async () => {
 	});
 	shipinList.value = res.result.videoList;
 	if(res.result.videoList[0].list){
-		objData.value.appkey = res.result.videoList[0].list[0].appId;
-		objData.value.ip = res.result.videoList[0].list[0].account;
-		objData.value.secret = res.result.videoList[0].list[0].appSecret;
-		objData.value.port = +res.result.videoList[0].list[0].password;
+		if(!res.result.videoList[0].list[0]?.outip){
+			objData.value.appkey = res.result.videoList[0].list[0].appId;
+			objData.value.ip = res.result.videoList[0].list[0].account;
+			objData.value.secret = res.result.videoList[0].list[0].appSecret;
+			objData.value.port = +res.result.videoList[0].list[0].password;
+		}else{
+			objData.value.appkey = res.result.videoList[0].list[0].appId;
+			objData.value.ip = res.result.videoList[0].list[0].outip;
+			objData.value.secret = res.result.videoList[0].list[0].appSecret;
+			objData.value.port = +res.result.videoList[0].list[0].outport;	
+		}
+		
 		cameraIndexCode.value = res.result.videoList[0].list[0].serialNumber;
 		// firstVideoId.value = res.result.videoList[0].serialNumber;
 		// previewVideo(res.result.videoList[0].list[0].serialNumber);
@@ -180,10 +188,18 @@ const getVideoList = async () => {
 			oWebControl.JS_Disconnect();
 		}
 	} else {
-		objData.value.appkey = res.result.videoList[0].appId;
-		objData.value.ip = res.result.videoList[0].account;
-		objData.value.secret = res.result.videoList[0].appSecret;
-		objData.value.port = +res.result.videoList[0].password;
+		if(!res.result.videoList[0].list[0]?.outip){
+			objData.value.appkey = res.result.videoList[0].appId;
+			objData.value.ip = res.result.videoList[0].account;
+			objData.value.secret = res.result.videoList[0].appSecret;
+			objData.value.port = +res.result.videoList[0].password;
+		}else{
+			objData.value.appkey = res.result.videoList[0].appId;
+			objData.value.ip = res.result.videoList[0].outip;
+			objData.value.secret = res.result.videoList[0].appSecret;
+			objData.value.port = +res.result.videoList[0].outport;
+		}
+		
 		cameraIndexCode.value = res.result.videoList[0].serialNumber;
 		// firstVideoId.value = res.result.videoList[0].serialNumber;
 		// previewVideo(res.result.videoList[0].list[0].serialNumber);