From 4c4ff42c0b96b4067fba27f7d3433d02a5550147 Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Thu, 15 Jan 2026 17:17:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E5=AE=8C=E5=96=84=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=AA=8C=E6=94=B6=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新隐患验收列表的状态筛选逻辑和按钮显示条件 - 调整被检查单位选择组件的参数配置 - 修复防爆检查提交时的检查ID字段映射问题 - 在隐患添加表单中增加ID字段显示 - 优化签名文件路径获取的空值处理 - 调整检查人员部门选择组件的搜索类型和参数 - 更新检查列表入口参数以支持不同入口类型 - 重构记录列表的查询参数和成功回调逻辑 - 增加检查时间格式化显示和打印功能 - 完善计划执行详情的查询参数传递 - 更新监管端验收和检查页面的组织架构搜索配置 - 添加系统全局地图坐标和倾斜摄影数据配置 --- src/main.js | 11 +++++++- .../Inspection/Acceptance/HiddenList/index.js | 25 +++++++++++-------- .../Inspection/Acceptance/List/index.js | 2 +- .../Inspection/Defense/List/index.js | 2 +- .../Add/components/HiddenAdd/index.js | 2 ++ .../Inspection/Inspection/Add/index.js | 7 +++--- .../Inspection/Inspection/List/index.js | 2 +- .../Inspection/Records/List/index.js | 11 ++++---- .../BranchCompany/InspectionView/index.js | 9 ++++++- .../PersonnelExecutionDetails/index.js | 11 ++++++-- .../Inspection/Acceptance/List/index.js | 2 +- .../Inspection/Inspection/Add/index.js | 2 +- 12 files changed, 58 insertions(+), 28 deletions(-) diff --git a/src/main.js b/src/main.js index 7f79acf..0d36e2d 100644 --- a/src/main.js +++ b/src/main.js @@ -12,7 +12,16 @@ dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); const app = setup(); - +window.mapLongitude = "119.69457721306945"; +window.mapLatitude = "39.940504336846665"; +window.mapObliquePhotography = [ + "http://192.168.192.215:8021/ware/upload/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E4%B8%9C/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E4%B8%9C/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E8%A5%BF/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E8%A5%BF/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/qhdxys/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/qhdgysh/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/merge_tile.json", +]; // 非底座环境运行 if (!window.__POWERED_BY_QIANKUN__) { // 云组件默认依赖 diff --git a/src/pages/Container/BranchCompany/Inspection/Acceptance/HiddenList/index.js b/src/pages/Container/BranchCompany/Inspection/Acceptance/HiddenList/index.js index 6b79bd8..2a67984 100644 --- a/src/pages/Container/BranchCompany/Inspection/Acceptance/HiddenList/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Acceptance/HiddenList/index.js @@ -1,25 +1,29 @@ -import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Space } from "antd"; +import {Connect} from "@cqsjjb/jjb-dva-runtime"; +import {Button, Space} from "antd"; import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; -import { HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj"; +import {HIDDEN_STATE_ENUM} from "zy-react-library/enum/hidden/gwj"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; -import { getLabelName } from "zy-react-library/utils"; -import { NS_INSPECTION } from "~/enumerate/namespace"; +import {getLabelName} from "zy-react-library/utils"; +import {NS_INSPECTION} from "~/enumerate/namespace"; function HiddenList(props) { const query = useGetUrlQuery(); - const { tableProps } = useTable(props["hiddenList"], { - params: { foreignKey: query.inspectionId, state: "301", queryType: "1" }, + const {tableProps} = useTable(props["hiddenList"], { + params: {foreignKey: query.inspectionId, queryType: "1"}, }); return ( getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }) }, + {title: "隐患描述", dataIndex: "hiddenDesc"}, + { + title: "隐患状态", + dataIndex: "state", + render: (_, record) => getLabelName({list: HIDDEN_STATE_ENUM, status: record.state}) + }, { title: "操作", width: 150, @@ -33,7 +37,7 @@ function HiddenList(props) { > 查看 - + } ), }, diff --git a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js index fc5c579..91a5332 100644 --- a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js @@ -38,7 +38,7 @@ function List(props) { { name: "inspectionUserName", label: "检查人" }, { name: "type", label: "检查类型", render: }, { name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - { name: "inspectedDepartmentId", label: "被检查单位", render: }, + { name: "inspectedDepartmentId", label: "被检查单位", render: }, { name: "inspectedUserName", label: "被检查单位现场负责人" }, ]} form={form} diff --git a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js index 234dabb..10f716d 100644 --- a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js @@ -151,7 +151,7 @@ function DefenseHandlingModalComponent(props) { }); signature = filePath; } - const { success } = await props["defenseSubmit"]({ ...values, signature, inspectionId: props.id }); + const { success } = await props["defenseSubmit"]({ ...values, signature, inspectionId: props.inspectionId }); if (success) { message.success("操作成功"); props.onCancel(); diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/components/HiddenAdd/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/components/HiddenAdd/index.js index 5446722..864ee47 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/components/HiddenAdd/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/components/HiddenAdd/index.js @@ -43,6 +43,8 @@ function HiddenAddModal(props) { showActionButtons={false} onFinish={onSubmit} options={[ + { name: "id", label: "id", onlyForLabel: true }, + { name: "hiddenId", label: "隐患id", onlyForLabel: true }, { name: "hiddenDesc", label: "隐患描述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 }, { name: "hiddenLevel", diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js index 1341a58..865db2d 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js @@ -73,7 +73,7 @@ function Add(props) { } } const currentInspectorUser = data.inspectorVerificationList.filter(item => item.userId === userInfo.id)[0]; - setSignatureFilePath(currentInspectorUser.signature ? getFileUrl() + currentInspectorUser.signature : ""); + setSignatureFilePath(currentInspectorUser?.signature ? getFileUrl() + currentInspectorUser.signature : ""); form.setFieldsValue({ ...data, situationList: situationList.length > 0 ? situationList : [{ content: undefined }], @@ -370,7 +370,7 @@ function Add(props) { render: ( form.setFieldValue(["personUnderInspection", "departmentName"], label)} onChange={() => { form.setFieldValue(["personUnderInspection", "userId"], ""); @@ -437,7 +437,8 @@ function Add(props) { label: "检查人员部门", render: ( { form.setFieldValue(["inspectorList", field.name, "userId"], ""); form.setFieldValue(["inspectorList", field.name, "userName"], ""); diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js index 42dff24..c161f4d 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js @@ -32,7 +32,7 @@ function List(props) { checkStartTime: formData.checkTime?.[0] ? (formData.checkTime[0] + " 00:00:00") : "", checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1] + " 23:59:59") : "", }), - params: { status: "", planId: query.planId, entrance: query.planId ? "2" : "1", planType: query.planId ? 1 : 0 }, + params: { status: "", planId: query.planId, entrance: query.planId ? "3" : "1", planType: query.planId ? 1 : 0 }, }); return ( diff --git a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js index fe0ca4a..837aceb 100644 --- a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js @@ -36,7 +36,6 @@ function List(props) { }); const [form] = Form.useForm(); - const { tableProps, getData } = useTable(props["inspectionList"], { form, transform: formData => ({ @@ -44,13 +43,12 @@ function List(props) { checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1] + " 23:59:59") : "", }), params: { - status: "", entrance: "0", corpId: query.corpId, - checkStartTime: query.checkStartTime, - checkEndTime: query.checkEndTime, - planType: query.planType, }, + onSuccess: () => { + getCount(); + } }); const getCount = async () => { const { data } = await props["inspectionCount"]({ @@ -60,6 +58,7 @@ function List(props) { checkStartTime: query.checkStartTime || form.getFieldValue("checkTime")?.[0], checkEndTime: query.checkEndTime || form.getFieldValue("checkTime").checkTime?.[1], planType: query.planType, + ...form.getFieldsValue() }); setCount(data); }; @@ -86,7 +85,7 @@ function List(props) { +
+ + + {/* {query.isExport !== "0" && } */} + +
{hiddenViewModalOpen && ( 计划信息 - + 人员执行详情
; + return ; } export default List; diff --git a/src/pages/Container/Supervision/Inspection/Inspection/Add/index.js b/src/pages/Container/Supervision/Inspection/Inspection/Add/index.js index 2f436f4..8f5c881 100644 --- a/src/pages/Container/Supervision/Inspection/Inspection/Add/index.js +++ b/src/pages/Container/Supervision/Inspection/Inspection/Add/index.js @@ -1,7 +1,7 @@ import InspectionAdd from "~/pages/Container/BranchCompany/Inspection/Inspection/Add"; function Add(props) { - return ; + return ; } export default Add;