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

bug修复：13341、13338、13332、13331、13335、13329、13315、13328、13317、13325、13334、13340、13343

master
LiuJiaNan 2026-01-04 17:56:55 +08:00
parent 9a79c89ebd
commit c798a4df66
11 changed files with 74 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -31,7 +31,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-to-print": "^3.2.0",
"zy-react-library": "^1.1.12"
"zy-react-library": "^1.1.15"
},
"devDependencies": {
"@antfu/eslint-config": "^5.4.1",

2
src/pages/Container/BranchCompany/Average/ConfirmUser/index.js
View File

@ -43,7 +43,7 @@ function HiddenConfirmUser(props) {
<Search
labelCol={{ span: 4 }}
options={[
{ name: "likeUserName", label: "姓名" },
{ name: "likeName", label: "姓名" },
{ name: "eqDeptId", label: "部门", render: <DepartmentSelectTree /> },
]}
form={form}

28
src/pages/Container/BranchCompany/Average/Ledger/Add/index.js
View File

@ -256,6 +256,7 @@ function Add(props) {
setIsShowAiButton(false);
const currentValues = form.getFieldsValue();
const hiddenImageFiles = form.getFieldValue("hiddenImageFiles");
const aiBatch = form.getFieldValue("aiBatch");
const resetValues = {};
Object.keys(currentValues).forEach((key) => {
resetValues[key] = undefined;
@ -264,6 +265,7 @@ function Add(props) {
...resetValues,
...defaultValues,
hiddenImageFiles,
aiBatch,
});
form.setFieldValue("isAi", 1);
form.setFieldValue("hiddenDesc", selectHiddens.current[currentProcessHiddenIndex.current].hiddenDescr);
@ -275,7 +277,23 @@ function Add(props) {
form.setFieldValue("creatorName", userInfo.current.name);
}
else {
props.history.goBack();
if (getUnprocessedImagesCount() > 0) {
Modal.confirm({
title: "温馨提示",
content: "当前有未处理完的隐患图片，是否继续处理",
onOk: () => {
setModalTitle("选择其他图片进行AI识别");
setImageSelectModalOpen(true);
setUploadedImages(getUnprocessedImages());
},
onCancel: () => {
props.history.goBack();
},
});
}
else {
props.history.goBack();
}
}
}
};
@ -829,11 +847,9 @@ const ImageSelectModal = (props) => {
<Image
src={image.url || URL.createObjectURL(image.originFileObj)}
alt={`图片 ${index + 1}`}
style={{
maxWidth: "100%",
maxHeight: "100%",
objectFit: "contain",
}}
style={{ objectFit: "contain" }}
width="100%"
height="100%"
preview={false}
/>
</div>

9
src/pages/Container/BranchCompany/Average/Ledger/List/index.js
View File

@ -33,6 +33,7 @@ function List(props) {
transform: formData => ({
hiddenFindTime: formData.hiddenFindTime?.[0],
hiddenFindTimeLe: formData.hiddenFindTime?.[1],
state: formData.state ? [formData.state] : undefined,
}),
});
@ -457,7 +458,7 @@ const PrintModalComponent = (props) => {
{ title: "检查人", dataIndex: "createName" },
{ title: "责任部门", dataIndex: "hiddenFindDeptName" },
{ title: "事故隐患", dataIndex: "hiddenDesc" },
{ title: "隐患等级", dataIndex: "hiddenLevelName" },
{ title: "隐患级别", dataIndex: "hiddenLevelName" },
{ title: "治理措施", dataIndex: "rectificationDesc" },
{
title: "完成时限",
@ -466,7 +467,7 @@ const PrintModalComponent = (props) => {
},
{ title: "整改责任人", dataIndex: "rectifyUserName" },
{
title: "验收人员",
title: "验收人",
dataIndex: "hiddenYUserName",
render: (_, record) => record.state === 301 ? record.hiddenYUserName : "",
},
@ -490,11 +491,11 @@ const PrintModalComponent = (props) => {
<th>检查人</th>
<th>责任部门</th>
<th>事故隐患</th>
<th>隐患等级</th>
<th>隐患级别</th>
<th>治理措施</th>
<th>完成时限</th>
<th>整改责任人</th>
<th>验收人员</th>
<th>验收人</th>
<th>验收时间</th>
<th>验收结果</th>
</tr>

8
src/pages/Container/BranchCompany/Average/Rectification/List/index.js
View File

@ -13,7 +13,7 @@ import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenP
import Table from "zy-react-library/components/Table";
import Upload from "zy-react-library/components/Upload";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM } from "zy-react-library/enum/hidden/gwj";
import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useTable from "zy-react-library/hooks/useTable";
import useUploadFile from "zy-react-library/hooks/useUploadFile";
@ -97,7 +97,11 @@ function List(props) {
},
{ title: "确认人", dataIndex: "confirmUserName", width: 100 },
{ title: "整改人", dataIndex: "rectifyUserName", width: 100 },
{ title: "隐患状态", dataIndex: "state", render: () => "未整改" },
{
title: "隐患状态",
dataIndex: "state",
render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }),
},
{
title: "操作",
width: 260,

2
src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js
View File

@ -17,7 +17,7 @@ function ListView(props) {
});
return (
<Page headerTitle="重复隐患">
<Page headerTitle="查看">
<Table
headerTitle={`企业名称:${query.corpName}`}
columns={[

11
src/pages/Container/Supervision/Average/Average/HiddenList/index.js
View File

@ -11,7 +11,6 @@ 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";
import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj";
@ -49,17 +48,12 @@ function HiddenList(props) {
{ name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
{ name: "hiddenDesc", label: "隐患描述" },
{ name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree /> },
{ name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree searchType="all" /> },
{
name: "hiddenType",
label: "隐患类型",
render: <DictionarySelectTree dictValue="hiddenType" />,
},
{
name: "hiddenPart",
label: "隐患部位",
render: <HiddenPartSelectTree />,
},
{
name: "hiddenLevel",
label: "隐患级别",
@ -74,7 +68,7 @@ function HiddenList(props) {
},
{ name: "confirmUserName", label: "确认人" },
{ name: "rectificationUserName", label: "整改人" },
{ name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree /> },
{ name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree searchType="all" /> },
{ name: "checkUserName", label: "验收人" },
{
name: "isRelated",
@ -132,7 +126,6 @@ function HiddenList(props) {
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName", width: 130 },
{

36
src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js
View File

@ -1,8 +1,12 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd";
import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
import { HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetFile from "zy-react-library/hooks/useGetFile";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable";
import { getLabelName } from "zy-react-library/utils";
@ -11,10 +15,19 @@ import { NS_AVERAGE } from "~/enumerate/namespace";
function ListView(props) {
const query = useGetUrlQuery();
const [form] = Form.useForm();
const { loading, getFile } = useGetFile();
const [list, setList] = useState([]);
const { tableProps } = useTable(props["averageRepeatHiddenList"], {
form,
params: {
corpId: query.id,
params: { corpId: query.id },
onSuccess: async (data) => {
for (let i = 0; i < data.list.length; i++) {
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["3"], eqForeignKey: data.list[i].hiddenId });
data.list[i].files = files;
}
setList(data.list);
},
});
@ -23,14 +36,27 @@ function ListView(props) {
<Table
headerTitle={`企业名称:${query.corpName}`}
columns={[
{
title: "隐患图片",
dataIndex: "files",
render: (_, record) => (<TooltipPreviewImg files={record.files} />),
},
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患来源", dataIndex: "source", render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }) },
{
title: "隐患来源",
dataIndex: "source",
render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }),
},
{ title: "隐患级别", dataIndex: "hiddenLevelName" },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName" },
{ title: "隐患发现时间", dataIndex: "hiddenFindTime" },
{ title: "隐患状态", dataIndex: "state", render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }) },
{
title: "隐患状态",
dataIndex: "state",
render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }),
},
{
title: "操作",
width: 100,
@ -50,6 +76,8 @@ function ListView(props) {
},
]}
{...tableProps}
dataSource={list}
loading={loading || tableProps.loading}
/>
</Page>
);

9
src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js
View File

@ -7,7 +7,6 @@ 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";
import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { HIDDEN_SOURCE_ENUM } from "zy-react-library/enum/hidden/gwj";
@ -59,17 +58,12 @@ function HiddenList(props) {
{ name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
{ name: "hiddenDesc", label: "隐患描述" },
{ name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree /> },
{ name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree searchType="all" /> },
{
name: "hiddenType",
label: "隐患类型",
render: <DictionarySelectTree dictValue="hiddenType" />,
},
{
name: "hiddenPart",
label: "隐患部位",
render: <HiddenPartSelectTree />,
},
{ name: "creatorName", label: "隐患发现人" },
{ name: "confirmUserName", label: "确认人" },
{
@ -111,7 +105,6 @@ function HiddenList(props) {
},
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName", width: 130 },
{

11
src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js
View File

@ -8,7 +8,6 @@ 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";
import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM } from "zy-react-library/enum/hidden/gwj";
@ -58,17 +57,12 @@ function HiddenList(props) {
{ name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
{ name: "hiddenDesc", label: "隐患描述" },
{ name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree /> },
{ name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree searchType="all" /> },
{
name: "hiddenType",
label: "隐患类型",
render: <DictionarySelectTree dictValue="hiddenType" />,
},
{
name: "hiddenPart",
label: "隐患部位",
render: <HiddenPartSelectTree />,
},
{
name: "hiddenLevel",
label: "隐患级别",
@ -77,7 +71,7 @@ function HiddenList(props) {
{ name: "creatorName", label: "隐患发现人" },
{ name: "confirmUserName", label: "确认人" },
{ name: "rectificationUserName", label: "整改人" },
{ name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree /> },
{ name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree searchType="all" /> },
{
name: "isRelated",
label: "是否相关方",
@ -118,7 +112,6 @@ function HiddenList(props) {
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName", width: 130 },
{

2
src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js
View File

@ -42,7 +42,7 @@ function HiddenList(props) {
options={[
{ name: "likeHiddenDesc", label: "隐患描述" },
{ name: "eqSource", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
{ name: "eqHiddenFindDept", label: "发现部门", render: (<DepartmentSelectTree />) },
{ name: "eqHiddenFindDept", label: "发现部门", render: (<DepartmentSelectTree searchType="all" />) },
{ name: "likeFindUserName", label: "隐患发现人" },
{ name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{