diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index b8e0feb1..3ba3bb99 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -88,6 +88,10 @@ export default { handleCleared() { const { mapIns } = this.getMap(); + this.layerData.forEach(({ children }) => { + children.forEach(item => item.status = "") + }); + if (!mapIns) return; // mapIns.clearMap(); @@ -143,6 +147,7 @@ export default { .RoadAndEvents { width: 100%; background: url("~@screen/images/bg/box_bg_002.png") no-repeat; + // clip-path: polygon(13% 0, 87% 0, 100% 14%, 100% 85%, 85% 100%, 11% 100%, 0 87%, 0 15%); background-size: 100% 100%; position: relative; display: flex; @@ -152,18 +157,20 @@ export default { overflow: hidden; .tabs-content { - display: grid; margin-top: 15px; margin-bottom: 6px; + display: grid; grid-template-columns: repeat(5, 1fr); - grid-template-rows: repeat(3, 66px); + // grid-template-rows: repeat(3, 1fr); flex: 1; + max-height: 100%; overflow: auto; position: relative; gap: 6px; .device-item { - position: absolute; + // position: absolute; + position: relative; width: 70px; cursor: pointer; display: flex; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js index eff0bc97..fee72b01 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js @@ -52,6 +52,8 @@ export const eventMap = { mapIns.add(layer); + const fitViewOverlays = []; + [ { camLong: 116.471814, @@ -95,6 +97,8 @@ export const eventMap = { }, }); + fitViewOverlays.push(labelMarker); + labelMarker.on("click", (e) => { this.cameraDialogConfig = { // 0 有(球机) 1 ⽆(枪机) @@ -106,7 +110,7 @@ export const eventMap = { layer.add(labelMarker); }); - mapIns.setFitView(); + mapIns.setFitView(fitViewOverlays, false, [360, 360, 360, 360]); }, async "路测设备/摄像机_close"() { cacheData.DriveTestEquipment_Camera?.clear(); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue index 92e95143..b19b379e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue @@ -18,7 +18,8 @@