diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 34c41c09..7ac560e2 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -239,7 +239,7 @@ const columnsConfig = ref([ type: 'VP', columns: VPPointColumns }, - { + { type: 'EQ_1', columns: EQPointColumns1 }, @@ -255,11 +255,11 @@ const columnsConfig = ref([ type: 'EQ_3', columns: EQPointColumns3 }, - { + { type: 'EQ_4', columns: EQPointColumns4 }, - { + { type: 'EQ_7', columns: EQPointColumns7 }, @@ -279,6 +279,18 @@ const columnsConfig = ref([ type: 'VD', columns: StinfoAiVidoPointColumns }, + { + type: 'VD_FP', + columns: StinfoAiVidoPointColumns + }, + { + type: 'VD_SN', + columns: StinfoAiVidoPointColumns + }, + { + type: 'VD_WVD', + columns: StinfoAiVidoPointColumns + }, { type: 'eng_alarm_point', columns: BasicColumns diff --git a/frontend/src/components/MapModal/setting.config.ts b/frontend/src/components/MapModal/setting.config.ts index f3b5e970..ea097c15 100644 --- a/frontend/src/components/MapModal/setting.config.ts +++ b/frontend/src/components/MapModal/setting.config.ts @@ -216,12 +216,12 @@ const EQTabs: Array = [ url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', default: true // 默认显示 }, - { - name: '实时视频', - key: 'videoInfo', - type: 'video', - url: '/video/dataStcdFrame/getVideoMonitorList' - }, + // { + // name: '实时视频', + // key: 'videoInfo', + // type: 'video', + // url: '/video/dataStcdFrame/getVideoMonitorList' + // }, // { // name: '全景影像', // key: 'panoramaInfo', @@ -863,20 +863,21 @@ const videoTabs: Array = [ } ]; // //视频站 -// const noLiveVideoTabs: Array = [ -// { -// name: '基础信息', -// key: 'basicInfo', -// type: 'basic', -// url: '/bbi/siteBipc/getSiteBasicInfo' -// }, -// { -// name: '录像视频', -// key: 'videoInfo', -// type: 'noLiveVideo', -// url: '/video/dataStcdFrame/getVideoMonitorList' -// } -// ] +const noLiveVideoTabs: Array = [ + { + name: '基础信息', + key: 'basicInfo', + type: 'basic', + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', + default: true // 默认显示 + }, + { + name: '录像视频', + key: 'videoInfo', + type: 'noLiveVideo', + url: '/video/dataStcdFrame/getVideoMonitorList' + } +]; // //动物救助站 const VATabs: Array = [ { @@ -1076,6 +1077,7 @@ const handleTabs = (modaldata: any) => { return WATabs; case 'VD_FBFM': case 'VD': + case 'VD_FP': return videoTabs; case 'ENG_ALARM_POINT': return DZGJ; @@ -1104,6 +1106,13 @@ const handleTabs = (modaldata: any) => { case 'ENG_ALARM': return DZGJ; case 'EQ': + case 'EQ_1': + case 'EQ_2': + case 'EQ_3': + case 'EQ_4': + case 'EQ_5': + case 'EQ_6': + case 'EQ_7': return EQTabs; case 'DW': case 'DW_1': @@ -1191,9 +1200,9 @@ const handleTabs = (modaldata: any) => { // case 'VD_VA': // case 'VD': // return videoTabs - // case 'VD_SN': - // case 'VD_WVD': - // return noLiveVideoTabs + case 'VD_SN': + case 'VD_WVD': + return noLiveVideoTabs; // case 'VP': // return VPTabs // case 'VA':