liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

列表分页接口开发完成

Browse Source
This commit is contained in:
袁帅
2022-08-23 11:27:07 +08:00
parent 2af1052516
commit 8c7c3ea7d6
6 changed files with 161 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx
View File

@ -4,7 +4,7 @@ import { Button, Spin, message } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
import ViewModal from '../../ViewModal';
import { getPage } from '../service';
import { getPage } from '../../service';
interface ViewDetailsProps {
entity?: {
@ -18,7 +18,6 @@ interface ViewDetailsProps {
* @returns
*/
const OnlineSupervision: React.FC<{}> = () => {
const [spin, spinSet] = useState<boolean>(false);
const [visible, setVisible] = useState<boolean>(false);
const [record, setRecord] = useState<any[]>([]);
@ -47,7 +46,6 @@ const OnlineSupervision: React.FC<{}> = () => {
}
const columns: ProColumns<any>[] = [
{
valueType: 'index',
align: 'center',
@ -63,52 +61,61 @@ const OnlineSupervision: React.FC<{}> = () => {
{
title: '项目编号',
align: 'center',
dataIndex: 'projectNumber',
dataIndex: 'projectNum',
hideInSearch: true,
},
{
title: '标段',
align: 'center',
dataIndex: 'sectionName',
dataIndex: 'packageNames',
hideInSearch: true,
},
{
title: '评审室名称',
align: 'center',
dataIndex: 'reviewRoomName',
dataIndex: 'areaName',
hideInSearch: false,
width: '10%',
},
{
title: '预计评标开始时间',
align: 'center',
dataIndex: 'startTime',
dataIndex: 'reserveStartDate',
hideInSearch: true,
width: '15%',
},
{
title: '预计评标结束时间',
align: 'center',
dataIndex: 'endTime',
dataIndex: 'reserveEndDate',
hideInSearch: true,
width: '9.5%',
},
{
title: '状态',
align: 'center',
dataIndex: 'state',
dataIndex: 'status',
hideInSearch: true,
width: '4.5%',
valueEnum: {
0: {
text: '未开始'
'-1': {
text: '待确认'
},
1: {
text: '评标中'
'0': {
text: '未开启'
},
2: {
'1': {
text: '进行中'
},
'2': {
text: '已结束'
},
'3': {
text: '已取消'
},
'4': {
text: '结束未使用'
},
}
},
{
@ -154,34 +161,25 @@ const OnlineSupervision: React.FC<{}> = () => {
search={{ labelWidth: 'auto', span: 6 }}
loading={false}
request={async (params) => {
// spinSet(true);
// return await getPage({
// ...params,
// basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
// }).then((res) => {
// const result = {
// data: res.data.records,
// total: res.data.total,
// success: res.success,
// pageSize: res.data.size,
// current: res.data.current
// }
// return result;
// }).finally(() => {
// isNotEmpty(window.location.search) && history.push(window.location.pathname);
// spinSet(false);
// })
return {data:[{projectName: '2022年中国联通集团大厦A1913会议室智能化改造项目',
projectNumber: 'SS25102022000211',
sectionName: '标段一',
reviewRoomName: '集团第一评审室',
state : 1,
startTime : '2022-07-13 12:30',
endTime : '2022-07-13 12:30'}],
total:1,
pageSize:10,
current:1}
spinSet(true);
return await getPage({
...params,
basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
queryType: 1,
areaRoomName: params.areaName
}).then((res) => {
const result = {
data: res.data.records,
total: res.data.total,
success: res.success,
pageSize: res.data.size,
current: res.data.current
}
return result;
}).finally(() => {
isNotEmpty(window.location.search) && history.push(window.location.pathname);
spinSet(false);
})
}
}
pagination={{

81
src/pages/VideoMonitor/Online/components/ReservedItems.tsx
View File

@ -4,7 +4,7 @@ import { Button, Spin, Modal } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
import ViewModal from '../../ViewModal';
import { getPage } from '../service';
import { getPage } from '../../service';
/**
* 预约项目列表
@ -35,7 +35,6 @@ const ReservedItems: React.FC<{}> = () => {
}
const columns: ProColumns<any>[] = [
{
valueType: 'index',
align: 'center',
@ -51,52 +50,61 @@ const ReservedItems: React.FC<{}> = () => {
{
title: '项目编号',
align: 'center',
dataIndex: 'projectNumber',
dataIndex: 'projectNum',
hideInSearch: true,
},
{
title: '标段',
align: 'center',
dataIndex: 'sectionName',
dataIndex: 'packageNames',
hideInSearch: true,
},
{
title: '评审室名称',
align: 'center',
dataIndex: 'reviewRoomName',
dataIndex: 'areaName',
hideInSearch: false,
width: '10%',
},
{
title: '预计评标开始时间',
align: 'center',
dataIndex: 'startTime',
dataIndex: 'reserveStartDate',
hideInSearch: true,
width: '15%',
},
{
title: '预计评标结束时间',
align: 'center',
dataIndex: 'endTime',
dataIndex: 'reserveEndDate',
hideInSearch: true,
width: '9.5%',
},
{
title: '状态',
align: 'center',
dataIndex: 'state',
dataIndex: 'status',
hideInSearch: true,
width: '4.5%',
valueEnum: {
0: {
text: '未开始'
'-1': {
text: '待确认'
},
1: {
text: '评标中'
'0': {
text: '未开启'
},
2: {
'1': {
text: '进行中'
},
'2': {
text: '已结束'
},
'3': {
text: '已取消'
},
'4': {
text: '结束未使用'
},
}
},
{
@ -133,34 +141,25 @@ const ReservedItems: React.FC<{}> = () => {
search={{ labelWidth: 'auto', span: 6 }}
loading={false}
request={async (params) => {
// spinSet(true);
// return await getPage({
// ...params,
// basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
// }).then((res) => {
// const result = {
// data: res.data.records,
// total: res.data.total,
// success: res.success,
// pageSize: res.data.size,
// current: res.data.current
// }
// return result;
// }).finally(() => {
// isNotEmpty(window.location.search) && history.push(window.location.pathname);
// spinSet(false);
// })
return {data:[{projectName: '2022年中国联通集团大厦A1913会议室智能化改造项目',
projectNumber: 'SS25102022000211',
sectionName: '标段一',
reviewRoomName: '集团第一评审室',
state : 0,
startTime : '2022-07-13 12:30',
endTime : '2022-07-13 12:30'}],
total:1,
pageSize:10,
current:1}
spinSet(true);
return await getPage({
...params,
basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
queryType: 0,
areaRoomName: params.areaName
}).then((res) => {
const result = {
data: res.data.records,
total: res.data.total,
success: res.success,
pageSize: res.data.size,
current: res.data.current
}
return result;
}).finally(() => {
isNotEmpty(window.location.search) && history.push(window.location.pathname);
spinSet(false);
})
}
}
pagination={{

87
src/pages/VideoMonitor/Post/index.tsx
View File

@ -6,19 +6,11 @@ import { useHistory } from 'umi';
import ViewModal from '../ViewModal';
import { getPage } from '../service';
interface ViewDetailsProps {
entity?: {
projectName?:string|null,
projectNumber?:string|null,
} | null,
visibleDefault?:boolean| false,
}
/**
* 事后监督列表
* @returns
*/
const PostSupervision: React.FC<{}> = () => {
const [spin, spinSet] = useState<boolean>(false);
const [visible, setVisible] = useState<boolean>(false);
const [record, setRecord] = useState<any[]>([]);
@ -47,7 +39,6 @@ const PostSupervision: React.FC<{}> = () => {
}
const columns: ProColumns<any>[] = [
{
valueType: 'index',
align: 'center',
@ -63,52 +54,61 @@ const PostSupervision: React.FC<{}> = () => {
{
title: '项目编号',
align: 'center',
dataIndex: 'projectNumber',
dataIndex: 'projectNum',
hideInSearch: true,
},
{
title: '标段',
align: 'center',
dataIndex: 'sectionName',
dataIndex: 'packageNames',
hideInSearch: true,
},
{
title: '评审室名称',
align: 'center',
dataIndex: 'reviewRoomName',
dataIndex: 'areaName',
hideInSearch: false,
width: '10%',
},
{
title: '预计评标开始时间',
align: 'center',
dataIndex: 'startTime',
dataIndex: 'reserveStartDate',
hideInSearch: true,
width: '15%',
},
{
title: '预计评标结束时间',
align: 'center',
dataIndex: 'endTime',
dataIndex: 'reserveEndDate',
hideInSearch: true,
width: '9.5%',
},
{
title: '状态',
align: 'center',
dataIndex: 'state',
dataIndex: 'status',
hideInSearch: true,
width: '4.5%',
valueEnum: {
0: {
text: '未开始'
'-1': {
text: '待确认'
},
1: {
text: '评标中'
'0': {
text: '未开启'
},
2: {
'1': {
text: '进行中'
},
'2': {
text: '已结束'
},
'3': {
text: '已取消'
},
'4': {
text: '结束未使用'
},
}
},
{
@ -154,34 +154,25 @@ const PostSupervision: React.FC<{}> = () => {
search={{ labelWidth: 'auto', span: 6 }}
loading={false}
request={async (params) => {
// spinSet(true);
// return await getPage({
// ...params,
// basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
// }).then((res) => {
// const result = {
// data: res.data.records,
// total: res.data.total,
// success: res.success,
// pageSize: res.data.size,
// current: res.data.current
// }
// return result;
// }).finally(() => {
// isNotEmpty(window.location.search) && history.push(window.location.pathname);
// spinSet(false);
// })
return {data:[{projectName: '2022年中国联通集团大厦A1913会议室智能化改造项目',
projectNumber: 'SS25102022000211',
sectionName: '标段一',
reviewRoomName: '集团第一评审室',
state : 2,
startTime : '2022-07-13 12:30',
endTime : '2022-07-13 12:30'}],
total:1,
pageSize:10,
current:1}
spinSet(true);
return await getPage({
...params,
basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
queryType: 2,
areaRoomName: params.areaName
}).then((res) => {
const result = {
data: res.data.records,
total: res.data.total,
success: res.success,
pageSize: res.data.size,
current: res.data.current
}
return result;
}).finally(() => {
isNotEmpty(window.location.search) && history.push(window.location.pathname);
spinSet(false);
})
}
}
pagination={{

11
src/pages/VideoMonitor/Post/service.ts
View File

@ -1,11 +0,0 @@
import request from '@/utils/request';
/**
* 查询数据并分页
* @param params
*/
export async function getPage(params?: any) {
return request('/api/biz-service-ebtp-project/v1/projectRecord/supervisor/getPage', {
method: 'POST',
data: params,
});
}

2
src/pages/VideoMonitor/ViewModal.tsx
View File

@ -108,7 +108,7 @@ const columns: ColumnsType<DataType> = [
<Descriptions>
<Descriptions.Item label="项目编号">{data?.projectNumber}</Descriptions.Item>
<Descriptions.Item label="标段名称">{data?.sectionName}</Descriptions.Item>
<Descriptions.Item label="评标室名称">{data?.reviewRoomName}</Descriptions.Item>
<Descriptions.Item label="评标室名称">{data?.areaRoomName}</Descriptions.Item>
<Descriptions.Item label="评标状态">{getStateName(data?.state)}</Descriptions.Item>
<Descriptions.Item label="预计开始时间">{data?.startTime}</Descriptions.Item>
<Descriptions.Item label="预计结束时间">{data?.endTime}</Descriptions.Item>

2
src/pages/VideoMonitor/Online/service.ts → src/pages/VideoMonitor/service.ts
View File

@ -4,7 +4,7 @@ import request from '@/utils/request';
* @param params
*/
export async function getPage(params?: any) {
return request('/api/biz-service-ebtp-project/v1/projectRecord/supervisor/getPage', {
return request('/api/biz-service-ebtp-evaluation//v1/eval/room/reserve/supervise/list', {
method: 'POST',
data: params,
});