From 320c9ec098982dd50dd9b6343586b6bead59764d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Wed, 8 May 2024 17:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A5=E6=8C=A4=E5=BA=A6=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Dialog/index.vue | 6 +- .../components/VideoMulti/index.vue | 7 +- .../components/DialogBoard.vue | 168 ++++++++++++++++++ .../components/DialogCamera.vue | 64 +++++++ .../CrowdnessIndicatorRankings/index.vue | 164 +++++++++++++++-- 5 files changed, 389 insertions(+), 20 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index 525c2062..da63a7db 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -10,7 +10,7 @@
{{ title }} - +
@@ -86,6 +86,10 @@ export default { }, }, methods: { + close(){ + console.log('------') + this.modelVisible = false + }, updateDialogVisible(bool) { this.modelVisible = bool; }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue index 6dc49afb..43dac124 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue @@ -68,7 +68,12 @@ export default { const changeItem = find(this.urls, { iotDeviceId: this.cameraId }); this.dialogData = { ...changeItem, parseOtherConfig: changeItem.otherConfig && JSON.parse(changeItem.otherConfig) }; console.log(this.cameraId, this.dialogData) - this.showVideo(); + this.player?.destroy(); + const self = this; + setTimeout(() => { + self.showVideo(); + }, 500); + }, async playVideo() { this.player?.destroy(); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue new file mode 100644 index 00000000..503eedc9 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogBoard.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue new file mode 100644 index 00000000..843eb3e0 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/components/DialogCamera.vue @@ -0,0 +1,64 @@ + + + + + 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 69bf17be..f6d67e09 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 @@ -5,7 +5,7 @@ ref="AMapContainerRef" v-if="delayLoad" @update:isGisCompleted="(data) => { - this.bindMap(data) + this.bindMap(data) } " style="z-index: 9" @@ -19,7 +19,7 @@ @click="handleClick(item)" >
+