zcloud_gbs
/
zcloud_gbs_inspection-react
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复检查统计路由跳转错误

master
LiuJiaNan 2026-01-20 11:45:09 +08:00
parent 07090afb89
commit 76e9070bba
6 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/Container/BranchCompany/InspectionView/index.js
View File

@ -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

6
src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
View File

@ -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}`);
}}
>
查看

6
src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
View File

@ -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}`);
}}
>
查看

7
src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js Normal file
View File

@ -0,0 +1,7 @@
import PersonnelExecutionDetailsA from "~/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails";
function PersonnelExecutionDetails(props) {
return <PersonnelExecutionDetailsA {...props} supervision="1" />;
}
export default PersonnelExecutionDetails;

7
src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js Normal file
View File

@ -0,0 +1,7 @@
import PersonnelExecutionRecordsA from "~/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionRecords";
function PersonnelExecutionRecords(props) {
return <PersonnelExecutionRecordsA {...props} />;
}
export default PersonnelExecutionRecords;

7
src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js Normal file
View File

@ -0,0 +1,7 @@
import PlanExecutionDetailsA from "~/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails";
function PlanExecutionDetails(props) {
return <PlanExecutionDetailsA {...props} supervision="1" />;
}
export default PlanExecutionDetails;