From 823701f97c56fc6fb1b93389e2838616a6157666 Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Thu, 28 May 2026 17:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jjb.config.js | 2 +- package.json | 2 +- src/api/emergencyAddressBook/index.js | 4 ++++ .../EmergencyOrganization/EmergencyAddressBook/List/index.js | 5 +++-- .../ExpertEmergencyRescueTeam/View/index.js | 2 +- .../EnterpriseEmergencyOrganization/View/index.js | 2 +- .../CommunicationGuaranteeOrganization/View/index.js | 2 +- .../MedicalGuaranteeOrganization/View/index.js | 2 +- .../TechnicalSupportGuaranteeOrganization/View/index.js | 2 +- .../TransportGuaranteeOrganization/View/index.js | 2 +- .../Rescue/Command/components/Cesium/index.js | 4 ++-- .../EmergencyResource/ClosedCardPort/View/index.js | 2 +- .../Enterprise/EmergencyResource/DrainageWell/View/index.js | 2 +- .../EmergencyResource/EmergencyShelter/View/index.js | 2 +- .../EmergencyResource/MaterialEquipment/View/index.js | 2 +- 15 files changed, 21 insertions(+), 16 deletions(-) diff --git a/jjb.config.js b/jjb.config.js index 282b244..284586e 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -46,7 +46,7 @@ module.exports = { // 开发服务 server: { // 监听端口号 - port: "8033", + port: "8053", // 服务地址 host: "127.0.0.1", // 是否自动打开浏览器 diff --git a/package.json b/package.json index a47b37c..2cc404d 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "^1.2.39" + "zy-react-library": "^1.3.14" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/api/emergencyAddressBook/index.js b/src/api/emergencyAddressBook/index.js index 34e05b8..e3a5ced 100644 --- a/src/api/emergencyAddressBook/index.js +++ b/src/api/emergencyAddressBook/index.js @@ -4,6 +4,10 @@ export const emergencyAddressBookList = declareRequest( "emergencyAddressBookLoading", "Post > @/emergencyRescue/emergencyContactGroup/list", ); +export const emergencyAddressBookListTree = declareRequest( + "emergencyAddressBookLoading", + "Post > @/emergencyRescue/emergencyContactGroup/listTree", +); export const emergencyAddressBookInfo = declareRequest( "emergencyAddressBookLoading", "Get > /emergencyRescue/emergencyContactGroup/{id}", diff --git a/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyAddressBook/List/index.js b/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyAddressBook/List/index.js index 0b974c6..8d46b8d 100644 --- a/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyAddressBook/List/index.js +++ b/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyAddressBook/List/index.js @@ -31,10 +31,10 @@ function List(props) { const query = useGetUrlQuery(); - const { tableProps, getData } = useTable(props["emergencyAddressBookList"], { + const { tableProps, getData } = useTable(props["emergencyAddressBookListTree"], { form, params: { corpId: query.corpinfoId }, - usePagination: false, + // usePagination: false, }); const onDelete = (record) => { @@ -61,6 +61,7 @@ function List(props) { onFinish={getData} /> ( {(!props.isRecord && props.permission("qyd-enterprise-emergency-address-book-add")) && ( diff --git a/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/View/index.js b/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/View/index.js index 5410fb8..5bd8908 100644 --- a/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["expertEmergencyRescueTeamInfo"]({ id: query.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyOrganization/View/index.js b/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyOrganization/View/index.js index b26b12b..f863b5e 100644 --- a/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyOrganization/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyOrganization/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["enterpriseEmergencyOrganizationInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/CommunicationGuaranteeOrganization/View/index.js b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/CommunicationGuaranteeOrganization/View/index.js index cc913d4..f02525c 100644 --- a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/CommunicationGuaranteeOrganization/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/CommunicationGuaranteeOrganization/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["communicationGuaranteeOrganizationInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/MedicalGuaranteeOrganization/View/index.js b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/MedicalGuaranteeOrganization/View/index.js index 692582c..a21fe13 100644 --- a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/MedicalGuaranteeOrganization/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/MedicalGuaranteeOrganization/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["medicalGuaranteeOrganizationInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TechnicalSupportGuaranteeOrganization/View/index.js b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TechnicalSupportGuaranteeOrganization/View/index.js index 4ac214b..9677bc2 100644 --- a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TechnicalSupportGuaranteeOrganization/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TechnicalSupportGuaranteeOrganization/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["technicalSupportGuaranteeOrganizationInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TransportGuaranteeOrganization/View/index.js b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TransportGuaranteeOrganization/View/index.js index 3c26f23..4d6272e 100644 --- a/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TransportGuaranteeOrganization/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TransportGuaranteeOrganization/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["transportGuaranteeOrganizationInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js index 35fcabb..e13d4bd 100644 --- a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js +++ b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js @@ -85,8 +85,8 @@ function Cesium(props) { } const MarkModal = (props) => { - const info = props.info; - const id = props.info.id; + const info = props.info || {}; + const id = info.id; const type = props.type; return ( diff --git a/src/pages/Container/Enterprise/EmergencyResource/ClosedCardPort/View/index.js b/src/pages/Container/Enterprise/EmergencyResource/ClosedCardPort/View/index.js index 15bacf6..fc5b4cb 100644 --- a/src/pages/Container/Enterprise/EmergencyResource/ClosedCardPort/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyResource/ClosedCardPort/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["closedCardPortInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyResource/DrainageWell/View/index.js b/src/pages/Container/Enterprise/EmergencyResource/DrainageWell/View/index.js index 74c96d9..32e696e 100644 --- a/src/pages/Container/Enterprise/EmergencyResource/DrainageWell/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyResource/DrainageWell/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["drainageWellInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyResource/EmergencyShelter/View/index.js b/src/pages/Container/Enterprise/EmergencyResource/EmergencyShelter/View/index.js index 31328a3..9e6c62d 100644 --- a/src/pages/Container/Enterprise/EmergencyResource/EmergencyShelter/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyResource/EmergencyShelter/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["emergencyShelterInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => { diff --git a/src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/View/index.js b/src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/View/index.js index 4a0909e..b124f02 100644 --- a/src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/View/index.js +++ b/src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/View/index.js @@ -15,7 +15,7 @@ function View(props) { return; const { data } = await props["materialEquipmentInfo"]({ id: props.id || query.id }); - setInfo(data); + setInfo(data || {}); }; useEffect(() => {