diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js index 6ff241c..a8d8fd6 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js @@ -36,7 +36,7 @@ function List(props) { const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["firstLevelDoorInfoCameraList"], { form, - params: { id: query.id }, + params: { eqAreaId: query.areaId }, }); const onDelete = (id) => { diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/Camera/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/Camera/index.js index 21447dc..099d49a 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/Camera/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/Camera/index.js @@ -1,7 +1,7 @@ -import CameraList from "../../Camera/List"; +import CameraPage from "../../Camera/List"; function Camera() { - return (); + return (); } export default Camera; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js index 939597d..e49e325 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js @@ -31,12 +31,13 @@ function List(props) { }); const onDelete = (record) => { + if (record.videoNum > 0 || record.passageNum > 0) + return message.warning("正在使用中的口门不能删除"); + Modal.confirm({ title: "删除确认", content: "确定要删除吗?", onOk: async () => { - if (record.videoNum > 0 || record.passageNum > 0) - return message.warning("正在使用中的口门不能删除"); const { success } = await props["firstLevelDoorInfoDelete"]({ id: record.id }); if (success) { message.success("删除成功"); @@ -191,6 +192,7 @@ function AddModalComponent(props) { id: props.id, }); if (success) { + message.success("操作成功"); props.onCancel(); props.getData(); } @@ -215,7 +217,7 @@ function AddModalComponent(props) { showActionButtons={false} options={[ { name: "areaParentId", label: "所属区域", render: form.setFieldValue("areaParentName", label)} /> }, - { name: "areaParentName", label: "所属区域", onlyForLabel: true }, + { name: "areaParentName", label: "所属区域名称", onlyForLabel: true }, { name: "areaName", label: "口门名称" }, { name: "areaType", label: "口门类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: AREA_TYPE_ENUM }, { name: "areaRange", label: "口门位置" },