diff --git a/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx b/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx index 73d7dd4..99c5c4b 100644 --- a/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx +++ b/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { IRecord, VideoPlayerCardProps, ViewLargerImageModalRef } from '@zhst/biz'; import WindowToggle from './components/WindowToggle'; import WarningRecordList from './components/WarningRecordList'; +import { IRecord } from '../WarningRecordCard'; +import { VideoPlayerCardProps } from '../VideoPlayerCard'; +import { ViewLargerImageModalRef } from '../ViewLargerImageModal'; interface RealTimeMonitorProps { videoDataSource?: VideoPlayerCardProps[]; @@ -62,7 +64,6 @@ export const RealTimeMonitor: React.FC = (props) => { recordListTitle="监控预警记录" /> - ); }; diff --git a/packages/biz/src/RealTimeMonitor/demo/base.tsx b/packages/biz/src/RealTimeMonitor/demo/base.tsx index 90338fd..ffb3709 100644 --- a/packages/biz/src/RealTimeMonitor/demo/base.tsx +++ b/packages/biz/src/RealTimeMonitor/demo/base.tsx @@ -136,12 +136,9 @@ export default () => { setWarningDataSource(newWarningDataSource) setIsRecordListLoading(false) }, 1000) - } return ( - - { viewLargerImageModalRef={viewLargerImageModalRef} isRecordListLoading={isRecordListLoading} recordListTitle="监控预警记录" /> - + ) } diff --git a/packages/biz/src/ViewLargerImageModal/ViewLargerImageModal.tsx b/packages/biz/src/ViewLargerImageModal/ViewLargerImageModal.tsx index f4475bd..8b8edd4 100644 --- a/packages/biz/src/ViewLargerImageModal/ViewLargerImageModal.tsx +++ b/packages/biz/src/ViewLargerImageModal/ViewLargerImageModal.tsx @@ -29,6 +29,7 @@ export interface ViewLargerImageModalProps { export const ViewLargerImageModal = forwardRef( (props, ref) => { + const componentName = `zhst-biz-view-warning-larger-image-modal`; const { modalProps, downloadImg, imgStyle, title = '预警大图', downloadText = '下载大图', spaceProps } = props const { useToken } = theme const { token } = useToken() @@ -53,7 +54,7 @@ export const ViewLargerImageModal = forwardRef - - {title} + +
+ {title} +
{warningData?.map(({ label, value }) => (
diff --git a/packages/biz/src/ViewLargerImageModal/index.less b/packages/biz/src/ViewLargerImageModal/index.less index 32363d0..fc83657 100644 --- a/packages/biz/src/ViewLargerImageModal/index.less +++ b/packages/biz/src/ViewLargerImageModal/index.less @@ -1,6 +1,12 @@ .zhst-biz-view-warning-larger-image-modal { font-family: MicrosoftYaHei; + &-left-img img{ + width: 789px; + height: 444px; + display: 'block', + } + .ant-modal-content { padding: 0; height: 492px; diff --git a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx b/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx index 4833868..5d280c4 100644 --- a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx +++ b/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx @@ -85,12 +85,12 @@ export const WarningRecordCard: React.FC = (props) => { return (
} + cover={
预警图
} style={{ width: 356, height: 302, padding: 10, borderRadius: 4, ...selectedCardStyle, ...cardStyle }} {...cardProps} > -
-
{warningType}
+
+
{warningType}
}> {warningInfo?.map((item, index) => (
@@ -98,9 +98,9 @@ export const WarningRecordCard: React.FC = (props) => {
))}
-
{warningTimeShow}
+
{warningTimeShow}
-
{cabietText}
+
{cabietText}
); diff --git a/packages/biz/src/WarningRecordCard/index.less b/packages/biz/src/WarningRecordCard/index.less index 7cfba38..9f1a574 100644 --- a/packages/biz/src/WarningRecordCard/index.less +++ b/packages/biz/src/WarningRecordCard/index.less @@ -7,20 +7,26 @@ line-height: 19px; display: flex; margin-top: 10px; + } - .left-context { - flex: 1; + &-cover-img img { + width: 336px; + height: 203px; + border-radius: 0, + } - >div { - margin-top: 6px; - } + &-left-context { + flex: 1; - >div:nth-child(1) { - margin-top: 0; - } + >div { + margin-top: 6px; } - .warning-type { + >div:nth-child(1) { + margin-top: 0; + } + + &-warning-type { font-weight: bold; } } diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts index 890324e..bd876e8 100644 --- a/packages/types/index.d.ts +++ b/packages/types/index.d.ts @@ -219,7 +219,7 @@ export interface ViewOption { fitScaleAsMinScale?: boolean; } -export type IOdRectOrigin { +export type IOdRectOrigin = { objectIndex: { objectId: string solutionId: string