From dc4864334073b95fab7328883c7fad7786e0d31b Mon Sep 17 00:00:00 2001 From: wanghx Date: Tue, 19 Dec 2023 14:32:01 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx | 1 + src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx | 4 ++-- .../SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx | 4 ++-- .../MessageMgm/MonitorCarAlarmMes/loadable.jsx | 4 ++-- .../SystemMgm/MessageMgm/NotificationMes/loadable.jsx | 4 ++-- src/pages/SystemMgm/OrgnizationMgm/loadable.jsx | 4 ++-- src/services/SystemMgm/MsgMgm/index.js | 19 ++++++++++--------- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx index 9b4a551..b8ed107 100644 --- a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx +++ b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx @@ -43,6 +43,7 @@ function ModalAreaAdd(props) { const handleCancel = () => { form.resetFields() + setAreaType("1") onCancel() } diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx index f89e043..1d2c189 100644 --- a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx @@ -117,8 +117,8 @@ function ConfMes(props) { ajax.getMsgConfList({...formData, ...pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ - list: res.data, - totalRecords: res.totalRecords || 0 + list: res.data.list, + totalRecords: res.data.total || 0 }) } setLoading(false) diff --git a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx index 4b440ac..c0976d9 100644 --- a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx @@ -122,8 +122,8 @@ function NotificationMes(props) { ajax.getDeviceAlarmList({...formData, ...pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ - list: res.data, - totalRecords: res.totalRecords || 0 + list: res.data.list, + totalRecords: res.data.total || 0 }) } setLoading(false) diff --git a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx index a9fa4ef..85d9aa2 100644 --- a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx @@ -121,8 +121,8 @@ function MonitorCarAlarmMes(props) { ajax.getCarAlarmList({...formData, ...pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ - list: res.data, - totalRecords: res.totalRecords || 0 + list: res.data.list, + totalRecords: res.data.total || 0 }) } setLoading(false) diff --git a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx index 09df8f0..55d7781 100644 --- a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx @@ -157,8 +157,8 @@ function NotificationMes(props) { ajax.getNotificationList({...formData, ...pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ - list: res.data, - totalRecords: res.totalRecords || 0 + list: res.data.list, + totalRecords: res.data.total || 0 }) } setLoading(false) diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx index 6a46bf0..76f2c4b 100644 --- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx +++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx @@ -374,7 +374,7 @@ function OrgnizationMgm() { ajaxAreaEdit(Object.assign({}, { id: data.id, name: data.name, - pid: arr.at(-1) + pid: arr ? arr.at(-1) : '' })).then((msg) => { message.success(msg) setOrgModalVisible(false) @@ -386,7 +386,7 @@ function OrgnizationMgm() { } else { ajaxAreaSave(Object.assign({}, { name: data.name, - pid:arr.at(-1), + pid: arr ? arr.at(-1) : '', level: data.level })).then((msg) => { message.success(msg) diff --git a/src/services/SystemMgm/MsgMgm/index.js b/src/services/SystemMgm/MsgMgm/index.js index 2188b5b..0fa1cd0 100644 --- a/src/services/SystemMgm/MsgMgm/index.js +++ b/src/services/SystemMgm/MsgMgm/index.js @@ -2,7 +2,7 @@ import ajax from "@/config/ajax" const getMsgConfList = (params) => { return ajax({ - url: "/api/msg/conf/list", + url: "/api/manage/msg/conf/list", type: "get", data: params, }) @@ -10,14 +10,15 @@ const getMsgConfList = (params) => { const getUserTreeData = (data) => { return ajax({ - url: '/api/v1/admin/user/get_user_tree_list', + // url: '/api/v1/admin/user/get_user_tree_list', + url: '/api/com/common/get_user_tree_list', type: 'get' }) } const msgConfUpdate = (data) => { return ajax({ - url: "/api/msg/conf/update", + url: "/api/manage/msg/conf/update", type: "post", data: data, }) @@ -25,7 +26,7 @@ const msgConfUpdate = (data) => { const msgConfDel = (data) => { return ajax({ - url: "/api/msg/conf/del", + url: "/api/manage/msg/conf/del", type: "post", data: data, }) @@ -34,7 +35,7 @@ const msgConfDel = (data) => { const getNotificationList = (data) => { return ajax({ - url: "/api/msg/inform/list", + url: "/api/manage/msg/inform/list", type: "get", data: data, }) @@ -42,7 +43,7 @@ const getNotificationList = (data) => { const msgNotificationRead = (data) => { return ajax({ - url: "/api/msg/inform/read", + url: "/api/manage/msg/inform/read", type: "post", data: data, }) @@ -50,7 +51,7 @@ const msgNotificationRead = (data) => { const msgNotificationDel = (data) => { return ajax({ - url: "/api/msg/inform/del", + url: "/api/manage/msg/inform/del", type: "post", data: data, }) @@ -58,7 +59,7 @@ const msgNotificationDel = (data) => { const getDeviceAlarmList = (data) => { return ajax({ - url: "/api/msg/device/list", + url: "/api/manage/msg/device/list", type: "get", data: data, }) @@ -66,7 +67,7 @@ const getDeviceAlarmList = (data) => { const getCarAlarmList = (data) => { return ajax({ - url: "/api/msg/car_alert/list", + url: "/api/manage/msg/car_alert/list", type: "get", data: data, })