From 1e9366910a72d40c9bf17acc9fa6b4982f571bba Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Fri, 3 Mar 2023 10:29:05 +0800 Subject: [PATCH] =?UTF-8?q?(+)=20=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8Aweb?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/patrolManage/actions/index.js | 2 + .../sections/patrolManage/actions/report.js | 15 ++++ .../sections/patrolManage/containers/index.js | 3 +- .../patrolManage/containers/patrolReport.js | 88 +++++++++++++++++++ .../src/sections/patrolManage/nav-item.js | 3 + .../src/sections/patrolManage/routes.js | 10 ++- 6 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 web/client/src/sections/patrolManage/actions/report.js create mode 100644 web/client/src/sections/patrolManage/containers/patrolReport.js diff --git a/web/client/src/sections/patrolManage/actions/index.js b/web/client/src/sections/patrolManage/actions/index.js index d6e7974..ad713eb 100644 --- a/web/client/src/sections/patrolManage/actions/index.js +++ b/web/client/src/sections/patrolManage/actions/index.js @@ -2,12 +2,14 @@ import * as plan from './plan' import * as record from './record' +import * as report from './report' import * as template from './template' import * as checkItems from './checkItems' export default { ...plan, ...record, + ...report, ...template, ...checkItems, } \ No newline at end of file diff --git a/web/client/src/sections/patrolManage/actions/report.js b/web/client/src/sections/patrolManage/actions/report.js new file mode 100644 index 0000000..ca1d63e --- /dev/null +++ b/web/client/src/sections/patrolManage/actions/report.js @@ -0,0 +1,15 @@ +'use strict'; + +import { basicAction } from '@peace/utils' +import { ApiTable } from '$utils' + +// export function getPatrolReport (query) { +// return dispatch => basicAction({ +// type: 'get', +// query, +// dispatch: dispatch, +// actionType: 'GET_PATROL_REPORT', +// url: ApiTable.getPatrolReport, +// msg: { error: '获取巡检报告失败' }, +// }); +// } \ No newline at end of file diff --git a/web/client/src/sections/patrolManage/containers/index.js b/web/client/src/sections/patrolManage/containers/index.js index acdb15d..8bcbd53 100644 --- a/web/client/src/sections/patrolManage/containers/index.js +++ b/web/client/src/sections/patrolManage/containers/index.js @@ -2,7 +2,8 @@ import PatrolPlan from './patrolPlan'; import PatrolReocrd from './patrolRecord'; +import PatrolReport from './patrolReport'; import CheckItems from './checkItems'; import PlanTemplate from './patrolTemplate'; -export { PatrolPlan, PatrolReocrd, CheckItems, PlanTemplate }; \ No newline at end of file +export { PatrolPlan, PatrolReocrd, PatrolReport, CheckItems, PlanTemplate }; \ No newline at end of file diff --git a/web/client/src/sections/patrolManage/containers/patrolReport.js b/web/client/src/sections/patrolManage/containers/patrolReport.js new file mode 100644 index 0000000..dee37e8 --- /dev/null +++ b/web/client/src/sections/patrolManage/containers/patrolReport.js @@ -0,0 +1,88 @@ +import React, { useState, useRef } from 'react'; +import { connect } from 'react-redux'; +import { Button } from 'antd'; +import ProTable from '@ant-design/pro-table'; +import { getCheckItems } from '../actions/checkItems'; + +function patrolReport(props) { + const { dispatch } = props; + const tableRef = useRef(); + const [dataSource, setDataSource] = useState([{}]); + + const columns = [{ + title: '结构物名称', + dataIndex: 'name', + key: 'name', + ellipsis: true, + width: 150, + }, { + title: '巡检报告名称', + dataIndex: 'groupName', + key: 'groupName', + ellipsis: true, + search: false, + width: 250, + render: (_, record) => { + return
{record?.checkItemsGroup?.name}
+ } + }, { + title: '巡检日期', + dataIndex: 'date', + key: 'date', + valueType: 'dateRange', + ellipsis: true, + width: 150, + render: (_, record) => { + return
{record?.checkItemsGroup?.name}
+ } + }, { + title: '操作', + dataIndex: 'action', + key: 'action', + search: false, + width: 200, + render: (_, record) => { + return <> + + + + }, + }]; + + return ( + <> + { + // const res = await dispatch(getCheckItems({ + // limit: params.pageSize, + // page: params.current - 1, + // name: params?.name + // })); + // setDataSource(res?.payload.data?.rows); + // return { + // ...res, + // total: res.payload.data.count ? res.payload.data.count : 0, + // }; + }} + onReset={() => { }} + /> + + ) +} + +function mapStateToProps(state) { + const { auth } = state + return { + user: auth.user + } +} +export default connect(mapStateToProps)(patrolReport); diff --git a/web/client/src/sections/patrolManage/nav-item.js b/web/client/src/sections/patrolManage/nav-item.js index 7b75be9..4951534 100644 --- a/web/client/src/sections/patrolManage/nav-item.js +++ b/web/client/src/sections/patrolManage/nav-item.js @@ -17,6 +17,9 @@ export function getNavItem (user, dispatch) { {Func.isAuthorized('PATROL_RECORD_VIEW') && 巡检记录 } + {Func.isAuthorized('CHECKREPORT') && + 巡检报告 + } {Func.isAuthorized('CHECKITEMSET') && 检查项设定 } diff --git a/web/client/src/sections/patrolManage/routes.js b/web/client/src/sections/patrolManage/routes.js index ba0f6e4..fd8190f 100644 --- a/web/client/src/sections/patrolManage/routes.js +++ b/web/client/src/sections/patrolManage/routes.js @@ -1,5 +1,5 @@ 'use strict'; -import { PatrolPlan, PatrolReocrd, CheckItems, PlanTemplate } from './containers'; +import { PatrolPlan, PatrolReocrd, PatrolReport, CheckItems, PlanTemplate } from './containers'; export default [{ type: 'inner', @@ -17,8 +17,12 @@ export default [{ key: 'patrolRecord', component: PatrolReocrd, breadcrumb: '巡检记录', - }, - { + }, { + path: '/patrolReport', + key: 'patrolReport', + component: PatrolReport, + breadcrumb: '巡检报告', + }, { path: '/checkItems', key: 'checkItems', component: CheckItems,