+
0
? (
-
-
- {detail.roomImages.map((img, index) => (
-
- ))}
-
-
- )
- : (
- "无"
- ),
+
+
+ {detail.roomImages.map((img, index) => (
+
+ ))}
+
+
+ )
+ : "-",
span: 2,
},
]}
@@ -207,10 +214,8 @@ function View(props) {
columns={deviceColumns}
dataSource={detail.devices || []}
pagination={false}
- rowKey={(record, index) => index}
+ rowKey={(record, index) => record.id || `device-${index}`}
locale={{ emptyText: "暂无设备信息" }}
- bordered
- tableLayout="fixed"
/>
@@ -219,26 +224,17 @@ function View(props) {
columns={personnelColumns}
dataSource={detail.persons || []}
pagination={false}
- rowKey={(record, index) => index}
+ rowKey={(record, index) => record.id || `person-${index}`}
locale={{ emptyText: "暂无人员信息" }}
- bordered
- tableLayout="fixed"
/>
-
-
)}
);
diff --git a/src/pages/Container/BranchCompany/PumpRoom/Add/index.js b/src/pages/Container/BranchCompany/PumpRoom/Add/index.js
index 65425cf..3e1842e 100644
--- a/src/pages/Container/BranchCompany/PumpRoom/Add/index.js
+++ b/src/pages/Container/BranchCompany/PumpRoom/Add/index.js
@@ -1,7 +1,8 @@
-import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
-import { Button, Card, Col, Form, Input, InputNumber, message, Row, Space, Table } from "antd";
+import { Button, Card, Col, Form, Input, message, Row, Space, Table } from "antd";
import { useEffect, useState } from "react";
+import MapSelector from "zy-react-library/components/Map/MapSelector";
import Page from "zy-react-library/components/Page";
import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Upload from "zy-react-library/components/Upload";
@@ -17,6 +18,9 @@ function Add(props) {
const [form] = Form.useForm();
const [loading, setLoading] = useState(false);
const [submitting, setSubmitting] = useState(false);
+ const [mapOpen, setMapOpen] = useState(false);
+ const [mapLng, setMapLng] = useState("");
+ const [mapLat, setMapLat] = useState("");
// 设备信息列表
const [devices, setDeviceList] = useState([]);
@@ -43,7 +47,7 @@ function Add(props) {
// 设置设备列表
if (data.devices && data.devices.length > 0) {
- setDeviceList(data.devices.map((item, index) => ({ ...item, key: index })));
+ setDeviceList(data.devices.map((item, index) => ({ ...item, key: item.id || index })));
}
}
catch (error) {
@@ -56,7 +60,18 @@ function Add(props) {
useEffect(() => {
query.id && getData();
- }, []);
+ }, [query.id]);
+
+ const openMap = () => {
+ setMapLng(form.getFieldValue("lng") || "");
+ setMapLat(form.getFieldValue("lat") || "");
+ setMapOpen(true);
+ };
+
+ const handleMapConfirm = (lng, lat) => {
+ form.setFieldsValue({ lng, lat });
+ setMapOpen(false);
+ };
const onFinish = async (values) => {
// 验证设备列表
@@ -67,16 +82,17 @@ function Add(props) {
// 验证设备列表是否填写完整
const invalidDevice = devices.find(
- item => !item.deviceName || !item.deviceModel || !item.deviceQty || !item.deviceLocation,
+ item => !item.deviceCode || !item.deviceName || !item.deviceCategory
+ || !item.chargeUnit || !item.deviceLocation || !item.paramsSpec,
);
if (invalidDevice) {
message.warning("请完善设备信息");
return;
}
- // 楠岃瘉鍥剧墖鏄惁涓婁紶
+ // 验证图片是否上传
if (!values.roomImages || values.roomImages.length === 0) {
- message.warning("璇蜂笂浼犳秷闃叉车鎴垮浘鐗?");
+ message.warning("请上传消防泵房图片");
return;
}
@@ -102,9 +118,10 @@ function Add(props) {
devices: devices.map(({ key, ...device }) => ({
deviceCode: device.deviceCode,
deviceName: device.deviceName,
- deviceModel: device.deviceModel,
- deviceQty: device.deviceQty,
+ deviceCategory: device.deviceCategory,
+ chargeUnit: device.chargeUnit,
deviceLocation: device.deviceLocation,
+ paramsSpec: device.paramsSpec,
...(device.id && { id: device.id }),
})),
};
@@ -128,10 +145,12 @@ function Add(props) {
const addDevice = () => {
const newDevice = {
key: Date.now(),
+ deviceCode: "",
deviceName: "",
- deviceModel: "",
- deviceQty: null,
+ deviceCategory: "",
+ chargeUnit: "",
deviceLocation: "",
+ paramsSpec: "",
};
setDeviceList([...devices, newDevice]);
};
@@ -154,6 +173,7 @@ function Add(props) {
设备编号
),
dataIndex: "deviceCode",
+ width: 150,
render: (text, record) => (
),
dataIndex: "deviceName",
+ width: 150,
render: (text, record) => (
*
- 设备型号
+ 设备分类
),
- dataIndex: "deviceModel",
+ dataIndex: "deviceCategory",
+ width: 150,
render: (text, record) => (
updateDevice(record.key, "deviceModel", e.target.value)}
+ placeholder="请输入设备分类"
+ onChange={e => updateDevice(record.key, "deviceCategory", e.target.value)}
/>
),
},
{
title: (<>
*
- 设备数量
+ 负责单位
),
- dataIndex: "deviceQty",
+ dataIndex: "chargeUnit",
+ width: 150,
render: (text, record) => (
-
updateDevice(record.key, "deviceQty", value)}
+ placeholder="请输入负责单位"
+ onChange={e => updateDevice(record.key, "chargeUnit", e.target.value)}
/>
),
},
{
title: (<>
*
- 设备位置
+ 具体位置
),
dataIndex: "deviceLocation",
+ width: 150,
render: (text, record) => (
updateDevice(record.key, "deviceLocation", e.target.value)}
/>
),
},
+ {
+ title: (<>
+ *
+ 设备参数和规格
+ ),
+ dataIndex: "paramsSpec",
+ width: 180,
+ render: (text, record) => (
+ updateDevice(record.key, "paramsSpec", e.target.value)}
+ />
+ ),
+ },
{
title: "操作",
- width: 80,
+ width: 100,
align: "center",
render: (_, record) => (