diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue index b671f1d5..80249a7f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue @@ -24,7 +24,7 @@
- diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue index 7aa8d3c7..a4b15945 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue @@ -24,7 +24,7 @@ import { HttpLivePlayer, openLiveVideo } from "./videoStream.js" import { find } from "lodash" import { - getNearCameraNew, + getNearCameraNew,getNearCameraNewStation, } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"; import CameraControlDialog from "@screen/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue"; @@ -35,6 +35,11 @@ export default { }, props: { + // + facilityType:{ + type: String, + default:null + }, // 桩号 pileNum: { type: String, @@ -84,8 +89,13 @@ export default { }, async playVideo() { this.player?.destroy(); - - let { code, data } = await getNearCameraNew(this.pileNum).catch(() => ({})); + let reqCamrea = null; + if(facilityType && facilityType === 1){ //收费站单独处理 + reqCamrea = await getNearCameraNewStation(this.pileNum).catch(() => ({})); + } else { + reqCamrea = await getNearCameraNew(this.pileNum).catch(() => ({})); + } + let { code, data } = reqCamrea; if ( code != 200 || (Array.isArray(data) ? !data?.length : !Object.keys(data || {}).length) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue index 26d9933c..163a0a7d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue @@ -7,7 +7,7 @@
-
@@ -117,7 +117,8 @@ export default { // 收费站 isCameraMap:false, imgSrc:'', - cameraMaps:[] + cameraMaps:[], + facilityType: '' }; }, watch: { @@ -188,6 +189,7 @@ export default { this.isCameraMap = false; this.cameraMaps = []; if(dData.facilityType === 1){ + this.facilityType = 1; // console.log('收费站单独处理图像') if(dData.facilityName === '大学城收费站'){ this.imgSrc = require('@screen/images/shoufeiz/大学城收费站.jpg') diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index 800ceec0..64a72856 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -48,6 +48,15 @@ export function getNearCamera(pileNum) { }); } +export function getNearCameraNewStation(pileNum) { + return request({ + url: "/video/tollStationList", + method: "get", + params: { + pileNum, + }, + }); +} export function getNearCameraNew(pileNum) { return request({ url: "/video/nearCamPileNum",