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 @@ + + + + +