Commit 2959f915 authored by xixinzhao's avatar xixinzhao

bug修改

parent 098457b6
...@@ -105,6 +105,7 @@ export const FscSerUrl = { ...@@ -105,6 +105,7 @@ export const FscSerUrl = {
fetchTaskList: completePrefix(patrolURI, 'api/task/queryTaskByPage'), //月巡检情况统计 fetchTaskList: completePrefix(patrolURI, 'api/task/queryTaskByPage'), //月巡检情况统计
fetchHidDangerCount: completePrefix(patrolURI, 'api/task/hiddenDanger/count'), //隐患治理统计 fetchHidDangerCount: completePrefix(patrolURI, 'api/task/hiddenDanger/count'), //隐患治理统计
SpecCheckInputByIdNewUrl: completePrefix(patrolURI,'api/spc/check-input-new'), //根据ID查询巡检记录项 SpecCheckInputByIdNewUrl: completePrefix(patrolURI,'api/spc/check-input-new'), //根据ID查询巡检记录项
queryAuthUsersUrl: completePrefix(patrolURI, '/api/user/queryAuthUsers'), // 根据ID查询巡检记录项
fetchPointDetail: completePrefix(patrolURI, 'api/spc/queryPointById'),//风险点 fetchPointDetail: completePrefix(patrolURI, 'api/spc/queryPointById'),//风险点
fetchPointMeasures: completePrefix(patrolURI, 'api/spc/measures'),//巡检点措施 fetchPointMeasures: completePrefix(patrolURI, 'api/spc/measures'),//巡检点措施
......
...@@ -166,3 +166,10 @@ export const queryUserByDeptIdAction = (deptId) => { ...@@ -166,3 +166,10 @@ export const queryUserByDeptIdAction = (deptId) => {
export const queryRoutePlanPointAction = (filter) => { export const queryRoutePlanPointAction = (filter) => {
return commonPost(formatUrl(FscSerUrl.routePlanPointPageUrl), filter); return commonPost(formatUrl(FscSerUrl.routePlanPointPageUrl), filter);
}; };
/**
* 获取人员列表
*/
export const queryAuthUsersAction = () => {
return commonGet(formatUrl(FscSerUrl.queryAuthUsersUrl));
};
...@@ -4,6 +4,7 @@ import { Select,Input } from 'amos-antd'; ...@@ -4,6 +4,7 @@ import { Select,Input } from 'amos-antd';
import { MultiSelect, Icon } from 'amos-framework'; import { MultiSelect, Icon } from 'amos-framework';
import { import {
fetchPointQueryCriteria, fetchPointQueryCriteria,
queryAuthUsersAction,
queryUserByDeptIdAction queryUserByDeptIdAction
} from './../../../services/checkInfoService'; } from './../../../services/checkInfoService';
...@@ -88,7 +89,7 @@ class PointSearch extends Component { ...@@ -88,7 +89,7 @@ class PointSearch extends Component {
this.setState({ searchParam }); this.setState({ searchParam });
this.props.setSearchParam(searchParam); this.props.setSearchParam(searchParam);
if (value === undefined) { if (value === undefined) {
this.setState({ userData: [], checkUserOptions: [] }); this.queryAuthUsers();
this.props.setSearchParam(searchParam); this.props.setSearchParam(searchParam);
} else { } else {
this.setState({ this.setState({
...@@ -130,6 +131,30 @@ class PointSearch extends Component { ...@@ -130,6 +131,30 @@ class PointSearch extends Component {
this.setState({ dataTypeOptions: typeList, this.setState({ dataTypeOptions: typeList,
departmentOptions: departmentList, statusOptions: statusList, pointLevelOptions: pointLevelList, statusData: data.status }); departmentOptions: departmentList, statusOptions: statusList, pointLevelOptions: pointLevelList, statusData: data.status });
}); });
// 请求人员
this.queryAuthUsers();
}
/**
* 查询人员接口
*/
queryAuthUsers = () => {
queryAuthUsersAction().then((res) => {
let userData = res;
let userOptions = [];
if (res && res.length > 0) {
res.map(d=>{
if (d) {
userOptions.push(<Option key={d.id}>{d.name}</Option>);
}
});
this.setState({
checkUserOptions: userOptions,
userData
});
}
});
} }
queryUserByDept = (deptId) => { queryUserByDept = (deptId) => {
...@@ -159,9 +184,9 @@ class PointSearch extends Component { ...@@ -159,9 +184,9 @@ class PointSearch extends Component {
} }
render() { render() {
let { userData, dataTypeOptions, departmentOptions, statusData, pointLevelOptions, selectData, searchParam } = this.state; let { userData, dataTypeOptions, departmentOptions, statusData, pointLevelOptions, selectData, searchParam, checkUserOptions } = this.state;
const checkUserOptions = userData ? userData.map(d => <Option key={d.id}>{d.name}</Option>) : []; // const checkUserOptions = userData ? userData.map(d => <Option key={d.id}>{d.name}</Option>) : [];
console.log(checkUserOptions); // console.log(checkUserOptions);
return ( return (
<div className='create-device-search-root'> <div className='create-device-search-root'>
<div className='catalog-select'> <div className='catalog-select'>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment