修改建筑树提交

src/consts/application.js

@@ -3,5 +3,6 @@
  */
 export default {
   fireAutoSys: 'fireAutoSys/', // 换流站
-  patrol: 'patrol/' // 巡检
+  patrol: 'patrol/', // 巡检
+  equip: 'equip/', // 装备
 };

src/consts/urlConsts.js

@@ -16,6 +16,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 SecurityWsUrl = securityBaseWsURI;
 export const XJBaseURI = xjBaseURI;
 const secExVerson = 'v1';
@@ -273,7 +274,8 @@ export const FasSerUrl = {
   regionChildren: completePrefix(securityBaseWsURI, 'systemctl/v1/region/children?parentId={value}'), // 查询省级行政区划数据
   saveStationMainten: completePrefix(fireBaseURI, 'api/stationMainten/save'), // 保存站端信息
   loadStationMainten: completePrefix(fireBaseURI, 'api/stationMainten/detail'), // 获取站端详情
-  getFiltersUrl: completePrefix(fireBaseURI, 'api/equipment/list-tree') // 获取装备信息
+  getFiltersUrl: completePrefix(fireBaseURI, 'api/equipment/list-tree'), // 获取装备信息
+  buildingTreeUrl: completePrefix(equipURI, 'building/tree'), // 建筑树接口
 };
 
 

src/services/preControlService.js

@@ -300,3 +300,9 @@ export const queryRegionTreeAction = () => {
   return commonGet(formatUrl(FasSerUrl.regionTreeUrl), {});
 };
 
+/**
+ * 建筑树接口
+ */
+export const buildingTreeAction = () => {
+  return commonGet(formatUrl(FasSerUrl.buildingTreeUrl));
+};

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

@@ -8,9 +8,10 @@ import { Form, Upload, Input, Select, Radio, Modal, AmosAlert, Icon } from 'amos
 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 } from '../../../../services/preControlService';
+import { queryDeptByOrgCodeAction, getUsersByDepartmentIdAction, queryRegionTreeAction , queryLoadPackagesAction ,buildingTreeAction} from '../../../../services/preControlService';
 import { convertImgUrlToFile, getBase64 } from './../../../../utils/FileUtils';
 import { baseURI, FscSerUrl } from '../../../../consts/urlConsts';
+import { recursive } from './../../../../utils/request';
 
 const AmosConfig = endConf.AmosConfig;
 const ls = _amosTool.Store.lsTool;
@@ -82,11 +83,28 @@ class EquipmentModel extends Component {
 
 
   getRiskSourceSecondLevel = () =>{
-    queryRegionTreeAction().then(
-      data =>{
-        this.setState({ riskSourceData: data });
-      }
-    );
+    buildingTreeAction().then(res => {
+      let buildingList = res;
+      this.setState({
+        riskSourceData: recursive(buildingList).map(e => {
+          if (e.groupType === 'allBuilding') {
+            return {
+              ...e,
+              key: e.instanceId,
+              value: e.instanceId,
+              title: e.instanceName,
+              disabled: true
+            };
+          }
+          return {
+            ...e,
+            key: e.instanceId,
+            value: e.instanceId,
+            title: e.instanceName
+          };
+        })
+      });
+    });
   };
 
   onInputChange = (key, value) => {
@@ -349,17 +367,20 @@ class EquipmentModel extends Component {
               <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}>
-              <TreeSelect
-                searchable
-                className="fire-equip-select"
-                style={{ width: '200px' }}
-                dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
-                treeData={riskSourceData}
-                placeholder="请选择"
-                value={form.riskSourceId === 0 ? undefined : form.riskSourceId}
-                onChange={e => this.onSelectChange('riskSourceId', e)}
-              />
+            <TreeSelect
+                  treeData={riskSourceData}
+                  value={form.riskSourceId === 0 ? undefined : `${form.riskSourceId}`}
+                  style={{ width: '200px' }}
+                  dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
+                  onChange={e => this.onSelectChange('riskSourceId', e)}
+                  treeDefaultExpandAll
+                  showSearch
+                  placeholder="请选择"
+                  treeNodeFilterProp="title"
+                  filterTreeNode={(inputValue, treeNode) => treeNode.props.title.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase())}
+                />
             </FormItem>
+
             <FormItem label={<span>建筑物</span>} field="building" {...formItemLayout}>
               <Input className="risk_factor_input" required value={form.building} onChange={e => this.onInputChange('building', e.target.value)} />
             </FormItem>