From 9ec61f4448fd60e0f3624aacc5cc189a948c24e0 Mon Sep 17 00:00:00 2001 From: guoxin Date: Thu, 4 Jan 2024 09:59:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SystemMgm/RoleMgm/loadable.jsx | 43 ++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx index 410d324..0d19bd0 100644 --- a/src/pages/SystemMgm/RoleMgm/loadable.jsx +++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx @@ -135,7 +135,7 @@ function RoleMgm(props) { console.log(arr); setGetCheckVlue(true) // getCheckValue - setGetImg({ ...getImg, auth: string }) + setGetAdminId({ ...getAdminId, auth: string }) } else { setCheckedKeys([]) } @@ -277,13 +277,18 @@ function RoleMgm(props) { } }] //图片 - const [getImg, setGetImg] = useState({ + // const [getAdminId, setGetAdminId] = useState({ + // remark: '', + // name: '', + // depart_id: '', + // auth: '' + // }) + const [getAdminId, setGetAdminId] = useState({ remark: '', name: '', depart_id: '', auth: '' }) - const [getAdminId, setGetAdminId] = useState({}) const [getAuthId, setGetAuthId] = useState({}) //编辑 const CheckApplyBtn = (record) => { @@ -305,8 +310,8 @@ function RoleMgm(props) { let strArr = str.split(","); let num = strArr.map(Number) setCheckedKeys(num) - let newArr = record.depart_arr.split(',') - // setGetImg(Object.assign({}, getImg, { + // let newArr = record.depart_arr.split(',') + // setGetAdminId(Object.assign({}, getAdminId, { // name: record.name, // remark: record.remark, // depart_id: newArr @@ -316,7 +321,7 @@ function RoleMgm(props) { } } - console.log(getImg); + console.log(getAdminId); //所属类型 const [getPlateColor, setGetPlateColor] = useState([]) const plateColor = () => { @@ -452,20 +457,20 @@ function RoleMgm(props) { const placeEditBtn = () => { let arr = checkedKeys let str = arr.toString() - let arrStr = getImg.depart_id + let arrStr = getAdminId.depart_id let lastElement = arrStr[arrStr.length - 1]; let data = { - ...getImg, + ...getAdminId, auth: str, id: getAdminId.id, depart_id: lastElement, depart_arr: arrStr.toString() } - if (getImg.name == "") { + if (getAdminId.name == "") { message.error('角色名称不能为空') return - } else if (getImg.depart_id == "") { + } else if (getAdminId.depart_id == "") { message.error('请选择所属部门') return } @@ -476,7 +481,7 @@ function RoleMgm(props) { getData(formData) setGetGovernment(0) setGetAuthId({}) - setGetImg({ + setGetAdminId({ remark: '', name: '', depart_id: '', @@ -724,8 +729,8 @@ function RoleMgm(props) { value={getAdminId.name} style={{ width: 260, marginLeft: 50 }} onChange={(v) => { - setGetImg( - Object.assign({}, getImg, { name: v.target.value }) + setGetAdminId( + Object.assign({}, getAdminId, { name: v.target.value }) ); }} /> @@ -737,8 +742,8 @@ function RoleMgm(props) { value={getAdminId.remark} style={{ width: 260, marginLeft: 78 }} onChange={(v) => { - setGetImg( - Object.assign({}, getImg, { remark: v.target.value }) + setGetAdminId( + Object.assign({}, getAdminId, { remark: v.target.value }) ); }} /> @@ -753,8 +758,8 @@ function RoleMgm(props) { options={getPlateColor} changeOnSelect onChange={(v) => { - setGetImg( - Object.assign({}, getImg, { depart_id: v }) + setGetAdminId( + Object.assign({}, getAdminId, { depart_id: v }) ); setGetAuthId({}) let arrStr = v @@ -776,8 +781,8 @@ function RoleMgm(props) { style={{ width: 260, marginLeft: 14 }} defaultSelectedKeys={checkedKeys} onCheck={(checkedKeysValue, info) => { - setGetImg( - Object.assign({}, getImg, { auth: checkedKeysValue }) + setGetAdminId( + Object.assign({}, getAdminId, { auth: checkedKeysValue }) ); setCheckedKeys(checkedKeysValue) }} From bb9870c30d7aef1513bae6599e16734b11f60bed Mon Sep 17 00:00:00 2001 From: wanghx Date: Thu, 4 Jan 2024 10:17:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix():=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A3=80=E7=B4=A2=E5=A4=B1=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx | 9 ++++++--- src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx | 9 ++++++--- src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx | 9 ++++++--- src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx | 9 ++++++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx index 68536c7..3605634 100644 --- a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx @@ -144,9 +144,9 @@ function ConfMes(props) { end_time: v.endDateTime }) } - const ajaxGetListData = () => { + const ajaxGetListData = (_pageInfo=pageInfo) => { setLoading(true) - ajax.getMsgConfList({...formData, ...pageInfo}).then(res => { + ajax.getMsgConfList({...formData, ..._pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ list: res.data.list, @@ -285,7 +285,10 @@ function ConfMes(props) { } const handleSearch = () => { - // ajaxGetListData() + ajaxGetListData({ + ...pageInfo, + pn: 1 + }) setPageInfo({ ...pageInfo, pn: 1 diff --git a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx index 0e55c92..0220eb4 100644 --- a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx @@ -118,9 +118,9 @@ function NotificationMes(props) { } - const ajaxGetListData = () => { + const ajaxGetListData = (_pageInfo=pageInfo) => { setLoading(true) - ajax.getDeviceAlarmList({...formData, ...pageInfo}).then(res => { + ajax.getDeviceAlarmList({...formData, ..._pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ list: res.data.list, @@ -206,7 +206,10 @@ function NotificationMes(props) { } const handleSearch = () => { - // ajaxGetListData() + ajaxGetListData({ + ...pageInfo, + pn: 1 + }) setPageInfo({ ...pageInfo, pn: 1 diff --git a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx index 7ed02ef..f62e13d 100644 --- a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx @@ -117,9 +117,9 @@ function MonitorCarAlarmMes(props) { } - const ajaxGetListData = () => { + const ajaxGetListData = (_pageInfo=pageInfo) => { setLoading(true) - ajax.getCarAlarmList({...formData, ...pageInfo}).then(res => { + ajax.getCarAlarmList({...formData, ..._pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ list: res.data.list, @@ -204,7 +204,10 @@ function MonitorCarAlarmMes(props) { } const handleSearch = () => { - // ajaxGetListData() + ajaxGetListData({ + ...pageInfo, + pn: 1 + }) setPageInfo({ ...pageInfo, pn: 1 diff --git a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx index a1ee250..dd51799 100644 --- a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx @@ -186,9 +186,9 @@ function NotificationMes(props) { }) } - const ajaxGetListData = () => { + const ajaxGetListData = (_pageInfo=pageInfo) => { setLoading(true) - ajax.getNotificationList({...formData, ...pageInfo}).then(res => { + ajax.getNotificationList({...formData, ..._pageInfo}).then(res => { if (res.status == 20000) { setResultDate({ list: res.data.list, @@ -316,7 +316,10 @@ function NotificationMes(props) { } const handleSearch = () => { - // ajaxGetListData() + ajaxGetListData({ + ...pageInfo, + pn: 1 + }) setPageInfo({ ...pageInfo, pn: 1