bug修改提交

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

@@ -285,7 +285,6 @@ class MonitorPointConfig extends Component {
     const { form, monitorPointId, shwoConfig, selectedRowKeys } = this.state;
     let MonitorPoint = Object();
     Object.assign(MonitorPoint, form);
-debugger
     if (monitorPointId) { // 编辑时
       MonitorPoint.id = monitorPointId;
       updateMonitorPointAction(MonitorPoint).then(
@@ -446,7 +445,6 @@ debugger
   }
 
   configEquip = () => {
-    debugger
     let { selectedRowKeys ,selectedRows,form} = this.state;
 
 

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

@@ -23,25 +23,24 @@ class PointConfig extends Component {
       },
       _disabled: true,
       alarmTypeData: [],
-     
+
       fireEquipmentData: []
     };
   }
 
   componentWillMount = () => {
     this.loadFireEquipment();
-    debugger
     let { form } = this.state;
     form['fireEquipmentId']=this.props.fireEquipmentId;
     this.setState({
       form
-    
+
     });
   };
 
   componentWillReceiveProps(nextProps) {
     this.loadFireEquipment();
-   
+
   }
 
   loadFireEquipment = () => {
@@ -54,7 +53,7 @@ class PointConfig extends Component {
     let { form } = this.state;
     form[key] = value;
     this.setState({
-      form  
+      form
     });
     this.props.setParam(form);
   };

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

@@ -96,7 +96,6 @@ class PointConfigModel extends Component {
   }
 
   onSelectChange = (key, value) => {
-    debugger
     let { form } = this.state;
     form[key] = value;
     let _this = this;
@@ -176,10 +175,16 @@ class PointConfigModel extends Component {
               searchable
               data={fireEquipmentData}
               value={form.fireEquipmentId}
-              renderOption={item => <Option value={item.id}>{item.name}({item.code})</Option>}
+              // renderOption={item => <Option value={item.id}>{item.name}({item.code})</Option>}
               onChange={e => this.onSelectChange('fireEquipmentId', e)}
               className="monitor-point-config-form-select"
-            />
+            >
+               <Option>请选择</Option>
+              {
+                fireEquipmentData.map(e => <Option key={e.id} value={e.id}>{e.name}</Option>)
+              }
+
+            </Select>
           </FormItem>
         </Form>
       </div>

src/view/bizview/equipmentLedger/FireResources/FireTruck/fireTruckModel.js

@@ -162,10 +162,10 @@ class FireTruckModel extends Component {
               <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.position3d} onChange={e => this.onInputChange('position3d', e.target.value)} />
             </FormItem>
             <FormItem label={<span>ue4位置</span>} field="ue4Location" {...formItemLayout}>
-              <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.ue4Location} onChange={e => this.onInputChange('ue4Location', e.target.value)} />
+              <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.ue4Location === "null" ? '':form.ue4Location } onChange={e => this.onInputChange('ue4Location', e.target.value)} />
             </FormItem>
             <FormItem label={<span>ue4旋转</span>} field="ue4Rotation" {...formItemLayout}>
-              <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.ue4Rotation} onChange={e => this.onInputChange('ue4Rotation', e.target.value)} />
+              <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.ue4Rotation === "null" ? '': form.ue4Rotation } onChange={e => this.onInputChange('ue4Rotation', e.target.value)} />
             </FormItem>
             <FormItem label={<span>3维楼层</span>} field="floor3d" {...formItemLayout}>
               <Select
@@ -179,9 +179,9 @@ class FireTruckModel extends Component {
               />
             </FormItem>
             <FormItem label={<span>是否室内</span>} field="isIndoor" {...formItemLayout}>
-              <RadioGroup defaultValue={form.isIndoor} disabled={!this.props.editable} value={form.isIndoor}  onChange={e => this.onInputChange('isIndoor', e)}>
-                <Radio value={false}>否</Radio>
-                <Radio value={true}>是</Radio>
+              <RadioGroup  defaultValue={form.isIndoor}  value={form.isIndoor}  onChange={e => this.onInputChange('isIndoor', e)}>
+                <Radio  disabled={form.isIndoor&&!this.props.editable} value={false}>否</Radio>
+                <Radio disabled={!form.isIndoor&&!this.props.editable} value={true}>是</Radio>
               </RadioGroup>
             </FormItem>
             <FormItem label={<span>车牌号</span>} field="carNum" {...formItemLayout}>

src/view/bizview/equipmentLedger/FireResources/fireFoam/FireFoamAdd.js

@@ -21,8 +21,7 @@ class FireFoamAdd extends Component {
         position3d: '',
         floor3d: '1',
         isIndoor: true,
-        picture: [],
-        riskSourceId: undefined
+        picture: []
       },
       previewVisible: false,
       previewImage: '',
@@ -154,7 +153,6 @@ class FireFoamAdd extends Component {
         <div className="amos-upload-text">选择图片</div>
       </div>
     );
-
     return (
       <Form className="basic-demo" model={station} rules={rules} ref={component => this.form = component}>
         <FormItem label={<span>泡沫间名称</span>} field="name" {...formItemLayout}>
@@ -171,7 +169,7 @@ class FireFoamAdd extends Component {
             dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
             treeData={riskSourceData}
             placeholder="请选择"
-            value={station.riskSourceId}
+            value={station.riskSourceId === null ? undefined : station.riskSourceId}
             onChange={e => this.onSelectChange('riskSourceId', e)}
           />
         </FormItem>

src/view/bizview/equipmentLedger/FireResources/fireFoam/FireFoamDetail.js

@@ -20,8 +20,7 @@ class FireFoamDetail extends Component {
         address: '',
         position3d: '',
         floor3d: '',
-        isIndoor: true,
-        riskSourceId: 0
+        isIndoor: true
       }
     };
   }
@@ -75,7 +74,7 @@ class FireFoamDetail extends Component {
                 data={riskSourceData}
                 renderOption={item => <Option value={parseInt(item.id)}>{item.name}</Option>}
                 placeholder="请选择"
-                value={station.riskSourceId}
+                value={station.riskSourceId === null ? undefined : station.riskSourceId}
                 onChange={e => this.onSelectChange('riskSourceId', e)}
               />
         </FormItem>

src/view/bizview/equipmentLedger/FireResources/fireFoam/FireFoamEdit.js

@@ -24,8 +24,7 @@ class FireFoamEdit extends Component {
         position3d: '',
         floor3d: '1',
         isIndoor: true,
-        picture: [],
-        riskSourceId: 0
+        picture: []
       },
       previewVisible: false,
       previewImage: '',
@@ -203,7 +202,7 @@ class FireFoamEdit extends Component {
             dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
             treeData={riskSourceData}
             placeholder="请选择"
-            value={station.riskSourceId}
+            value={station.riskSourceId === null ? undefined : station.riskSourceId}
             onChange={e => this.onSelectChange('riskSourceId', e)}
           />
         </FormItem>