diff --git a/package.json b/package.json index 204cbd34..89defcb7 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@types/crypto-js": "^4.1.1", "@types/keymaster": "^1.6.30", "@types/lodash": "^4.14.184", + "@vicons/fa": "^0.12.0", "animate.css": "^4.1.1", "axios": "^1.4.0", "color": "^4.2.3", diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue index 2e60f9fa..e310a26b 100644 --- a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue @@ -27,7 +27,10 @@
- +
@@ -46,7 +49,7 @@ import type { Ref } from 'vue' import { CreateComponentType } from '@/packages/index.d' import { publicInterface } from '@/api/path/business.api' import BorderBox from './BorderBoxV2.vue' -import {isPreview, postMessageToParent} from '@/utils' +import {isPreview, postMessageToParent, useGetMessageByParent} from '@/utils' import moment from "moment" import {selectTimeOptions} from "@/views/chart/ContentConfigurations/components/ChartData/index.d"; import {RequestHttpIntervalEnum} from "@/enums/httpEnum"; @@ -58,6 +61,7 @@ import { useOriginStore } from '@/store/modules/originStore/originStore' const { LocationIcon } = icon.carbon const { CheckCircleOutlinedIcon } = icon.material const { PlayCircle16FilledIcon } = icon.fluent +const { SpinnerIcon } = icon.fa const props = defineProps({ chartConfig: { @@ -232,6 +236,13 @@ const getVideos = (ids: number[], alarmIds: number[]) => { } } +const showLoading = ref(false) +const {getMessageByParent} = useGetMessageByParent() +getMessageByParent('', (e) => { + if(e.data.type === 'openVideoV2_closeLoading' && e.data.page === 'customLargeScreen') { + showLoading.value = false + } +}) const showVideo = (obj: any, id: number) => { let a: {[k: string]: string | null | boolean | number} = { ip: '', @@ -248,6 +259,8 @@ const showVideo = (obj: any, id: number) => { // 点击时强制打开 a.showForce = true a.alarmId = id + currentVideo.value = a + showLoading.value = true postMessageToParent({ type: 'openVideoV2', data: a @@ -490,6 +503,20 @@ onUnmounted(() => {