From 76e9070bba2e57e7063603b60b2ff4b01165731b Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Tue, 20 Jan 2026 11:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=9F=A5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Container/BranchCompany/InspectionView/index.js | 8 +-------
 .../Plan/Management/PersonnelExecutionDetails/index.js    | 6 +++---
 .../Plan/Management/PlanExecutionDetails/index.js         | 6 +++---
 .../Statistics/PersonnelExecutionDetails/index.js         | 7 +++++++
 .../Statistics/PersonnelExecutionRecords/index.js         | 7 +++++++
 .../Supervision/Statistics/PlanExecutionDetails/index.js  | 7 +++++++
 6 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js
 create mode 100644 src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js
 create mode 100644 src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js

diff --git a/src/pages/Container/BranchCompany/InspectionView/index.js b/src/pages/Container/BranchCompany/InspectionView/index.js
index 784fe88..f08606b 100644
--- a/src/pages/Container/BranchCompany/InspectionView/index.js
+++ b/src/pages/Container/BranchCompany/InspectionView/index.js
@@ -73,7 +73,7 @@ function InspectionView(props) {
   }, []);
 
   return (
-    <Page headerTitle="查看">
+    <Page headerTitle="查看" extraActionButtons={<Button type="primary" onClick={handlePrint}>打印</Button>}>
       <Spin spinning={props.inspection.inspectionLoading || getFileLoading}>
         <div ref={contentRef}>
           <Divider orientation="left">
@@ -214,12 +214,6 @@ function InspectionView(props) {
             ]}
           />
         </div>
-        <div style={{ marginTop: 20, paddingBottom: 20, textAlign: "center" }}>
-          <Space>
-            <Button type="primary" onClick={handlePrint}>打印</Button>
-            {/* {query.isExport !== "0" && <Button type="primary">导出</Button>} */}
-          </Space>
-        </div>
       </Spin>
       {hiddenViewModalOpen && (
         <HiddenViewModal
diff --git a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
index 58b4238..5850d9d 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
@@ -5,10 +5,10 @@ import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
-import { formatDate } from "~/utils/dateFormat";
 import { INSPECTION_STATE_ENUM } from "~/enumerate/constant";
 import { NS_INSPECTION } from "~/enumerate/namespace";
 import ViewInfo from "~/pages/Container/BranchCompany/Plan/ViewInfo";
+import { formatDate } from "~/utils/dateFormat";
 
 function PersonnelExecutionDetails(props) {
   const query = useGetUrlQuery();
@@ -18,7 +18,7 @@ function PersonnelExecutionDetails(props) {
       entrance: "2",
       checkUserId: query.userId,
       planId: query.planId,
-    }
+    },
   });
 
   return (
@@ -52,7 +52,7 @@ function PersonnelExecutionDetails(props) {
                 <Button
                   type="link"
                   onClick={() => {
-                    props.history.push(`../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`);
+                    props.history.push(props.supervision === "1" ? `../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}` : `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`);
                   }}
                 >
                   查看
diff --git a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
index ed0a4a1..64bddbf 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
@@ -5,10 +5,10 @@ import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
-import { formatDate } from "~/utils/dateFormat";
 import { INSPECTION_STATE_ENUM } from "~/enumerate/constant";
 import { NS_INSPECTION } from "~/enumerate/namespace";
 import ViewInfo from "~/pages/Container/BranchCompany/Plan/ViewInfo";
+import { formatDate } from "~/utils/dateFormat";
 
 function PlanExecutionDetails(props) {
   const query = useGetUrlQuery();
@@ -19,7 +19,7 @@ function PlanExecutionDetails(props) {
   return (
     <Page headerTitle="计划执行总次数" contentPadding="0 20px 20px 20px">
       <Divider orientation="left">计划信息</Divider>
-      <ViewInfo id={query.planId} />
+      <ViewInfo id={query.planId} supervision={props.supervision} />
       <Divider orientation="left">计划执行详情</Divider>
       <Table
         columns={[
@@ -46,7 +46,7 @@ function PlanExecutionDetails(props) {
                 <Button
                   type="link"
                   onClick={() => {
-                    props.history.push(`../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`);
+                    props.history.push(props.supervision === "1" ? `../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}` : `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`);
                   }}
                 >
                   查看
diff --git a/src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js b/src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js
new file mode 100644
index 0000000..31a3946
--- /dev/null
+++ b/src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js
@@ -0,0 +1,7 @@
+import PersonnelExecutionDetailsA from "~/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails";
+
+function PersonnelExecutionDetails(props) {
+  return <PersonnelExecutionDetailsA {...props} supervision="1" />;
+}
+
+export default PersonnelExecutionDetails;
diff --git a/src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js b/src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js
new file mode 100644
index 0000000..b6bce4c
--- /dev/null
+++ b/src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js
@@ -0,0 +1,7 @@
+import PersonnelExecutionRecordsA from "~/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionRecords";
+
+function PersonnelExecutionRecords(props) {
+  return <PersonnelExecutionRecordsA {...props} />;
+}
+
+export default PersonnelExecutionRecords;
diff --git a/src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js b/src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js
new file mode 100644
index 0000000..7e40bc6
--- /dev/null
+++ b/src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js
@@ -0,0 +1,7 @@
+import PlanExecutionDetailsA from "~/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails";
+
+function PlanExecutionDetails(props) {
+  return <PlanExecutionDetailsA {...props} supervision="1" />;
+}
+
+export default PlanExecutionDetails;