diff --git a/src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx b/src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx index 2588f8e..1cd872c 100644 --- a/src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx +++ b/src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx @@ -43,7 +43,7 @@ const OnlineSupervision: React.FC<{}> = () => { //在线监督 function supervision(record: any): void { - message. + message.warn('功能开发中....'); } const columns: ProColumns[] = [ diff --git a/src/pages/VideoMonitor/Post/index.tsx b/src/pages/VideoMonitor/Post/index.tsx index 527b87a..25d7c33 100644 --- a/src/pages/VideoMonitor/Post/index.tsx +++ b/src/pages/VideoMonitor/Post/index.tsx @@ -1,6 +1,6 @@ import { isNotEmpty } from '@/utils/CommonUtils'; import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; -import { Button, Spin } from 'antd'; +import { Button, Spin, message } from 'antd'; import React, { useRef, useState } from 'react'; import { useHistory } from 'umi'; import ViewModal from '../ViewModal'; @@ -43,7 +43,7 @@ const PostSupervision: React.FC<{}> = () => { //评标监控回看 function reviewMonitor(record: any): void { - throw new Error('Function not implemented.'); + message.warn('功能开发中....'); } const columns: ProColumns[] = [ diff --git a/src/pages/VideoMonitor/ViewModal.tsx b/src/pages/VideoMonitor/ViewModal.tsx index a1d9ca8..5ac7e3b 100644 --- a/src/pages/VideoMonitor/ViewModal.tsx +++ b/src/pages/VideoMonitor/ViewModal.tsx @@ -1,12 +1,42 @@ -import { Spin, Modal } from 'antd'; +import { Spin, Modal, Descriptions, Table } from 'antd'; +import type { ColumnsType } from 'antd/es/table'; import React, { useState } from 'react'; -import JgtzsModal from '../ZYuShen/Calibration/ProjectManager/ResultNotice/components/JgtzsModal'; interface ViewDetailsProps { modalVisible: boolean; //开启关闭控制 onCancel: () => void; //关闭方法传入 data: any //数据传入 - } +} + +interface DataType { + key: string; + userName: string; + reportStatus: string; + reportTime: string; +} + +const columns: ColumnsType = [ + { + title: '序号', + dataIndex: 'key', + key: 'key', + }, + { + title: '人员', + dataIndex: 'userName', + key: 'userName', + }, + { + title: '报到状态', + dataIndex: 'reportStatus', + key: 'reportStatus', + }, + { + title: '报到时间', + dataIndex: 'reportTime', + key: 'reportTime', + }, + ]; /** * 详情弹出层 @@ -15,6 +45,53 @@ interface ViewDetailsProps { const ViewDetails: React.FC = (props) => { const {modalVisible, onCancel, data} = props; const [spin, spinSet] = useState(false); + const repostData :DataType[] = [ + { + key: '1', + userName: '1(0001)', + reportStatus: '已报道', + reportTime: '2022-07-02 15:22', + }, + { + key: '2', + userName: '2(0002)', + reportStatus: '已报道', + reportTime: '2022-07-02 15:22', + }, + { + key: '3', + userName: '3(0003)', + reportStatus: '已报道', + reportTime: '2022-07-02 15:22', + }, + { + key: '4', + userName: '4(0004)', + reportStatus: '未报道', + reportTime: '2022-07-02 15:22', + }, + { + key: '5', + userName: '5(0005)', + reportStatus: '已报道', + reportTime: '2022-07-02 15:22', + }, + ]; + const getStateName = (state:any) => { + let result = null; + switch(state){ + case 0: + result = '未开始'; + break; + case 1: + result = '评标中'; + break; + case 2: + result = '已结束'; + break; + } + return result; + } return ( - -

Some contents...

-

Some contents...

-

Some contents...

-

Some contents...

-

Some contents...

+ + + {data?.projectNumber} + {data?.sectionName} + {data?.reviewRoomName} + {getStateName(data?.state)} + {data?.startTime} + {data?.endTime} + 2022-07-13 12:30 + 2022-07-15 15:00 + 5人 + 2人 + 1人 + +

报道信息

+ + ) } export default ViewDetails;