diff --git a/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx
index 079bb55..a2b1cdb 100644
--- a/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx
@@ -22,7 +22,7 @@ function ReportMsg(props) {
road_name: '',
name: '',
operator_id: '0',
- report_type_name:'',
+ report_type:'',
start_time: moment().format('YYYY-MM-DD 00:00:00'),
end_time: moment().format("YYYY-MM-DD 23:59:59"),
pn: 1,
@@ -41,7 +41,7 @@ function ReportMsg(props) {
}
//报备类型
const handleReportTypeName = (v) => {
- setFormData({ ...formData, report_type_name: v })
+ setFormData({ ...formData, report_type: v })
}
//商户名称
const handleDeployType = (value) => {
@@ -59,7 +59,7 @@ function ReportMsg(props) {
let data = {
...formData
}
- ajax.getFaultReportExport(data).then(res => {
+ ajax.getReportExport(data).then(res => {
window.open(res.export_url)
})
}
@@ -205,7 +205,7 @@ function ReportMsg(props) {
road_name: sessionTabList?.road_name,
operator_id: sessionTabList?.operator_id,
name: sessionTabList?.name,
- report_type_name: sessionTabList?.report_type_name,
+ report_type: sessionTabList?.report_type,
start_time: sessionTabList?.start_time,
end_time: sessionTabList?.end_time,
pn: sessionTabList?.pn,
@@ -259,7 +259,7 @@ function ReportMsg(props) {
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx
index 625f48f..4706460 100644
--- a/src/pages/SystemMgm/RoleMgm/loadable.jsx
+++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx
@@ -275,6 +275,7 @@ function RoleMgm(props) {
const CheckApplyBtn = (record) => {
setEditVisible(true)
setGetGovernment(record.depart_id)
+ setAddManage({ ...addManage, depart_id: record.depart_id })
let data = {
id: record.id
}
@@ -337,8 +338,10 @@ function RoleMgm(props) {
remark: '',
name: '',
depart_id: '',
+ auth: ''
})
setCheckedKeys([])
+ setGetGovernment(0)
}
const cancelImg = () => {
setPasswordVisible(false)
@@ -455,11 +458,12 @@ function RoleMgm(props) {
}
// const [getKey,setGetKey]=useState([])
useEffect(() => {
- let arrStr = getImg.depart_id
- let lastElement = arrStr[arrStr.length - 1];
+ // let arrStr = addManage.depart_id
+ // let lastElement = addManage[arrStr.length - 1];
+ // console.log(addManage);
if (getGovernment != 0) {
let data = {
- id: lastElement
+ id: addManage.depart_id
}
ajax.getDepartId(data).then(res => {
if (res.status === 20000) {
@@ -667,6 +671,9 @@ function RoleMgm(props) {
setGetImg(
Object.assign({}, getImg, { depart_id: v })
);
+ let arrStr = v
+ let lastElement = arrStr[arrStr.length - 1];
+ setAddManage({ ...addManage, depart_id: lastElement})
}}
fieldNames={{
label: 'name',
diff --git a/src/services/common.js b/src/services/common.js
index c89db3d..c1c517f 100644
--- a/src/services/common.js
+++ b/src/services/common.js
@@ -116,7 +116,7 @@ const getRoadSearch = (params) => {
//停车记录查询路段名称-新接口
const getNewRoadSearch = (params) => {
return ajax({
- url: "/PMS/api/bpm/record/all_road",
+ url: "/api/bpm/record/all_road",
type: "post",
data: params,
});
diff --git a/src/services/search.js b/src/services/search.js
index cb2a55d..d047067 100644
--- a/src/services/search.js
+++ b/src/services/search.js
@@ -1095,6 +1095,14 @@ const getFaultReportExport = (params) => {
data: params,
});
};
+//设备运维-泊位状态列表
+const getReportExport = (params) => {
+ return ajax({
+ url: "/api/bpm/user/exportReport",
+ type: "post",
+ data: params,
+ });
+};
//设备运维-故障上报列表
const getShowFaultReport = (params) => {
return ajax({
@@ -1145,6 +1153,7 @@ export default {
getShowFaultReport,
getFaultReportExport,
getCaseSearchData,
+ getReportExport,
getDataSourceData,
getCaseStatusData,
getLevelSearchData,