Merge branch 'dev_upgrade' of…

src/consts/application.js

@@ -5,4 +5,5 @@ export default {
   fireAutoSys: 'fireAutoSys/', // 换流站
   patrol: 'patrol/', // 巡检
   equip: 'equip/', // 装备
+  jcs: 'jcs/', // JCS
 };

src/consts/urlConsts.js

@@ -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'),//

src/services/preControlService.js

 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 = () => {

src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js

@@ -3,12 +3,19 @@ import _amosTool from 'amos-tool';
 import SysConsts from 'amos-processor/lib/config/consts';
 import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import * as endConf from 'amos-processor/lib/config/endconf';
-import { FasSerUrl, baseURI, FscSerUrl } from '../../../../consts/urlConsts';
-import { Form, Upload, Input, Select, Radio, Modal, AmosAlert, Icon, Toast } from 'amos-framework';
+import { baseURI, FscSerUrl } from '../../../../consts/urlConsts';
+import { Form, Upload, Input, Select, Radio, Modal, AmosAlert, Icon, Toast, InputNumber } from 'amos-framework';
 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 { recursive } from './../../../../utils/request';
@@ -47,6 +54,7 @@ class EquipmentModel extends Component {
         room: '',
         remark: '',
         isIndoor: true,
+        drainDuration: 0,
         imageUrl1: [],
         imageUrl2: [],
         imageUrl3: [],
@@ -68,7 +76,8 @@ class EquipmentModel extends Component {
       previewImage: '',
       project: [],
       riskSourceData: [],
-      prefix: ''
+      prefix: '',
+      categories: []
     };
   }
 
@@ -81,6 +90,7 @@ class EquipmentModel extends Component {
     this.getCommonInfo();
     this.queryLoadPackages(param);
     this.getRiskSourceSecondLevel();
+    this.getCategories();
   };
 
 
@@ -122,8 +132,8 @@ class EquipmentModel extends Component {
         return;
       }
     }
-    if (typeof value !== 'boolean') {
-      form[key] = value.trim();
+    if ( typeof value !== 'boolean' ) {
+      form[key] = value.trim ? value.trim() : value;
     } else {
       form[key] = value;
     }
@@ -376,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 },
@@ -405,7 +432,16 @@ 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='riskSourceId' {...formItemLayout}>
+            <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}
                 value={form.riskSourceId === 0 ? undefined : `${form.riskSourceId}`}
@@ -568,8 +604,11 @@ class EquipmentModel extends Component {
                 <Radio value>是</Radio>
               </RadioGroup>
             </FormItem>
-            <FormItem label={<span>备注</span>} field='remark' {...formItemLayout}>
-              <TextArea rows={4} className='risk_factor_input' required value={form.remark} onChange={e => this.onInputChange('remark', e.target.value)} />
+            <FormItem label={<span>排油时长(分钟)</span>} field="drainDuration" {...formItemLayout}>
+              <InputNumber defaultValue={0} max={1000000} min={1} value={form.drainDuration} onChange={value => this.onInputChange('drainDuration', value)} />
+            </FormItem>
+            <FormItem label={<span>备注</span>} field="remark" {...formItemLayout}>
+              <TextArea rows={4} className="risk_factor_input" required value={form.remark} onChange={e => this.onInputChange('remark', e.target.value)} />
             </FormItem>
             <FormItem label={<span>重点设备照片</span>} field='equipmentPic' {...formItemLayout}>
               <div>