修改消防水池，点位添加，风险模型相关模块bug

src/view/bizview/equipmentLedger/FireResources/FireEquipment/MonitorPointConfig.js

@@ -304,16 +304,16 @@ class MonitorPointConfig extends Component {
           }
         );
       } else {
-        saveMonitorPointAction(MonitorPoint).then(
-          data => {
-            AmosAlert.success('提示', '配置成功');
-            this.reloadPage();
-            this.editCancel();
-          },
-          error => {
-            AmosAlert.error('错误', error);
-          }
-        );
+          saveMonitorPointAction(MonitorPoint).then(
+            data => {
+              AmosAlert.success('提示', '配置成功');
+              this.reloadPage();
+              this.editCancel();
+            },
+            error => {
+              AmosAlert.error('错误', error);
+            }
+          );
       }
     }
   };

src/view/bizview/equipmentLedger/FireResources/water/FireWaterAdd.js

@@ -23,7 +23,10 @@ class FireWaterAdd extends Component {
         maxLevel: 0,
         area: 0,
         isIndoor: true,
-        riskSourceId:0
+        riskSourceId:0,
+        area: 0,
+        maxLevel: 0,
+        alarmLevel: 0
       },
       rules: {
         code: [

src/view/bizview/equipmentLedger/FireResources/water/FireWaterEdit.js

@@ -23,7 +23,10 @@ class FireWaterEdit extends Component {
         position3d: '',
         floor3d: '1',
         isIndoor: true,
-        riskSourceId: 0
+        riskSourceId: 0,
+        area: 0,
+        maxLevel: 0,
+        alarmLevel: 0
       },
       rules: {
         code: [{ required: true, message: '请输入编号' }],

src/view/bizview/equipmentLedger/FireResources/water/index.js

@@ -26,6 +26,7 @@ class FireWaterResourceView extends Component {
 
 
   toolbarButtonOnClick = (key) => {
+    
     const { activeKey } = this.state;
     if ( parseInt(activeKey) === 1 ) {
       this.setState({ oparate1: parseInt(key), oparate2: 0 });

src/view/bizview/preControl/riskModel/index.js

@@ -745,17 +745,6 @@ class RiskModel extends Component {
 
   getTreeIcon =(props)=>{
     let { isRegion, pos } = props;
-    // let arry = pos ? pos.split('-') : [];
-    // let length = arry.length;
-    // if (length === 2){
-    //   return <BizIcon icon="shu-changqu" />;
-    // } else if (length === 3){
-    //   return <BizIcon icon="shu-zhukonglou" />;
-    // } else if (length === 4){
-    //   return <BizIcon icon="shu-louceng" />;
-    // } else {
-    //   return '';
-    // }
     if (isRegion === 'TRUE') {
       return <BizIcon icon="shu-changqu" />;
     } else {

src/view/bizview/preControl/riskModel/model/PointModel.js

@@ -236,7 +236,7 @@ class PointModel extends Component {
             <Select
               className="point-model_select"
               data={deptData}
-              renderOption={item => <Option value={item.depmCode}>{item.departmentName}</Option>}
+              renderOption={item => <Option value={item.sequenceNbr}>{item.departmentName}</Option>}
               value={departmentId}
               defaultOption={<Option value="">全部</Option>}
               onChange={e=> this.onSelectChange('departmentId', e)}

src/view/bizview/preControl/riskModel/model/RiskSourceModel.js

@@ -191,7 +191,7 @@ class RiskSourceModel extends Component {
             />
           </FormItem>
           <FormItem label={<span>是否室内</span>} field="isIndoor" {...formItemLayout}>
-            <RadioGroup disabled={disabled} defaultValue={this.changeBool2Num(form.isIndoor)} onChange={e => this.onSelectChange('isIndoor', e)}>
+            <RadioGroup disabled={disabled} value={form.isIndoor} defaultValue={form.isIndoor} onChange={e => this.onSelectChange('isIndoor', e)}>
               <Radio value={0}>否</Radio>
               <Radio value={1}>是</Radio>
             </RadioGroup>