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

fix:修改合肥启程临边不显示问题，以及为视频监控增加新字段判断

Browse Source
This commit is contained in:
Vce 2024-05-05 01:44:26 +08:00
parent f327cd90c9
commit 26846e6d7b
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/routers/modules/staticRouter.ts
View File

@ -130,11 +130,11 @@ export const staticRouter: RouteRecordRaw[] = [
name: "外墙脚手架监测", name: "外墙脚手架监测",
component: () => import("@/views/sevenLargeScreen/safetyManagement/wallScaffold/wallScaffold.vue") component: () => import("@/views/sevenLargeScreen/safetyManagement/wallScaffold/wallScaffold.vue")
}, },
// { {
// path: "/edgeProtection2", path: "/edgeProtection2",
// name: "临边防护", name: "临边防护",
// component: () => import("@/views/sevenLargeScreen/safetyManagement/edgeProtection/index_wdzs.vue") component: () => import("@/views/sevenLargeScreen/safetyManagement/edgeProtection/index_wdzs.vue")
// }, },
{ {
path: "/toxicGasMonitor", path: "/toxicGasMonitor",
name: "有毒气体监测", name: "有毒气体监测",

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

@ -161,10 +161,18 @@ const getVideoList = async () => {
}); });
shipinList.value = res.result.videoList; shipinList.value = res.result.videoList;
if(res.result.videoList[0].list){ if(res.result.videoList[0].list){
if(!res.result.videoList[0].list[0]?.outip){
objData.value.appkey = res.result.videoList[0].list[0].appId; objData.value.appkey = res.result.videoList[0].list[0].appId;
objData.value.ip = res.result.videoList[0].list[0].account; objData.value.ip = res.result.videoList[0].list[0].account;
objData.value.secret = res.result.videoList[0].list[0].appSecret; objData.value.secret = res.result.videoList[0].list[0].appSecret;
objData.value.port = +res.result.videoList[0].list[0].password; 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; cameraIndexCode.value = res.result.videoList[0].list[0].serialNumber;
// firstVideoId.value = res.result.videoList[0].serialNumber; // firstVideoId.value = res.result.videoList[0].serialNumber;
// previewVideo(res.result.videoList[0].list[0].serialNumber); // previewVideo(res.result.videoList[0].list[0].serialNumber);
@ -180,10 +188,18 @@ const getVideoList = async () => {
oWebControl.JS_Disconnect(); oWebControl.JS_Disconnect();
} }
} else { } else {
if(!res.result.videoList[0].list[0]?.outip){
objData.value.appkey = res.result.videoList[0].appId; objData.value.appkey = res.result.videoList[0].appId;
objData.value.ip = res.result.videoList[0].account; objData.value.ip = res.result.videoList[0].account;
objData.value.secret = res.result.videoList[0].appSecret; objData.value.secret = res.result.videoList[0].appSecret;
objData.value.port = +res.result.videoList[0].password; 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; cameraIndexCode.value = res.result.videoList[0].serialNumber;
// firstVideoId.value = res.result.videoList[0].serialNumber; // firstVideoId.value = res.result.videoList[0].serialNumber;
// previewVideo(res.result.videoList[0].list[0].serialNumber); // previewVideo(res.result.videoList[0].list[0].serialNumber);