From fcb0066e1c52d586760f3e20a91e2fd5113c0699 Mon Sep 17 00:00:00 2001 From: yangxiaojiang <851673013@qq.com> Date: Wed, 20 Jul 2022 17:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/area.js | 8 + src/assets/waterPoints/rotateBgi.png | Bin 0 -> 18613 bytes src/assets/waterPoints/toadyListBgi2.png | Bin 0 -> 12945 bytes src/supermap/createMarkerPopup.js | 20 + src/supermap/map-showResource.js | 5 +- src/views/pages/area/components/SiteList.vue | 6 +- .../components/ComplaintEvent.vue | 119 +++-- .../construction/components/SiteListPop.vue | 75 +++- .../construction/components/SiteRoadPop.vue | 145 +++++++ .../components/StatisticalAnalysis.vue | 30 +- .../construction/components/VideoList.vue | 29 +- .../construction/components/VideoPlay.vue | 409 ++++++++++++++++++ src/views/pages/construction/index.vue | 16 + .../roadGovernance/components/RoadMain.vue | 14 +- .../waterPoints/components/ComplaintEvent.vue | 8 +- 15 files changed, 809 insertions(+), 75 deletions(-) create mode 100644 src/assets/waterPoints/rotateBgi.png create mode 100644 src/assets/waterPoints/toadyListBgi2.png create mode 100644 src/views/pages/construction/components/SiteRoadPop.vue create mode 100644 src/views/pages/construction/components/VideoPlay.vue diff --git a/src/api/area.js b/src/api/area.js index 34a969a..74aff6d 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -7,4 +7,12 @@ export function selectKeyAreaList(params) { params }) } + + export function selectByAreaName(params) { + return request({ + url: 'api/project/keyArea/selectByAreaName', + method: 'get', + params, + }) + } \ No newline at end of file diff --git a/src/assets/waterPoints/rotateBgi.png b/src/assets/waterPoints/rotateBgi.png new file mode 100644 index 0000000000000000000000000000000000000000..904126a7b11559f57e82de326b95d76ac6d79ba9 GIT binary patch literal 18613 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', + data() { + return { + feature: feature, + } + }, + created() { + }, + components: { + SiteRoadPop + } + }) + return popupDom.initDom() +} /** * 生成专题企业信息通用弹窗Dom * @param resourceTitle @@ -671,4 +690,5 @@ export { createEventListDetailsPop, createSiteListPop, createWaterPointPop, + createSiteRoadPop, } diff --git a/src/supermap/map-showResource.js b/src/supermap/map-showResource.js index 62aed18..868e4fd 100644 --- a/src/supermap/map-showResource.js +++ b/src/supermap/map-showResource.js @@ -586,8 +586,9 @@ function addPointsToMap (features, url, lastOne, createPopupFun, DS, featureGrou L.popup({ className: 'roadGovernance-popup', keepInView: false,}).setLatLng(feature.latLng).setContent(elementHtml).openOn(map) } else if(feature.type=='site'){ L.popup({ className: 'site-popup', keepInView: false,}).setLatLng(feature.latLng).setContent(elementHtml).openOn(map) - } - else if(feature.type=='waterPoint'){ + } else if(feature.type=='siteRoad'){ + L.popup({ className: 'site-road-popup', keepInView: false,}).setLatLng(feature.latLng).setContent(elementHtml).openOn(map) + } else if(feature.type=='waterPoint'){ L.popup({ className: 'water-point-pop', keepInView: false,}).setLatLng(feature.latLng).setContent(elementHtml).openOn(map) } else{ L.popup({ className: 'epidemic-address', keepInView: false, maxHeight: 300 }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map) diff --git a/src/views/pages/area/components/SiteList.vue b/src/views/pages/area/components/SiteList.vue index 77819d7..047b4d5 100644 --- a/src/views/pages/area/components/SiteList.vue +++ b/src/views/pages/area/components/SiteList.vue @@ -52,7 +52,8 @@ + + diff --git a/src/views/pages/construction/components/StatisticalAnalysis.vue b/src/views/pages/construction/components/StatisticalAnalysis.vue index e530028..e756bee 100644 --- a/src/views/pages/construction/components/StatisticalAnalysis.vue +++ b/src/views/pages/construction/components/StatisticalAnalysis.vue @@ -26,7 +26,7 @@ >{{item}} -
+
000
@@ -37,7 +37,18 @@
-
+
+
+ 000件 +
+
+
+
+
+
+
+
+
000
@@ -56,14 +67,15 @@ color: '#1ffefd', 'background-color': '#2b4b7a', }" + style="background: transparent" > - + - + - + @@ -78,8 +90,8 @@ import * as echarts from 'echarts' export default { data () { return { - tabsButton: ["视频感知事件","出租车走航监测"], - tabsActiveName: "视频感知事件", + tabsButton: ["视频感知","物联感知","走航监测"], + tabsActiveName: "视频感知", filterButton:{ typeSelect:['全部','近7天','近30天'], typeSelectActive:'全部', @@ -119,14 +131,14 @@ import * as echarts from 'echarts' methods: { tabHandleClick(item) { this.tabsActiveName = item - if(item == '视频感知事件') { + if(item == '视频感知') { this.$nextTick( () => { this.initEventTypeCharts() this.initEventStateCharts() this.initEventTimeCharts() }) } - if(item == '出租车走航监测') { + if(item == '走航监测') { this.$nextTick( () => { this.initRoadTimeCharts() }) diff --git a/src/views/pages/construction/components/VideoList.vue b/src/views/pages/construction/components/VideoList.vue index 087b26d..a634141 100644 --- a/src/views/pages/construction/components/VideoList.vue +++ b/src/views/pages/construction/components/VideoList.vue @@ -14,7 +14,7 @@
-
+
-
+
.el-tree-node__content { + background-color: rgba(27,255,255,.2); + color: #fff; + } + } } } diff --git a/src/views/pages/construction/components/VideoPlay.vue b/src/views/pages/construction/components/VideoPlay.vue new file mode 100644 index 0000000..720b4c7 --- /dev/null +++ b/src/views/pages/construction/components/VideoPlay.vue @@ -0,0 +1,409 @@ + + + + + + + + diff --git a/src/views/pages/construction/index.vue b/src/views/pages/construction/index.vue index 906c4d2..699ddcd 100644 --- a/src/views/pages/construction/index.vue +++ b/src/views/pages/construction/index.vue @@ -64,6 +64,11 @@
+ +
@@ -79,6 +84,7 @@ import SiteList from "./components/SiteList"; import { selectByJdWd } from "@/api/construction/index"; import { createSiteListPop } from "@/supermap/createMarkerPopup"; import {createCameraDetailsPop} from '@/supermap/createMarkerPopup'; +import VideoPlay from './components/VideoPlay' export default { data() { @@ -90,6 +96,9 @@ export default { constructionSiteData: [], changeLayerBtnList: ['AI事件','视频监控','工地','道路'], changeLayerBtnGroup: [], + + openVideo: false, + channelCode:[] }; }, @@ -98,6 +107,7 @@ export default { complaintEvent, VideoList, SiteList, + VideoPlay }, created() {}, mounted() { @@ -146,6 +156,12 @@ export default { bus.$on("CameraSingleDataOnMap",(labelName,data) => { this.addResourceTomap(labelName,data); }) + + bus.$off('openCurrentVideoWaterPoint') + bus.$on('openCurrentVideoWaterPoint',channelCode => { + this.openVideo = true; + this.channelCode.unshift(channelCode) + }) }, methods: { querySearchAsync(queryString, cb) { diff --git a/src/views/pages/roadGovernance/components/RoadMain.vue b/src/views/pages/roadGovernance/components/RoadMain.vue index a1b89b3..854441b 100644 --- a/src/views/pages/roadGovernance/components/RoadMain.vue +++ b/src/views/pages/roadGovernance/components/RoadMain.vue @@ -323,20 +323,8 @@ export default { methods: { // 道路污染数据 昨日 - // async getRoadData() { - // const res = await getRoadData({ dt: this.preTime }); - // //路网数据 - // this.roadData = res.data.data; - // //道路事件 pm>200 - // // const data = res.data.data.filter((item) => item.pm10 > 150); - // // this.tableData = data; - // // this.dateTabs[0].data = data; - // // this.dateTabs[0].dataNum = data.length; - // // this.addToMap(data); - // this.roadOnMap(); - // }, async getRoadData() { - const res = await getRoadData({ dt: '2022-7-7 00:00:00' }); + const res = await getRoadData({ dt: this.preTime }); //路网数据 this.roadData = res.data.data; //道路事件 pm>200 diff --git a/src/views/pages/waterPoints/components/ComplaintEvent.vue b/src/views/pages/waterPoints/components/ComplaintEvent.vue index 5fa885f..5db200c 100644 --- a/src/views/pages/waterPoints/components/ComplaintEvent.vue +++ b/src/views/pages/waterPoints/components/ComplaintEvent.vue @@ -6,7 +6,7 @@
-
+
易积水点{{listAll.length || 0}}
@@ -355,8 +355,8 @@ export default { position: absolute; width: 128px; height: 128px; - background: url(../../../../assets/construction/rotateBgi.png) no-repeat; - animation: routation 20s linear infinite; + background: url(../../../../assets/waterPoints/rotateBgi.png) no-repeat; + // animation: routation 20s linear infinite; } .toady-list-icon { position: absolute; @@ -373,7 +373,7 @@ export default { height: 72px; top: 20px; left: 100px; - background: url(../../../../assets/construction/toadyListBgi2.png) + background: url(../../../../assets/waterPoints/toadyListBgi2.png) no-repeat; color: #fff; line-height: 72px;