Browse Source

fix(): 修复路内已知问题

master
wanghx 1 year ago
parent
commit
9a31c2c9c2
  1. 4
      src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
  2. 2
      src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
  3. 3
      src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
  4. 6
      src/pages/SystemMgm/MessageMgm/ConfMes/ConfInfoModal/index.jsx
  5. 2
      src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx
  6. 11
      src/pages/SystemMgm/OrgnizationMgm/loadable.jsx

4
src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx

@ -406,8 +406,8 @@ function Fence(props) {
children={<Button className="export colorBtn" type="primary" onClick={handleDownload} >导出</Button>} children={<Button className="export colorBtn" type="primary" onClick={handleDownload} >导出</Button>}
modalType={'noImg'} modalType={'noImg'}
totalRecords={resultData.total_records}// 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}} postdata={{formData: formExportData}}
timeDelay={300} timeDelay={300}
imgno={false} imgno={false}

2
src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx

@ -109,7 +109,7 @@ function Fence(props) {
}) })
setEditId(item.id) setEditId(item.id)
getBerthDataByNvr(item.nvr_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) setEditModalVisible(true)
} }
const editModalCancel = () => { const editModalCancel = () => {

3
src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx

@ -146,8 +146,9 @@ function Fence(props) {
setRoadData(data); setRoadData(data);
}); });
item.road_name = item.road_id; item.road_name = item.road_id;
item.type = item.type + ''
form.setFieldsValue({ form.setFieldsValue({
...item,
...item
}); });
setEditModalVisible(true); setEditModalVisible(true);
}; };

6
src/pages/SystemMgm/MessageMgm/ConfMes/ConfInfoModal/index.jsx

@ -79,7 +79,11 @@ function ConfInfoModal (props) {
<Form.Item label="推送时间" name="push_time" rules={isDetail ? undefined : rules}> <Form.Item label="推送时间" name="push_time" rules={isDetail ? undefined : rules}>
{ {
!isDetail ? ( !isDetail ? (
<DatePicker allowClear={false} showTime disabled={!isEdit} />
<DatePicker
disabledDate={(current) => current < moment().subtract(1, 'days')}
allowClear={false}
showTime
disabled={!isEdit} />
) : ( ) : (
<div className="conf-detail-info">{data.push_time}</div> <div className="conf-detail-info">{data.push_time}</div>
) )

2
src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx

@ -185,7 +185,7 @@ function ConfMes(props) {
return new Promise((resolve, rejected) => { return new Promise((resolve, rejected) => {
ajax.msgConfUpdate(data).then((res) => { ajax.msgConfUpdate(data).then((res) => {
if (res.status == 20000) { if (res.status == 20000) {
resolve(res.messgae)
resolve('消息配置成功')
} else { } else {
rejected(res.message) rejected(res.message)
} }

11
src/pages/SystemMgm/OrgnizationMgm/loadable.jsx

@ -40,8 +40,8 @@ function OrgnizationMgm() {
const getAreaTree = () => { const getAreaTree = () => {
ajax.getAreaTree().then((e) => { ajax.getAreaTree().then((e) => {
if (e.status == 20000) { 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]) setDefaultTreeActiveKey([e.data[0].id])
getRoleTree(e.data[0].id) getRoleTree(e.data[0].id)
} }
@ -502,6 +502,7 @@ function OrgnizationMgm() {
<Tree <Tree
disabled={!editStatus} disabled={!editStatus}
checkable checkable
height={550}
treeData={roleTree} treeData={roleTree}
onCheck={handleRoleTreeChange} onCheck={handleRoleTreeChange}
checkedKeys={roleCheckedKeys} checkedKeys={roleCheckedKeys}
@ -632,7 +633,11 @@ function OrgnizationMgm() {
allowClear={false} allowClear={false}
changeOnSelect changeOnSelect
multiple={false} multiple={false}
onChange={(v) => console.log(v)}
onChange={(v, item) => {
orgForm.setFieldsValue({
level: Number(item[item.length - 1].level) + 1
})
}}
fieldNames={{ fieldNames={{
label: 'name', label: 'name',
value: 'id' value: 'id'

Loading…
Cancel
Save