+
{info.subject}
现场安全检查记录
@@ -127,7 +123,8 @@ function InspectionView(props) {
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{
- title: "操作", render: (_, record) => (
+ title: "操作",
+ render: (_, record) => (
- )
+ ),
},
]}
/>
@@ -245,7 +242,7 @@ function InspectionView(props) {
}}
/>
)}
-
+
);
}
diff --git a/src/pages/Container/BranchCompany/Plan/Execute/InspectionRecords/index.js b/src/pages/Container/BranchCompany/Plan/Execute/InspectionRecords/index.js
index e31b9f1..67ec78d 100644
--- a/src/pages/Container/BranchCompany/Plan/Execute/InspectionRecords/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Execute/InspectionRecords/index.js
@@ -1,15 +1,7 @@
-import HeaderBack from "zy-react-library/components/HeaderBack";
import InspectionList from "../../../Inspection/Inspection/List";
function InspectionRecords(props) {
- return (
-
- );
+ return (
);
}
export default InspectionRecords;
diff --git a/src/pages/Container/BranchCompany/Plan/Execute/List/index.js b/src/pages/Container/BranchCompany/Plan/Execute/List/index.js
index 90855df..c060357 100644
--- a/src/pages/Container/BranchCompany/Plan/Execute/List/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Execute/List/index.js
@@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Modal, Space } from "antd";
import dayjs from "dayjs";
import { useState } from "react";
+import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
@@ -21,7 +22,7 @@ function List(props) {
});
return (
-
+
);
}
@@ -144,14 +145,14 @@ const PlanExecutionPersonnelModalComponent = (props) => {
title="计划执行人员"
open
maskClosable={false}
- width={1000}
+ width={800}
onCancel={props.onCancel}
footer={[
,
]}
>
},
{ name: "userName", label: "人员" },
diff --git a/src/pages/Container/BranchCompany/Plan/Management/List/index.js b/src/pages/Container/BranchCompany/Plan/Management/List/index.js
index f202567..057b5b2 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/List/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/List/index.js
@@ -5,6 +5,7 @@ import dayjs from "dayjs";
import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon";
+import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search";
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
@@ -49,7 +50,7 @@ function List(props) {
};
return (
-
+
);
}
@@ -271,17 +272,18 @@ const AddModalComponent = (props) => {
return (
-
-
-
计划信息
-
-
人员执行详情
-
(`自${record.timeStart}至${record.timeEnd}止`) },
- {
- title: "检查状态",
- dataIndex: "status",
- render: (_, record) => (getLabelName({ list: INSPECTION_STATE_ENUM, status: record.status })),
- },
- { title: "发现隐患数", dataIndex: "hiddenNumber" },
- {
- title: "操作",
- fixed: "right",
- width: 100,
- render: (_, record) => (
-
-
-
- ),
- },
- ]}
- disabledResizer={true}
- options={false}
- {...tableProps}
- />
-
-
+
+ 计划信息
+
+ 人员执行详情
+ (`自${record.timeStart}至${record.timeEnd}止`) },
+ {
+ title: "检查状态",
+ dataIndex: "status",
+ render: (_, record) => (getLabelName({ list: INSPECTION_STATE_ENUM, status: record.status })),
+ },
+ { title: "发现隐患数", dataIndex: "hiddenNumber" },
+ {
+ title: "操作",
+ fixed: "right",
+ width: 100,
+ render: (_, record) => (
+
+
+
+ ),
+ },
+ ]}
+ disabledResizer={true}
+ options={false}
+ {...tableProps}
+ />
+
);
}
diff --git a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionRecords/index.js b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionRecords/index.js
index 4da9d35..cfb759b 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionRecords/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionRecords/index.js
@@ -1,6 +1,6 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form } from "antd";
-import HeaderBack from "zy-react-library/components/HeaderBack";
+import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import Table from "zy-react-library/components/Table";
@@ -17,48 +17,45 @@ function PersonnelExecutionRecords(props) {
});
return (
-
-
-
-
},
- { name: "userName", label: "人员" },
- ]}
- form={form}
- onFinish={getData}
- />
-
(`${record.actualExecCount}/${record.planExecuteNum}`),
- },
- {
- title: "操作",
- fixed: "right",
- width: 150,
- render: (_, record) => (
-
- ),
- },
- ]}
- {...tableProps}
- />
-
-
+
+ },
+ { name: "userName", label: "人员" },
+ ]}
+ form={form}
+ onFinish={getData}
+ />
+ (`${record.actualExecCount}/${record.planExecuteNum}`),
+ },
+ {
+ title: "操作",
+ fixed: "right",
+ width: 150,
+ render: (_, record) => (
+
+ ),
+ },
+ ]}
+ {...tableProps}
+ />
+
);
}
diff --git a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
index 1632e09..bb49e66 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
@@ -1,6 +1,6 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Divider, Space } from "antd";
-import HeaderBack from "zy-react-library/components/HeaderBack";
+import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable";
@@ -16,52 +16,49 @@ function PlanExecutionDetails(props) {
});
return (
-
-
-
-
计划信息
-
-
计划执行详情
-
(`自${record.timeStart}至${record.timeEnd}止`) },
- {
- title: "检查状态",
- dataIndex: "status",
- render: (_, record) => (getLabelName({ list: INSPECTION_STATE_ENUM, status: record.status })),
- },
- { title: "发现隐患数", dataIndex: "hiddenNumber" },
- {
- title: "操作",
- fixed: "right",
- width: 100,
- render: (_, record) => (
-
-
-
- ),
- },
- ]}
- disabledResizer={true}
- options={false}
- {...tableProps}
- />
-
-
+
+ 计划信息
+
+ 计划执行详情
+ (`自${record.timeStart}至${record.timeEnd}止`) },
+ {
+ title: "检查状态",
+ dataIndex: "status",
+ render: (_, record) => (getLabelName({ list: INSPECTION_STATE_ENUM, status: record.status })),
+ },
+ { title: "发现隐患数", dataIndex: "hiddenNumber" },
+ {
+ title: "操作",
+ fixed: "right",
+ width: 100,
+ render: (_, record) => (
+
+
+
+ ),
+ },
+ ]}
+ disabledResizer={true}
+ options={false}
+ {...tableProps}
+ />
+
);
}
diff --git a/src/pages/Container/Supervision/HiddenView/index.js b/src/pages/Container/Supervision/HiddenView/index.js
index 41db77d..aa91bb4 100644
--- a/src/pages/Container/Supervision/HiddenView/index.js
+++ b/src/pages/Container/Supervision/HiddenView/index.js
@@ -1,10 +1,11 @@
import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj";
+import Page from "zy-react-library/components/Page";
function HiddenView() {
return (
-
+
);
}
diff --git a/src/pages/Container/Supervision/Plan/Execute/InspectionRecords/index.js b/src/pages/Container/Supervision/Plan/Execute/InspectionRecords/index.js
index 5b58234..224fe38 100644
--- a/src/pages/Container/Supervision/Plan/Execute/InspectionRecords/index.js
+++ b/src/pages/Container/Supervision/Plan/Execute/InspectionRecords/index.js
@@ -1,15 +1,7 @@
-import HeaderBack from "zy-react-library/components/HeaderBack";
import InspectionList from "../../../Inspection/Inspection/List";
function InspectionRecords(props) {
- return (
-
- );
+ return ();
}
export default InspectionRecords;
diff --git a/src/pages/Container/Supervision/Plan/ViewInfo/index.js b/src/pages/Container/Supervision/Plan/ViewInfo/index.js
index a4c514d..25a24c8 100644
--- a/src/pages/Container/Supervision/Plan/ViewInfo/index.js
+++ b/src/pages/Container/Supervision/Plan/ViewInfo/index.js
@@ -1,9 +1,7 @@
import ViewInfoA from "~/pages/Container/BranchCompany/Plan/ViewInfo";
function ViewInfo(props) {
- return (
-
- );
+ return ();
}
export default ViewInfo;
diff --git a/src/pages/Container/Supervision/Statistics/InspectionRecordsList/index.js b/src/pages/Container/Supervision/Statistics/InspectionRecordsList/index.js
new file mode 100644
index 0000000..447f910
--- /dev/null
+++ b/src/pages/Container/Supervision/Statistics/InspectionRecordsList/index.js
@@ -0,0 +1,7 @@
+import RecordsList from "~/pages/Container/Supervision/Inspection/Records/List";
+
+function InspectionRecordsList(props) {
+ return ;
+}
+
+export default InspectionRecordsList;
diff --git a/src/pages/Container/Supervision/Statistics/List/index.js b/src/pages/Container/Supervision/Statistics/List/index.js
index 886cf98..2c8308d 100644
--- a/src/pages/Container/Supervision/Statistics/List/index.js
+++ b/src/pages/Container/Supervision/Statistics/List/index.js
@@ -1,6 +1,7 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form } from "antd";
import dayjs from "dayjs";
+import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
@@ -39,7 +40,7 @@ function List(props) {
});
return (
-
+
{
const dates = getDate();
- props.history.push(`../plan/management/list?corpId=${record.corpId}&startTime=${dates.startTime}&endTime=${dates.endTime}&entrance=statistics`);
+ props.history.push(`./planList?corpId=${record.corpId}&startTime=${dates.startTime}&endTime=${dates.endTime}&entrance=statistics&headerTitle=计划总数`);
}}
>
{record.planTotal}
@@ -86,7 +87,7 @@ function List(props) {
type="link"
onClick={() => {
const dates = getDate();
- props.history.push(`../plan/management/list?corpId=${record.corpId}&startTime=${dates.startTime}&endTime=${dates.endTime}&entrance=statistics&completedOnly=1`);
+ props.history.push(`./planList?corpId=${record.corpId}&startTime=${dates.startTime}&endTime=${dates.endTime}&entrance=statistics&completedOnly=1&headerTitle=已完成计划数`);
}}
>
{record.completedPlanCount}
@@ -106,7 +107,7 @@ function List(props) {
type="link"
onClick={() => {
const dates = getDate();
- props.history.push(`../inspection/records/list?corpId=${record.corpId}&checkStartTime=${dates.startTime}&checkEndTime=${dates.endTime}&entrance=statistics`);
+ props.history.push(`./inspectionRecordsList?corpId=${record.corpId}&checkStartTime=${dates.startTime}&checkEndTime=${dates.endTime}&entrance=statistics&headerTitle=检查总数`);
}}
>
{record.inspectionTotal}
@@ -121,7 +122,7 @@ function List(props) {
type="link"
onClick={() => {
const dates = getDate();
- props.history.push(`../inspection/records/list?corpId=${record.corpId}&checkStartTime=${dates.startTime}&checkEndTime=${dates.endTime}&entrance=statistics&planType=1`);
+ props.history.push(`./inspectionRecordsList?corpId=${record.corpId}&checkStartTime=${dates.startTime}&checkEndTime=${dates.endTime}&entrance=statistics&planType=1&headerTitle=计划内检查数`);
}}
>
{record.planInCount}
@@ -136,7 +137,7 @@ function List(props) {
type="link"
onClick={() => {
const dates = getDate();
- props.history.push(`../inspection/records/list?corpId=${record.corpId}&checkStartTime=${dates.startTime}&checkEndTime=${dates.endTime}&entrance=statistics&planType=0`);
+ props.history.push(`./inspectionRecordsList?corpId=${record.corpId}&checkStartTime=${dates.startTime}&checkEndTime=${dates.endTime}&entrance=statistics&planType=0&headerTitle=计划外检查数`);
}}
>
{record.planOutCount}
@@ -148,7 +149,7 @@ function List(props) {
]}
{...tableProps}
/>
-