From ba615990ed5ad3992c46668ad5b78f3c81661480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=B8=85?= Date: Fri, 26 Aug 2022 10:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=91=8A=E8=AD=A6-=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85-=E5=BC=80=E5=8F=91=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/AbnormalAlarm/index.tsx | 83 +++++++++++++++++++++++++++++- src/pages/AbnormalAlarm/service.ts | 2 +- 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/src/pages/AbnormalAlarm/index.tsx b/src/pages/AbnormalAlarm/index.tsx index 9cb2cef..11d244f 100644 --- a/src/pages/AbnormalAlarm/index.tsx +++ b/src/pages/AbnormalAlarm/index.tsx @@ -2,8 +2,26 @@ import React, { useState, useRef } from 'react'; import { message, PageHeader, Button, Spin } from 'antd'; import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table'; import { getPage, handleAlarm } from './service'; +import ViewEvalAlarmUpdateModal from '../Evaluation/BidControl/BidControlManager/components/ViewEvalAlarmUpdateModal'; +interface alarmData { + tilte:string;//标题 + id:string;//告警id + reserveId:string;//预约id + tpName:string;//项目名称 + tpNumber:string;//项目编号 + bsName:string;//标段名称 + placeName:string; //评标室名称 + startDate:string; //开始时间 + endDate:string; //结束时间 + status:string;//处理状态:0未处理;1已处理', + roomStatus:string;//评标室状态 0-未开启 1-进行中 2-已结束 + pNumber:string;//人数信息 + remark:string;//处理说明 + attachment:string;//附件id +} + const AbnormalAalarm: React.FC<{}> = () => { const actionRef = useRef(); const [spin, setSpin] = useState(false); @@ -16,6 +34,23 @@ const AbnormalAalarm: React.FC<{}> = () => { pageSize: 10 }); + const alarm:alarmData ={ + tilte: "测试", + id: '', + reserveId: '', + tpName: '', + tpNumber: '', + bsName: '', + placeName: '', + startDate: '', + endDate: '', + status: '', + roomStatus: '', + pNumber: '', + remark: '', + attachment: '' + } + const [alarmData, setAlarmData] = useState(alarm); //委托列表 const columns: ProColumns[] = [ { @@ -30,7 +65,7 @@ const AbnormalAalarm: React.FC<{}> = () => { valueEnum: { 1: { text: '设备离线'}, 2: { text: '人员数量异常'}, - 3: { text: '陌生人进入'}, + 3: { text: '陌生人告警'}, } }, { @@ -49,7 +84,7 @@ const AbnormalAalarm: React.FC<{}> = () => { return } } else { - return ( + return ( ) } } @@ -80,6 +115,39 @@ const AbnormalAalarm: React.FC<{}> = () => { setSpin(false); } }; + /** + * modal封装数据 + * @param record 列表数据 + */ + const EnvData = (record: any) => { + alarm.tilte=getTypeValue(record.type); + alarm.tpName=record.projectName; + alarm.tpNumber=record.projectNum; + alarm.bsName=record.sectionName; + alarm.id=record.id; + alarm.reserveId=record.reserveId; + alarm.placeName=record.areaName; + alarm.startDate=record.startDate; + alarm.endDate=record.endDate; + alarm.pNumber=record.pnumber; + alarm.status=record.status; + alarm.roomStatus=record.roomStatus; + alarm.remark=record.remark; + alarm.attachment=record.attachment; + setAlarmData(alarm); + } + + function getTypeValue(key:any){ + let val = ""; + if (key === "2") { + val = "人员数量异常"; + }else if(key === "3"){ + val = "陌生人告警"; + }else{ + val = key; + } + return val; + } return ( @@ -118,6 +186,17 @@ const AbnormalAalarm: React.FC<{}> = () => { onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }} /> + {viewDetailModalVisible ? ( + setViewDetailModalVisible(false)} + onOk={()=>{}} + > + + ) : null + } ) }; diff --git a/src/pages/AbnormalAlarm/service.ts b/src/pages/AbnormalAlarm/service.ts index ff0362a..f14e5a9 100644 --- a/src/pages/AbnormalAlarm/service.ts +++ b/src/pages/AbnormalAlarm/service.ts @@ -5,7 +5,7 @@ import request from '@/utils/request'; * @return 分页数据 */ export async function getPage(params: any) { - return request('/api/biz-service-ebtp-evaluation/v1/eval/room/alarm/page', { + return request('/api/biz-service-ebtp-evaluation/v1/eval/room/alarm/getRiskPointPage', { method: 'POST', data: { ...params