From c5218e1d0c9f66f9d146679c33642d7f0a2e519f Mon Sep 17 00:00:00 2001 From: huwei <3313749341@qq.com> Date: Thu, 9 Jul 2026 17:12:54 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jjb.config.js | 2 +- .../Container/EnterpriseInfo/EquipInfo/index.js | 16 ++-------------- .../components/OrgEquipmentSelectModal.jsx | 13 ++++++++----- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/jjb.config.js b/jjb.config.js index 61acb0a..be646be 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,7 +10,7 @@ module.exports = { javaGitBranch: "dev", // 本地联调 safetyEval-service(context-path: /safetyEval,默认端口 8095) // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095 - API_HOST: "https://gbs-gateway.qhdsafety.com", + API_HOST: "http://127.0.0.1", }, production: { // 应用后端分支名称,部署上线需要 diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index ededf07..3f210e8 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -24,6 +24,7 @@ import { tools } from "@cqsjjb/jjb-common-lib"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { NS_EQUIP_INFO } from "~/enumerate/namespace"; import { positiveNumberRule } from "~/utils/validators"; +import { toEquipPageQuery } from "../equipPageQuery"; const { router } = tools; const DUAL_CHANNEL_MAP = { 1: "是", 2: "否" }; @@ -41,9 +42,7 @@ function EquipInfoPage(props) { } = equipInfo || {}; const handleSearch = () => { - props.equipInfoList({ - ...router.query, - }); + props.equipInfoList(toEquipPageQuery(router.query)); }; useEffect(() => { @@ -143,17 +142,6 @@ function EquipInfoPage(props) { 便携式 , - - - 启用 - 禁用 - - , ]} onReset={(value) => { router.query = { ...value, current: 1, size: 10 }; diff --git a/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx index 6262508..3c79ea5 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx @@ -2,6 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Input, Modal, Table } from "antd"; import { useEffect, useState } from "react"; import { NS_EQUIP_INFO } from "~/enumerate/namespace"; +import { toEquipPageQuery } from "~/pages/Container/EnterpriseInfo/equipPageQuery"; function OrgEquipmentSelectModalInner(props) { const { open, onCancel, onConfirm, existingIds = [] } = props; @@ -15,11 +16,13 @@ function OrgEquipmentSelectModalInner(props) { setLoading(true); try { const values = searchForm.getFieldsValue(); - const res = await props.equipInfoList({ - current: page, - size: pageSize, - deviceName: values.deviceName || undefined, - }); + const res = await props.equipInfoList( + toEquipPageQuery({ + current: page, + size: pageSize, + deviceName: values.deviceName || undefined, + }), + ); if (res?.success !== false) { setDataSource(res?.data || []); setPagination((prev) => ({ ...prev, current: page, pageSize, total: res?.total || 0 }));