From 524168d5025442833395dffa2a32fd6d28312c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Tue, 7 May 2024 15:29:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/VideoMulti/index.vue | 1 - .../components/RoadAndEvents/utils/map.js | 2 - .../CrowdnessIndicatorRankings/index.vue | 52 ++++++++++++++++++- .../Cards/EventInformation/index.vue | 4 +- .../control/event/commandDispatch/index.vue | 7 +-- 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue index 1ba9e629..6dc49afb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue @@ -83,7 +83,6 @@ export default { } if (data[this.rangeIndex]) { this.urls = data[this.rangeIndex] - console.log(data[this.rangeIndex][0], this.rangeIndex, 'xxxx'); const firstItem = data[this.rangeIndex]?.[0] || {}; this.cameraId = firstItem['iotDeviceId']; this.dialogData = { ...firstItem, parseOtherConfig: firstItem.otherConfig && JSON.parse(firstItem.otherConfig) } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js index 8775cb68..47cda01e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js @@ -504,7 +504,6 @@ export function marksAddInGraph(data) { export function addInGraphHandle(data) { const graphInstance = window.graphInstance; const extData = data[0].extData; - // console.log(extData, "extData11111"); const { item: eventItem } = data[0].config; if (eventItem.id.match(eventRegex)) { let { stakeMark, lang, direction } = extData; @@ -536,7 +535,6 @@ export function addInGraphHandle(data) { }); // }, 0); } - // console.log(lang, "lang"); } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue index f19ba0b8..69bf17be 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue @@ -4,6 +4,10 @@ @@ -134,8 +138,54 @@ export default { console.log("气象", res); }); }, + + bindMap(isLoaded){ + if(!isLoaded){ + return; + } + // 获取map接口 + const {AMap,mapIns} = this.$refs.AMapContainerRef.getMapInstance(); + const {longitude,dimension,eventName} = this.detailData; + const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`); + const nowBg = require(`@screen/images/mapBg/active.svg`); + + const center = new AMap.LngLat(parseFloat(longitude), parseFloat(dimension)); + + var marker = new AMap.Marker({ + position:center, + content: ` +
+ +
+ `, + anchor: 'bottom-center', + }); + mapIns.add(marker); + mapIns.setZoomAndCenter(12, center); + // + console.log(mapIns,AMap,'--------') + console.log(this.detailData,'############'); + } + }, + mounted() { + this.bindMap(); }, - mounted() {}, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue index 581eeaec..4c1f28c9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue @@ -14,8 +14,8 @@
- - + +
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue index 321e3dcb..e8cfe1e0 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue @@ -42,7 +42,7 @@ export default { props: { detailId: { type: [String, Number], - default: "96b9918efc01488cb22fa1d9d3236dfd", + default: "162cb8824ea141f3a96a74ad81c22796", }, }, provide() { @@ -73,7 +73,8 @@ export default { }) .then((result) => { if (result.code != 200) return; - console.log(result.data); + result.data.longitude = '116.829275'; + result.data.dimension = '36.583156'; this.provideData.detail = result.data; if ( ["设备设施隐患", "非法上路", "施工建设", "服务区异常"].includes( @@ -82,7 +83,7 @@ export default { ) { const gridArea = { ...originGridArea }; // 第一列变化 - gridArea["DispatchLiaison"] = "10 / 1 / span 20 / 2"; + gridArea["DispatchLiaison"] = "13 / 1 / span 21 / 2"; delete gridArea.TrafficControl; if (["设备设施隐患", "非法上路"].includes(result.data.eventName)) { // 第三列变化 From 3288cb267749e01f88290801799e7f5539379e8d Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 7 May 2024 15:33:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8D=E8=BD=AE?= =?UTF-8?q?=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/EventDetailDialog/Carousel/index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue index 3b5479d4..7a032641 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue @@ -11,7 +11,7 @@
- +
@@ -31,7 +31,7 @@ import Video from "@screen/components/Video"; export default { name: "Carousel", - components: { VueSlickCarousel,Video }, + components: { VueSlickCarousel, Video }, props: { pictures: { type: Array, @@ -63,6 +63,15 @@ export default { autoplay: true, autoplaySpeed: 1800, }, + videoSettings: { + infinite: true, + arrows: false, + speed: 600, + slidesToShow: 1, + slidesToScroll: 1, + autoplay: false, + autoplaySpeed: 1800, + } } }, methods: {