diff --git a/script/1.0.3/schema/13.updata_resource.sql b/script/1.0.3/schema/13.updata_resource.sql new file mode 100644 index 0000000..7e62a51 --- /dev/null +++ b/script/1.0.3/schema/13.updata_resource.sql @@ -0,0 +1,2 @@ +DELETE FROM public.resource WHERE code = 'XIUGAIJIUHA'; +DELETE FROM public.user_resource WHERE resource = 'XIUGAIJIUHA'; \ No newline at end of file diff --git a/script/1.0.4/schema/1.create_report_serial.sql b/script/1.0.4/schema/1.create_report_serial.sql new file mode 100644 index 0000000..13613af --- /dev/null +++ b/script/1.0.4/schema/1.create_report_serial.sql @@ -0,0 +1,34 @@ +/* + Navicat Premium Data Transfer + + Source Server : 10.8.30.156 + Source Server Type : PostgreSQL + Source Server Version : 100019 + Source Host : 10.8.30.156:5432 + Source Catalog : inspection + Source Schema : public + + Target Server Type : PostgreSQL + Target Server Version : 100019 + File Encoding : 65001 + + Date: 03/03/2023 09:20:08 +*/ + + +-- ---------------------------- +-- Table structure for report_serial +-- ---------------------------- +DROP TABLE IF EXISTS "public"."report_serial"; +CREATE TABLE "public"."report_serial" ( + "project_id" int4 NOT NULL, + "serial_no" int4 +) +; +COMMENT ON COLUMN "public"."report_serial"."project_id" IS '结构物id'; +COMMENT ON COLUMN "public"."report_serial"."serial_no" IS '报告序号'; + +-- ---------------------------- +-- Primary Key structure for table report_serial +-- ---------------------------- +ALTER TABLE "public"."report_serial" ADD CONSTRAINT "report_serial_pkey" PRIMARY KEY ("project_id"); diff --git a/script/1.0.4/schema/2.create_report_info.sql b/script/1.0.4/schema/2.create_report_info.sql new file mode 100644 index 0000000..cde2c83 --- /dev/null +++ b/script/1.0.4/schema/2.create_report_info.sql @@ -0,0 +1,39 @@ +/* + Navicat Premium Data Transfer + + Source Server : 10.8.30.156 + Source Server Type : PostgreSQL + Source Server Version : 100019 + Source Host : 10.8.30.156:5432 + Source Catalog : inspection + Source Schema : public + + Target Server Type : PostgreSQL + Target Server Version : 100019 + File Encoding : 65001 + + Date: 03/03/2023 09:20:24 +*/ + + +-- ---------------------------- +-- Table structure for report_info +-- ---------------------------- +DROP TABLE IF EXISTS "public"."report_info"; +CREATE TABLE "public"."report_info" ( + "id" int4 NOT NULL DEFAULT nextval('report_info_id_seq'::regclass), + "project_id" int4 NOT NULL, + "excel_path" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, + "inspect_tm" timestamp(0) NOT NULL, + "report_tm" timestamp(0) NOT NULL +) +; +COMMENT ON COLUMN "public"."report_info"."project_id" IS '结构物id'; +COMMENT ON COLUMN "public"."report_info"."excel_path" IS '文件路径'; +COMMENT ON COLUMN "public"."report_info"."inspect_tm" IS '巡检时间'; +COMMENT ON COLUMN "public"."report_info"."report_tm" IS '文件生成时间'; + +-- ---------------------------- +-- Primary Key structure for table report_info +-- ---------------------------- +ALTER TABLE "public"."report_info" ADD CONSTRAINT "report_info_pkey" PRIMARY KEY ("id"); 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