From 64d345c2b1b970d5908f4cbf2fec9be29fb4ac8a Mon Sep 17 00:00:00 2001 From: Jack <1638169491@qq.com> Date: Tue, 16 Aug 2022 16:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E5=B7=A5=E5=9C=B0)=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=B5=8B=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/areaTree.vue | 647 +++++------------- .../dataBoard/digitalSite/index.vue | 5 +- .../jlw/digitalSite/centerTop.vue | 10 +- .../digitalSite/components/VideoDialog.vue | 118 ++++ 4 files changed, 283 insertions(+), 497 deletions(-) create mode 100644 src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue diff --git a/src/components/areaTree.vue b/src/components/areaTree.vue index 409a97b6..dc01c5b1 100644 --- a/src/components/areaTree.vue +++ b/src/components/areaTree.vue @@ -1,236 +1,130 @@ diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue index 28f95426..e91b7413 100644 --- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue +++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue @@ -2592,7 +2592,6 @@ export default { this.afterAnalysisDataInfo = '' this.showBoltDetails = false this.showVideoDialog = false - // this.activeLiveData = "" this.playList = [] this.selectList = [] console.log(this.playList) @@ -2902,11 +2901,9 @@ export default { this.showHeight = 0 break case 4: - // this.activeLiveData = {} - console.log(item) + console.log(item, '老子操') this.activeLiveData = item this.showVideoDialog = true - // this.playList = [] console.log(this.videoList, 'video') this.videoList.forEach(element => { if (element.devSn == item.devSn) { diff --git a/src/views/projectAdmin/jlw/digitalSite/centerTop.vue b/src/views/projectAdmin/jlw/digitalSite/centerTop.vue index 354563b2..3faa90ed 100644 --- a/src/views/projectAdmin/jlw/digitalSite/centerTop.vue +++ b/src/views/projectAdmin/jlw/digitalSite/centerTop.vue @@ -10,6 +10,7 @@ > +
@@ -24,10 +25,11 @@ import Card from '../components/Card.vue' import JNestedRingChart from '../jChart/pie/JNestedRingChart.vue' import FaceGageDialog from './components/FaceGageDialog.vue' import EnvironmentDialog from './components/EnvironmentDialog.vue' +import VideoDialog from './components/VideoDialog.vue' import { selectWorkerAttendanceByDevApi } from '@/assets/js/api/dataBoard' import { getRealTimeDustNoiseDataApi } from '@/assets/js/api/environmentManage' export default { - components: { Card, JNestedRingChart, FaceGageDialog, EnvironmentDialog }, + components: { Card, JNestedRingChart, FaceGageDialog, EnvironmentDialog, VideoDialog }, props: { title: { type: String, @@ -57,7 +59,8 @@ export default { ufaceDev: { deviceState: 1 } }, environmentDialog: false, - environmentInfo: {} + environmentInfo: {}, + videoDialog: false } }, methods: { @@ -73,6 +76,9 @@ export default { case 'environment': this.environmentDialog = true break + case 'video': + this.videoDialog = true + break default: break } diff --git a/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue new file mode 100644 index 00000000..be05a787 --- /dev/null +++ b/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue @@ -0,0 +1,118 @@ + + + + +