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);