zcloud_gbs
/
zcloud_gbs_fire_resource-react
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_fire_resource-react

master
853931625@qq.com 2026-07-28 10:40:19 +08:00
parent 5decd4f179 b8a0afc982
commit f604acc05b
7 changed files with 84 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eslint.config.js
View File

@ -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",

3
src/main.js
View File

@ -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";

58
src/pages/Container/BranchCompany/ControlRoom/Add/index.js
View File

@ -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}
>
<Card title="基本信息" bordered={false} style={{ boxShadow: 'none' }}>
<Card title="基本信息" bordered={false} style={{ boxShadow: "none" }}>
{/* 添加隐藏字段保存 roomId */}
<Form.Item name="roomId" hidden>
<Input />
@ -359,9 +359,9 @@ function Add(props) {
<Input
placeholder="请输入负责人手机号"
maxLength={11}
onChange={e => {
const value = e.target.value.replace(/\D/g, '');
form.setFieldValue('principalPhone', value);
onChange={(e) => {
const value = e.target.value.replace(/\D/g, "");
form.setFieldValue("principalPhone", value);
}}
/>
</Form.Item>
@ -435,7 +435,7 @@ function Add(props) {
<Card
title="设备信息"
style={{ marginTop: 24, boxShadow: 'none' }}
style={{ marginTop: 24, boxShadow: "none" }}
bordered={false}
extra={(
<Button type="primary" onClick={addDevice}>
@ -449,7 +449,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="设备名称"
name={['devicesForm', index, 'deviceName']}
name={["devicesForm", index, "deviceName"]}
rules={[
{ required: true, message: "请输入设备名称" },
{ max: 50, message: "设备名称不能超过50个字符" },
@ -464,7 +464,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="设备型号"
name={['devicesForm', index, 'deviceModel']}
name={["devicesForm", index, "deviceModel"]}
rules={[
{ required: true, message: "请输入设备型号" },
{ max: 50, message: "设备型号不能超过50个字符" },
@ -481,7 +481,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="设备数量"
name={['devicesForm', index, 'deviceQty']}
name={["devicesForm", index, "deviceQty"]}
rules={[{ required: true, message: "请输入设备数量" }]}
>
<InputNumber
@ -500,7 +500,7 @@ function Add(props) {
<div style={{ display: "flex", alignItems: "center", gap: 8, width: "100%" }}>
<div style={{ flex: 1 }}>
<Form.Item
name={['devicesForm', index, 'deviceLocation']}
name={["devicesForm", index, "deviceLocation"]}
rules={[
{ required: true, message: "请输入设备位置" },
{ max: 50, message: "设备位置不能超过50个字符" },
@ -528,7 +528,7 @@ function Add(props) {
<Card
title="人员信息"
style={{ marginTop: 24, boxShadow: 'none' }}
style={{ marginTop: 24, boxShadow: "none" }}
bordered={false}
extra={(
<Button type="primary" onClick={addPerson}>
@ -542,7 +542,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="人员姓名"
name={['personsForm', index, 'personName']}
name={["personsForm", index, "personName"]}
rules={[
{ required: true, message: "请输入人员姓名" },
{ max: 50, message: "人员姓名不能超过50个字符" },
@ -557,7 +557,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="人员手机号"
name={['personsForm', index, 'personPhone']}
name={["personsForm", index, "personPhone"]}
rules={[
{ required: true, message: "请输入人员手机号" },
{ validator: validatePhone },
@ -566,10 +566,10 @@ function Add(props) {
<Input
placeholder="请输入人员手机号"
maxLength={11}
onChange={e => {
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);
}}
/>
</Form.Item>
@ -579,7 +579,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="人员值班情况"
name={['personsForm', index, 'dutyDesc']}
name={["personsForm", index, "dutyDesc"]}
rules={[
{ required: true, message: "请输入人员值班情况" },
{ max: 50, message: "人员值班情况不能超过50个字符" },
@ -592,7 +592,7 @@ function Add(props) {
</Form.Item>
</Col>
<Col span={12}>
<div style={{ textAlign: 'right', paddingTop: 30 }}>
<div style={{ textAlign: "right", paddingTop: 30 }}>
{index !== 0 && (
<Button type="primary" danger onClick={() => removePerson(person.key)}>
删除

53
src/pages/Container/BranchCompany/PumpRoom/Add/index.js
View File

@ -74,7 +74,7 @@ function Add(props) {
const deviceList = data.devices.map((item, index) => ({ ...item, key: item.id || index }));
setDeviceList(deviceList);
// 同步设置Form的设备数据
form.setFieldValue('devicesForm', deviceList.map(d => ({
form.setFieldValue("devicesForm", deviceList.map(d => ({
deviceCode: d.deviceCode,
deviceName: d.deviceName,
deviceCategory: d.deviceCategory,
@ -82,7 +82,8 @@ function Add(props) {
deviceLocation: d.deviceLocation,
paramsSpec: d.paramsSpec,
})));
} else {
}
else {
setDeviceList([createEmptyDevice()]);
}
}
@ -134,8 +135,8 @@ function Add(props) {
// 过滤掉空的设备信息
const validDevices = devices.filter(
device => device.deviceCode || device.deviceName || device.deviceCategory ||
device.chargeUnit || device.deviceLocation || device.paramsSpec,
device => device.deviceCode || device.deviceName || device.deviceCategory
|| device.chargeUnit || device.deviceLocation || device.paramsSpec,
);
if (validDevices.length === 0) {
@ -177,14 +178,14 @@ function Add(props) {
const newDevices = [...devices, createEmptyDevice()];
setDeviceList(newDevices);
// 同步更新Form
const formDevices = form.getFieldValue('devicesForm') || [];
form.setFieldValue('devicesForm', [...formDevices, {
deviceCode: '',
deviceName: '',
deviceCategory: '',
chargeUnit: '',
deviceLocation: '',
paramsSpec: ''
const formDevices = form.getFieldValue("devicesForm") || [];
form.setFieldValue("devicesForm", [...formDevices, {
deviceCode: "",
deviceName: "",
deviceCategory: "",
chargeUnit: "",
deviceLocation: "",
paramsSpec: "",
}]);
};
@ -197,9 +198,9 @@ function Add(props) {
const newDevices = devices.filter(item => item.key !== key);
setDeviceList(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) => {
@ -208,7 +209,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);
};
return (
@ -233,7 +234,7 @@ function Add(props) {
wrapperCol={{ span: 18 }}
onFinish={onFinish}
>
<Card title="基本信息" bordered={false} style={{ boxShadow: 'none' }}>
<Card title="基本信息" bordered={false} style={{ boxShadow: "none" }}>
<Form.Item name="pumpRoomId" hidden>
<Input />
</Form.Item>
@ -292,9 +293,9 @@ function Add(props) {
<Input
placeholder="请输入负责人手机号"
maxLength={11}
onChange={e => {
const value = e.target.value.replace(/\D/g, '');
form.setFieldValue('principalPhone', value);
onChange={(e) => {
const value = e.target.value.replace(/\D/g, "");
form.setFieldValue("principalPhone", value);
}}
/>
</Form.Item>
@ -372,7 +373,7 @@ function Add(props) {
新增
</Button>
)}
style={{ marginTop: 24, boxShadow: 'none' }}
style={{ marginTop: 24, boxShadow: "none" }}
bordered={false}
>
{devices.map((device, index) => (
@ -381,7 +382,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="设备编号"
name={['devicesForm', index, 'deviceCode']}
name={["devicesForm", index, "deviceCode"]}
rules={[
{ required: true, message: "请输入设备编号" },
{ max: 50, message: "设备编号不能超过50个字符" },
@ -396,7 +397,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="设备名称"
name={['devicesForm', index, 'deviceName']}
name={["devicesForm", index, "deviceName"]}
rules={[
{ required: true, message: "请输入设备名称" },
{ max: 50, message: "设备名称不能超过50个字符" },
@ -413,7 +414,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="设备分类"
name={['devicesForm', index, 'deviceCategory']}
name={["devicesForm", index, "deviceCategory"]}
rules={[
{ required: true, message: "请输入设备分类" },
{ max: 50, message: "设备分类不能超过50个字符" },
@ -428,7 +429,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="负责单位"
name={['devicesForm', index, 'chargeUnit']}
name={["devicesForm", index, "chargeUnit"]}
rules={[
{ required: true, message: "请输入负责单位" },
{ max: 50, message: "负责单位不能超过50个字符" },
@ -445,7 +446,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label="具体位置"
name={['devicesForm', index, 'deviceLocation']}
name={["devicesForm", index, "deviceLocation"]}
rules={[
{ required: true, message: "请输入具体位置" },
{ max: 50, message: "具体位置不能超过50个字符" },
@ -465,7 +466,7 @@ function Add(props) {
<div style={{ display: "flex", alignItems: "center", gap: 8, width: "100%" }}>
<div style={{ flex: 1 }}>
<Form.Item
name={['devicesForm', index, 'paramsSpec']}
name={["devicesForm", index, "paramsSpec"]}
rules={[
{ required: true, message: "请输入设备参数和规格" },
{ max: 50, message: "设备参数和规格不能超过50个字符" },

31
src/pages/Container/BranchCompany/RescueTeam/Add/index.js
View File

@ -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 (
<Page
loading={loading}
@ -252,7 +252,7 @@ function Add(props) {
<Input
placeholder="请输入救援队名称"
onChange={handleTeamNameChange}
onBlur={e => {
onBlur={(e) => {
form.setFieldValue("teamName", e.target.value?.trim());
}}
/>
@ -318,10 +318,10 @@ function Add(props) {
<Input
placeholder="请输入队长电话"
maxLength={11}
onChange={e => {
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);
}}
/>
</Form.Item>
@ -387,6 +387,7 @@ function Add(props) {
</Form.Item>
</Col>
</Row>
<Map required={false} type="cesium" />
</Card>
<Card
@ -404,7 +405,7 @@ function Add(props) {
<Col span={12}>
<Form.Item
label={`队员${index + 1}`}
name={['rescueMembersForm', index, 'personName']}
name={["rescueMembersForm", index, "personName"]}
rules={[
{ required: true, message: "请输入队员姓名" },
{ max: 50, message: "队员姓名不能超过50个字符" },
@ -424,7 +425,7 @@ function Add(props) {
<div style={{ display: "flex", alignItems: "center", gap: 8, width: "100%" }}>
<div style={{ flex: 1 }}>
<Form.Item
name={['rescueMembersForm', index, 'personPhone']}
name={["rescueMembersForm", index, "personPhone"]}
rules={[
{ required: true, message: "请输入队员电话" },
{ validator: validatePhone },
@ -434,10 +435,10 @@ function Add(props) {
<Input
placeholder="请输入队员电话"
maxLength={11}
onChange={e => {
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);
}}
/>
</Form.Item>

8
src/pages/Container/BranchCompany/RescueTeam/View/index.js
View File

@ -113,6 +113,14 @@ function View(props) {
label: "职责和任务范围",
children: detail.dutyScope || "-",
},
{
label: "经度",
children: detail.longitude || "-",
},
{
label: "纬度",
children: detail.latitude || "-",
},
]}
/>
</Card>

2
src/pages/Container/BranchCompany/WaterSource/Add/index.js
View File

@ -88,7 +88,7 @@ function Add(props) {
wrapperCol={{ span: 18 }}
onFinish={onFinish}
>
<Card title="基本信息" bordered={false} style={{ boxShadow: 'none' }}>
<Card title="基本信息" bordered={false} style={{ boxShadow: "none" }}>
<Row gutter={24}>
<Col span={12}>
<Form.Item