Commit 79fd06ce authored by 李秀明's avatar 李秀明

重点设备-增加分类字段

parent 077638ff
......@@ -5,4 +5,5 @@ export default {
fireAutoSys: 'fireAutoSys/', // 换流站
patrol: 'patrol/', // 巡检
equip: 'equip/', // 装备
jcs: 'jcs/', // JCS
};
......@@ -17,6 +17,7 @@ export const getOutterURL = (key) => {
export const patrolURI = baseURI+app.patrol;;
export const fireBaseURI = baseURI+app.fireAutoSys;
export const equipURI = baseURI+app.equip;
export const jcsURI = baseURI+app.jcs;
export const SecurityWsUrl = securityBaseWsURI;
export const XJBaseURI = xjBaseURI;
const secExVerson = 'v1';
......@@ -282,6 +283,10 @@ export const FasSerUrl = {
buildingTreeUrl: completePrefix(equipURI, 'building/tree'), // 建筑树接口
};
export const JcsUrl = {
dictionaryUrl: completePrefix(jcsURI, 'data-dictionary/form/list?types={types}'),
};
export const ModuleEditUrl = {
getAreaTreeUrl: completePrefix(fireBaseURI, 'api/view3d/region/tree'),//
......
import formatUrl from 'amos-processor/lib/utils/urlFormat';
import { FasSerUrl, FscSerUrl, secExtUrl } from './../consts/urlConsts';
import { FasSerUrl, FscSerUrl, JcsUrl, secExtUrl } from './../consts/urlConsts';
import { commonGet, commonPost, commonDelete, commonPut } from './../utils/request';
export const queryRiskLevelAction = (filter, page, size) => {
......@@ -201,6 +201,14 @@ export const queryLoadPackagesAction = (project) => {
};
/**
* 获取预案下拉框
*/
export const queryDictionaryAction = types => {
const url = formatUrl(JcsUrl.dictionaryUrl, { types });
return commonGet(url);
};
/**
* 获取预案树
*/
export const getPlanTreeAction = () => {
......
......@@ -8,7 +8,13 @@ import { Form, Upload, Input, Select, Radio, Modal, AmosAlert, Icon, Toast, Inpu
import { TreeSelect } from 'amos-antd';
import PropTypes from 'amos-react-router/lib/PropTypes';
import { getEquipmentDataAction, getFireStationDataAction, getPrePlanPictureAction } from '../../../../services/ledgerService';
import { queryDeptByOrgCodeAction, getUsersByDepartmentIdAction, queryRegionTreeAction , queryLoadPackagesAction ,buildingTreeAction } from '../../../../services/preControlService';
import {
queryDeptByOrgCodeAction,
getUsersByDepartmentIdAction,
queryLoadPackagesAction,
buildingTreeAction,
queryDictionaryAction
} from '../../../../services/preControlService';
import { convertImgUrlToFile, getBase64 } from './../../../../utils/FileUtils';
import { baseURI, FscSerUrl } from '../../../../consts/urlConsts';
import { recursive } from './../../../../utils/request';
......@@ -69,7 +75,8 @@ class EquipmentModel extends Component {
previewImage: '',
project: [],
riskSourceData: [],
prefix: ''
prefix: '',
categories: []
};
}
......@@ -82,6 +89,7 @@ class EquipmentModel extends Component {
this.getCommonInfo();
this.queryLoadPackages(param);
this.getRiskSourceSecondLevel();
this.getCategories();
};
......@@ -378,8 +386,25 @@ class EquipmentModel extends Component {
}
getCategories = () => {
const type = 'ZDSBFL';
queryDictionaryAction(type).then(data => {
const categoryDictionary = data[type];
if (categoryDictionary) {
const options = [];
categoryDictionary.forEach(dict => {
options.push({
label: dict.label,
value: dict.value
});
});
this.setState({ categories: options });
}
});
}
render() {
const { form, rules, chargeDeptData, chargeUserData, fireStationData, previewImage, previewVisible, project, riskSourceData } = this.state;
const { form, rules, chargeDeptData, chargeUserData, fireStationData, previewImage, previewVisible, categories, riskSourceData } = this.state;
const formItemLayout = {
labelCol: {
xs: { span: 24 },
......@@ -407,6 +432,15 @@ class EquipmentModel extends Component {
<FormItem label={<span>设备编号</span>} field="code" {...formItemLayout}>
<Input className="risk_factor_input" required value={form.code} onChange={e => this.onInputChange('code', e.target.value)} />
</FormItem>
<FormItem label={<span>分类</span>} field="category" {...formItemLayout}>
<Select
className="risk_factor_select"
data={categories}
renderOption={item => <Option value={item.value}>{item.label}</Option>}
value={form.category}
onChange={e => this.onSelectChange('category', e)}
/>
</FormItem>
<FormItem label={<span>所属区域</span>} field="riskSourceId" {...formItemLayout}>
<TreeSelect
treeData={riskSourceData}
......
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