diff --git a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx index dcb5242..32c9c69 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx @@ -406,8 +406,8 @@ function Fence(props) { children={} modalType={'noImg'} totalRecords={resultData.total_records}// 可导出总数 - exportUrl={'/api/bpm/device/pole_position_list'} - ajaxType={"get"} + exportUrl={'/api/bpm/device/export_pole_position'} + ajaxType={"post"} postdata={{formData: formExportData}} timeDelay={300} imgno={false} diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx index 5a1d845..fa4f4ac 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx @@ -109,7 +109,7 @@ function Fence(props) { }) setEditId(item.id) getBerthDataByNvr(item.nvr_id) - setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => Number(v)) : []) + setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : []) setEditModalVisible(true) } const editModalCancel = () => { diff --git a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx index 2e4b1a7..124ecdb 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx @@ -146,8 +146,9 @@ function Fence(props) { setRoadData(data); }); item.road_name = item.road_id; + item.type = item.type + '' form.setFieldsValue({ - ...item, + ...item }); setEditModalVisible(true); }; diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/ConfInfoModal/index.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/ConfInfoModal/index.jsx index 571c2c7..58b7d09 100644 --- a/src/pages/SystemMgm/MessageMgm/ConfMes/ConfInfoModal/index.jsx +++ b/src/pages/SystemMgm/MessageMgm/ConfMes/ConfInfoModal/index.jsx @@ -79,7 +79,11 @@ function ConfInfoModal (props) { { !isDetail ? ( - + current < moment().subtract(1, 'days')} + allowClear={false} + showTime + disabled={!isEdit} /> ) : (
{data.push_time}
) diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx index 3f17b4e..96d9e73 100644 --- a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx @@ -185,7 +185,7 @@ function ConfMes(props) { return new Promise((resolve, rejected) => { ajax.msgConfUpdate(data).then((res) => { if (res.status == 20000) { - resolve(res.messgae) + resolve('消息配置成功') } else { rejected(res.message) } diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx index a6ba0f2..df7b428 100644 --- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx +++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx @@ -40,8 +40,8 @@ function OrgnizationMgm() { const getAreaTree = () => { ajax.getAreaTree().then((e) => { if (e.status == 20000) { - setAreaTree([...e.data.map(item => item.name != '全部')]) - setDefaultAreaTree([...e.data]) + setAreaTree([...e.data.filter(item => item.name != '全部')]) + setDefaultAreaTree([...e.data.filter(item => item.name != '全部')]) setDefaultTreeActiveKey([e.data[0].id]) getRoleTree(e.data[0].id) } @@ -502,6 +502,7 @@ function OrgnizationMgm() { console.log(v)} + onChange={(v, item) => { + orgForm.setFieldsValue({ + level: Number(item[item.length - 1].level) + 1 + }) + }} fieldNames={{ label: 'name', value: 'id'