From c798a4df66ad3594e66a3bb974893d0db7795331 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Sun, 4 Jan 2026 17:56:55 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A13341=E3=80=81133?= =?UTF-8?q?38=E3=80=8113332=E3=80=8113331=E3=80=8113335=E3=80=8113329?= =?UTF-8?q?=E3=80=8113315=E3=80=8113328=E3=80=8113317=E3=80=8113325?= =?UTF-8?q?=E3=80=8113334=E3=80=8113340=E3=80=8113343?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../Average/ConfirmUser/index.js | 2 +- .../BranchCompany/Average/Ledger/Add/index.js | 28 +++++++++++---- .../Average/Ledger/List/index.js | 9 ++--- .../Average/Rectification/List/index.js | 8 +++-- .../AIHazardIdentification/ListView/index.js | 2 +- .../Average/Average/HiddenList/index.js | 11 ++---- .../Average/DuplicateHazard/ListView/index.js | 36 ++++++++++++++++--- .../Average/Ignore/HiddenList/index.js | 9 +---- .../SpecialDisposal/HiddenList/index.js | 11 ++---- .../HiddenEvaluation/HiddenList/index.js | 2 +- 11 files changed, 74 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 2e1aeac..4211282 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js b/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js index 87ec564..6698532 100644 --- a/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js +++ b/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js @@ -43,7 +43,7 @@ function HiddenConfirmUser(props) { }, ]} form={form} diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 64bb752..4b6cd60 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -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) => { {`图片 diff --git a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js index 2d36a6e..ca5becf 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js @@ -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) => { 检查人 责任部门 事故隐患 - 隐患等级 + 隐患级别 治理措施 完成时限 整改责任人 - 验收人员 + 验收人 验收时间 验收结果 diff --git a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js index 7a3e0d9..c3c18bc 100644 --- a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js @@ -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, diff --git a/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js b/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js index 2e92809..1544f51 100644 --- a/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js +++ b/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js @@ -17,7 +17,7 @@ function ListView(props) { }); return ( - + }, + { name: "hiddenFindDept", label: "隐患发现部门", render: }, { name: "hiddenType", label: "隐患类型", render: , }, - { - name: "hiddenPart", - label: "隐患部位", - render: , - }, { name: "hiddenLevel", label: "隐患级别", @@ -74,7 +68,7 @@ function HiddenList(props) { }, { name: "confirmUserName", label: "确认人" }, { name: "rectificationUserName", label: "整改人" }, - { name: "rectificationDeptId", label: "整改部门", render: }, + { name: "rectificationDeptId", label: "整改部门", render: }, { 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 }, { diff --git a/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js b/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js index aa56c4b..e70c78c 100644 --- a/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js +++ b/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js @@ -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) { (), + }, { 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} /> ); diff --git a/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js b/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js index 6e23b5f..1f95da5 100644 --- a/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js +++ b/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js @@ -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: }, + { name: "hiddenFindDept", label: "隐患发现部门", render: }, { name: "hiddenType", label: "隐患类型", render: , }, - { - name: "hiddenPart", - label: "隐患部位", - render: , - }, { 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 }, { diff --git a/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js b/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js index 41f7ffa..2091c54 100644 --- a/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js +++ b/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js @@ -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: }, + { name: "hiddenFindDept", label: "隐患发现部门", render: }, { name: "hiddenType", label: "隐患类型", render: , }, - { - name: "hiddenPart", - label: "隐患部位", - render: , - }, { name: "hiddenLevel", label: "隐患级别", @@ -77,7 +71,7 @@ function HiddenList(props) { { name: "creatorName", label: "隐患发现人" }, { name: "confirmUserName", label: "确认人" }, { name: "rectificationUserName", label: "整改人" }, - { name: "rectificationDeptId", label: "整改部门", render: }, + { name: "rectificationDeptId", label: "整改部门", render: }, { 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 }, { diff --git a/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js b/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js index 6126832..09107b8 100644 --- a/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js +++ b/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js @@ -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: () }, + { name: "eqHiddenFindDept", label: "发现部门", render: () }, { name: "likeFindUserName", label: "隐患发现人" }, { name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, {