diff --git a/packages/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/IntelligentSecurity/AppISManage/AppISManage.vue index 8a744d96..fc9da6f4 100644 --- a/packages/IntelligentSecurity/AppISManage/AppISManage.vue +++ b/packages/IntelligentSecurity/AppISManage/AppISManage.vue @@ -24,6 +24,7 @@ + @@ -45,10 +46,11 @@ import DeviceSlider from "../components/deviceSlider" import LocateDialog from "../components/locateDialog" import AiMonitor from "../components/AiSlwVideo" + import Synergy from "../components/Synergy" export default { name: "AppISManage", - components: {LocateDialog, DeviceSlider, AiMonitor}, + components: {LocateDialog, DeviceSlider, AiMonitor, Synergy}, label: "监控实况", props: { instance: Function, diff --git a/packages/IntelligentSecurity/components/AiSlwVideo.vue b/packages/IntelligentSecurity/components/AiSlwVideo.vue index 300aa12d..f7f5ea6d 100644 --- a/packages/IntelligentSecurity/components/AiSlwVideo.vue +++ b/packages/IntelligentSecurity/components/AiSlwVideo.vue @@ -192,7 +192,7 @@ setTimeout(() => { this.width = document.querySelector(`#${this.videoId}`).offsetWidth + 'px' this.$nextTick(() => { - this.$refs.timeline.init() + this.$refs.timeline && this.$refs.timeline.init() }) }, 60) }, diff --git a/packages/IntelligentSecurity/components/Synergy.vue b/packages/IntelligentSecurity/components/Synergy.vue new file mode 100644 index 00000000..6ea4fa7f --- /dev/null +++ b/packages/IntelligentSecurity/components/Synergy.vue @@ -0,0 +1,513 @@ + + + + + {{ time }} + + + + + + + + + 直播中 + {{ form.date }} + + 回到直播 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/IntelligentSecurity/components/Timeline.vue b/packages/IntelligentSecurity/components/Timeline.vue index 25d2bca7..d289d82b 100644 --- a/packages/IntelligentSecurity/components/Timeline.vue +++ b/packages/IntelligentSecurity/components/Timeline.vue @@ -1,5 +1,5 @@ - + { this.isInit = true this.$nextTick(() => { - this.canvasWidth = document.querySelector('.canvas').offsetWidth - this.canvasHeight = document.querySelector('.canvas').offsetHeight + this.canvasWidth = document.querySelector(`.${this.wrapper}`).offsetWidth + this.canvasHeight = document.querySelector(`.${this.wrapper}`).offsetHeight this.$nextTick(() => { const el = document.querySelector(`#${this.id}`)