From b61ac2d2e0f1cd756058e39c914babb340cfd062 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 27 Jul 2026 09:41:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=91=E6=8F=B4=E9=98=9F=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eslint.config.js | 1 + .../BranchCompany/RescueTeam/Add/index.js | 31 ++++++++++--------- .../BranchCompany/RescueTeam/View/index.js | 8 +++++ 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 06fcf00..fab559e 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -20,6 +20,7 @@ export default antfu({ "react-hooks-extra/no-unnecessary-use-prefix": "off", "react-hooks-extra/prefer-use-state-lazy-initialization": "off", "react-hooks/exhaustive-deps": "off", + "react/no-implicit-key": "off", }, javascript: { "no-console": process.env.NODE_ENV === "production" ? "error" : "warn", diff --git a/src/pages/Container/BranchCompany/RescueTeam/Add/index.js b/src/pages/Container/BranchCompany/RescueTeam/Add/index.js index c95917a..02a99e5 100644 --- a/src/pages/Container/BranchCompany/RescueTeam/Add/index.js +++ b/src/pages/Container/BranchCompany/RescueTeam/Add/index.js @@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Card, Col, DatePicker, Form, Input, message, Row, Space } from "antd"; import dayjs from "dayjs"; import { useEffect, useState } from "react"; +import Map from "zy-react-library/components/Map"; import Page from "zy-react-library/components/Page"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -106,7 +107,7 @@ function Add(props) { const members = data.rescueMembers.map((item, index) => ({ ...item, key: item.id || index })); setRescueMembers(members); // 同步设置Form的队员数据 - form.setFieldValue('rescueMembersForm', members.map(m => ({ + form.setFieldValue("rescueMembersForm", members.map(m => ({ personName: m.personName, personPhone: m.personPhone, }))); @@ -186,8 +187,8 @@ function Add(props) { const newMembers = [...rescueMembers, createEmptyMember()]; setRescueMembers(newMembers); // 同步更新Form - const formMembers = form.getFieldValue('rescueMembersForm') || []; - form.setFieldValue('rescueMembersForm', [...formMembers, { personName: '', personPhone: '' }]); + const formMembers = form.getFieldValue("rescueMembersForm") || []; + form.setFieldValue("rescueMembersForm", [...formMembers, { personName: "", personPhone: "" }]); }; const removeMember = (key) => { @@ -195,9 +196,9 @@ function Add(props) { const newMembers = rescueMembers.filter(item => item.key !== key); setRescueMembers(newMembers); // 同步更新Form - const formMembers = form.getFieldValue('rescueMembersForm') || []; + const formMembers = form.getFieldValue("rescueMembersForm") || []; formMembers.splice(index, 1); - form.setFieldValue('rescueMembersForm', [...formMembers]); + form.setFieldValue("rescueMembersForm", [...formMembers]); }; const updateMember = (key, field, value) => { @@ -206,7 +207,6 @@ function Add(props) { ); }; - return ( { + onBlur={(e) => { form.setFieldValue("teamName", e.target.value?.trim()); }} /> @@ -318,10 +318,10 @@ function Add(props) { { + onChange={(e) => { // 只允许输入数字和连字符 - const value = e.target.value.replace(/[^\d-]/g, '').slice(0, 11); - form.setFieldValue('captainPhone', value); + const value = e.target.value.replace(/[^\d-]/g, "").slice(0, 11); + form.setFieldValue("captainPhone", value); }} /> @@ -387,6 +387,7 @@ function Add(props) { +
{ - const value = e.target.value.replace(/[^\d-]/g, '').slice(0, 11); + onChange={(e) => { + const value = e.target.value.replace(/[^\d-]/g, "").slice(0, 11); updateMember(member.key, "personPhone", value); - form.setFieldValue(['rescueMembersForm', index, 'personPhone'], value); + form.setFieldValue(["rescueMembersForm", index, "personPhone"], value); }} /> diff --git a/src/pages/Container/BranchCompany/RescueTeam/View/index.js b/src/pages/Container/BranchCompany/RescueTeam/View/index.js index d1913c6..94fa5cf 100644 --- a/src/pages/Container/BranchCompany/RescueTeam/View/index.js +++ b/src/pages/Container/BranchCompany/RescueTeam/View/index.js @@ -113,6 +113,14 @@ function View(props) { label: "职责和任务范围", children: detail.dutyScope || "-", }, + { + label: "经度", + children: detail.longitude || "-", + }, + { + label: "纬度", + children: detail.latitude || "-", + }, ]} /> From 722c4771e668d6c7c9a640cc8479ae0d82bda9c6 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 27 Jul 2026 16:17:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8type=3D"cesium"=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BranchCompany/ControlRoom/Add/index.js | 59 ++++++++++--------- .../BranchCompany/PumpRoom/Add/index.js | 54 +++++++++-------- .../BranchCompany/WaterSource/Add/index.js | 3 +- 3 files changed, 60 insertions(+), 56 deletions(-) diff --git a/src/pages/Container/BranchCompany/ControlRoom/Add/index.js b/src/pages/Container/BranchCompany/ControlRoom/Add/index.js index 63f6339..ef01b64 100644 --- a/src/pages/Container/BranchCompany/ControlRoom/Add/index.js +++ b/src/pages/Container/BranchCompany/ControlRoom/Add/index.js @@ -85,7 +85,7 @@ function Add(props) { const deviceList = data.devices.map((item, index) => ({ ...item, key: item.id || index })); setDevices(deviceList); // 同步设置Form的设备数据 - form.setFieldValue('devicesForm', deviceList.map(d => ({ + form.setFieldValue("devicesForm", deviceList.map(d => ({ deviceName: d.deviceName, deviceModel: d.deviceModel, deviceQty: d.deviceQty, @@ -101,7 +101,7 @@ function Add(props) { const personList = data.persons.map((item, index) => ({ ...item, key: item.id || index })); setPersons(personList); // 同步设置Form的人员数据 - form.setFieldValue('personsForm', personList.map(p => ({ + form.setFieldValue("personsForm", personList.map(p => ({ personName: p.personName, personPhone: p.personPhone, dutyDesc: p.dutyDesc, @@ -141,8 +141,8 @@ function Add(props) { const newDevices = [...devices, createEmptyDevice()]; setDevices(newDevices); // 同步更新Form - const formDevices = form.getFieldValue('devicesForm') || []; - form.setFieldValue('devicesForm', [...formDevices, { deviceName: '', deviceModel: '', deviceQty: undefined, deviceLocation: '' }]); + const formDevices = form.getFieldValue("devicesForm") || []; + form.setFieldValue("devicesForm", [...formDevices, { deviceName: "", deviceModel: "", deviceQty: undefined, deviceLocation: "" }]); }; const removeDevice = (key) => { @@ -154,9 +154,9 @@ function Add(props) { const newDevices = devices.filter(item => item.key !== key); setDevices(newDevices); // 同步更新Form - const formDevices = form.getFieldValue('devicesForm') || []; + const formDevices = form.getFieldValue("devicesForm") || []; formDevices.splice(index, 1); - form.setFieldValue('devicesForm', [...formDevices]); + form.setFieldValue("devicesForm", [...formDevices]); }; const updateDevice = (key, field, value) => { @@ -165,7 +165,7 @@ function Add(props) { devices.map(item => (item.key === key ? { ...item, [field]: value } : item)), ); // 同步更新Form并触发校验 - form.setFieldValue(['devicesForm', index, field], value); + form.setFieldValue(["devicesForm", index, field], value); }; // 人员相关操作 @@ -173,8 +173,8 @@ function Add(props) { const newPersons = [...persons, createEmptyPerson()]; setPersons(newPersons); // 同步更新Form - const formPersons = form.getFieldValue('personsForm') || []; - form.setFieldValue('personsForm', [...formPersons, { personName: '', personPhone: '', dutyDesc: '' }]); + const formPersons = form.getFieldValue("personsForm") || []; + form.setFieldValue("personsForm", [...formPersons, { personName: "", personPhone: "", dutyDesc: "" }]); }; const removePerson = (key) => { @@ -186,9 +186,9 @@ function Add(props) { const newPersons = persons.filter(item => item.key !== key); setPersons(newPersons); // 同步更新Form - const formPersons = form.getFieldValue('personsForm') || []; + const formPersons = form.getFieldValue("personsForm") || []; formPersons.splice(index, 1); - form.setFieldValue('personsForm', [...formPersons]); + form.setFieldValue("personsForm", [...formPersons]); }; const updatePerson = (key, field, value) => { @@ -197,7 +197,7 @@ function Add(props) { persons.map(item => (item.key === key ? { ...item, [field]: value } : item)), ); // 同步更新Form并触发校验 - form.setFieldValue(['personsForm', index, field], value); + form.setFieldValue(["personsForm", index, field], value); }; const onFinish = async (values) => { @@ -299,7 +299,7 @@ function Add(props) { wrapperCol={{ span: 18 }} onFinish={onFinish} > - + {/* 添加隐藏字段保存 roomId */} @@ -435,7 +435,7 @@ function Add(props) { @@ -449,7 +449,7 @@ function Add(props) {
@@ -542,7 +542,7 @@ function Add(props) { { - const value = e.target.value.replace(/\D/g, ''); + onChange={(e) => { + const value = e.target.value.replace(/\D/g, ""); updatePerson(person.key, "personPhone", value); - form.setFieldValue(['personsForm', index, 'personPhone'], value); + form.setFieldValue(["personsForm", index, "personPhone"], value); }} /> @@ -579,7 +579,7 @@ function Add(props) { -
+
{index !== 0 && ( )} - style={{ marginTop: 24, boxShadow: 'none' }} + style={{ marginTop: 24, boxShadow: "none" }} bordered={false} > {devices.map((device, index) => ( @@ -381,7 +382,7 @@ function Add(props) {
); diff --git a/src/pages/Container/BranchCompany/WaterSource/Add/index.js b/src/pages/Container/BranchCompany/WaterSource/Add/index.js index 5488e18..9d3dccd 100644 --- a/src/pages/Container/BranchCompany/WaterSource/Add/index.js +++ b/src/pages/Container/BranchCompany/WaterSource/Add/index.js @@ -88,7 +88,7 @@ function Add(props) { wrapperCol={{ span: 18 }} onFinish={onFinish} > - + ); From b8a0afc9826ddd17d60dfc71d48c28aa6d50740f Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 27 Jul 2026 16:23:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf(main):=20=E8=B0=83=E7=94=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=96=87=E4=BB=B6URL?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 main.js 中导入 getFileUrlFromServer 工具函数 - 初始化时调用 getFileUrlFromServer 方法以预加载资源 - 保持其它初始化逻辑不变 --- src/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 2ac00e9..800648c 100644 --- a/src/main.js +++ b/src/main.js @@ -2,6 +2,7 @@ import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib"; import { setup } from "@cqsjjb/jjb-dva-runtime"; import { message } from "antd"; import dayjs from "dayjs"; +import { getFileUrlFromServer } from "zy-react-library/utils"; import "dayjs/locale/zh-cn"; import "../blessed_by_buddha"; @@ -11,7 +12,7 @@ require("./styles/search-actions-right.less"); dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); - +getFileUrlFromServer(); window.mapLongitude = "119.69457721306945"; window.mapLatitude = "39.940504336846665";