bug

src/styles/view/biz/equipmentLedger/fireResource.scss

@@ -118,6 +118,12 @@
     .fire-truck-performance1 {
       flex: 1;
       padding-right: 15px;
+
+      .upload-false {
+        .aficon-delete {
+          display: none;
+        }
+      }
     }
 
     .fire-truck-performance-title {

src/view/bizview/common/table/CommonTable.js

@@ -61,14 +61,16 @@ class CommonTable extends Component {
 
   onDoubleClick = (record, event) => {
     const { data } = this.state;
-    for (let i = 0; i < data.length; i++) {
-      if (record.orderNo === data[i].orderNo) {
-        data[i].edit = true;
-      } else {
-        data[i].edit = false;
+    if (this.props.editable){//可编辑
+      for (let i = 0; i < data.length; i++) {
+        if (record.orderNo === data[i].orderNo) {
+          data[i].edit = true;
+        } else {
+          data[i].edit = false;
+        }
       }
+      this.props.onChangeTableValues(data);
     }
-    this.props.onChangeTableValues(data);
   };
 
   /**

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

@@ -51,7 +51,8 @@ class FireEquipmentModel extends Component {
         code: [{ required: true, message: '编码不能为空' }],
         name: [{ required: true, message: '名称不能为空' }],
         equipType: [{ required: true, message: '装备类型名称不能为空' }],
-        position3d: [{ validator: this.validPositon3d }]
+        position3d: [{ validator: this.validPositon3d }],
+        maintenanceCycle: [{validator: this.validMaintenanceCycle}]
       }
     };
   }
@@ -135,6 +136,16 @@ class FireEquipmentModel extends Component {
     }
   }
 
+  validMaintenanceCycle = (rule, value, callback) => {
+    if (value !== undefined){
+      if ( Number(value) >= 0 ){
+        callback();
+      } else {
+        callback('保养周期必须大于0 ');
+      }
+    }
+  }
+
   render() {
     let { form, rules, _disabled, riskSourceData } = this.state;
     // let { showDetail } = this.props;

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

@@ -21,6 +21,7 @@ class PointConfigModel extends Component {
     this.state = {
       searchParam: [],
       form: {
+        type: 'SWITCH'//默认值
       },
       _disabled: true,
       alarmTypeData: [],
@@ -28,8 +29,7 @@ class PointConfigModel extends Component {
       rules: {
         code: [{ required: true, message: '编码不能为空' }],
         name: [{ required: true, message: '名称不能为空' }],
-        type: [{ required: true, message: '请选择类型' }],
-
+        type: [{ required: true, message: '请选择类型' }]
       }
     };
   }
@@ -66,14 +66,14 @@ class PointConfigModel extends Component {
         _this.setState({
           form: data
         });
-        const { form } = _this.state; 
+        const { form } = _this.state;
         this.props.setParam(form)
       },
       err => {
         AmosAlert.error('错误', err);
       }
     );
-   
+
   }
 
   onChange = (key, e) => {
@@ -104,7 +104,7 @@ class PointConfigModel extends Component {
        if(value==='SWITCH'){
         form['unit'] = "";
        }
-    
+
       this.setState({form, alarmTypeData: []});
       queryDictsByCode(value === 'ANALOGUE' ? 'fire_equipment_analogue': 'fire_equipment_switch').then(
         data => {
@@ -156,7 +156,7 @@ class PointConfigModel extends Component {
             <Input className="monitor-point-config-form-input" value={form.name} placeholder="" onChange={e => this.onChange('name', e)} />
           </FormItem>
           <FormItem label={<span>数据类型</span>} field="type" {...formItemLayout}>
-            <Select prefixCls="" className="monitor-point-config-form-select" value={form.type} onChange={e => this.onSelectChange('type', e)}>
+            <Select prefixCls="" className="monitor-point-config-form-select"  value={form.type} onChange={e => this.onSelectChange('type', e)}>
               <Option value="SWITCH">开关量</Option>
               <Option value="ANALOGUE">模拟量</Option>
             </Select>

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

@@ -68,7 +68,8 @@ const fireEquipmentTableColumns = self => {
       width: '3%'
     },
     {
-      title: '建/构筑物',
+      // title: '建/构筑物',
+      title: '所属区域',
       dataIndex: 'riskSourceName',
       key: 'riskSourceName',
       width: '8%'
@@ -283,10 +284,15 @@ class FireEquipmentView extends Component {
 
   edit() {
     let { selectedRowKeys } = this.state;
+    debugger;
     if (selectedRowKeys === undefined || selectedRowKeys.length <= 0) {
       AmosAlert.warning('提示', '请先选择需要编辑的设备');
       return;
     }
+    if (selectedRowKeys.length > 1){
+      AmosAlert.warning('提示', '一次仅可编辑一条设备信息');
+      return;
+    }
 
     let fireEquipId = selectedRowKeys;
     if (selectedRowKeys.length > 1) {

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

@@ -185,6 +185,10 @@ class FireTruckDetailInfo extends Component {
     let { dataList, imgFiles } = this.state;
     form.validate((valid, dataValues) => {
       if (valid) {
+        if (imgFiles.length > 10) {
+          AmosAlert.error('错误', '车辆图片数量不能超过十张！');
+          return;
+        }
         this.setState({ isDisabled: true });
         let formData = new FormData();
         imgFiles.forEach(file => {
@@ -214,10 +218,10 @@ class FireTruckDetailInfo extends Component {
           .then(e => {
             if (e.status === 200){
               AmosAlert.success('提示', '保存成功');
+              this.goBack();
             } else {
               AmosAlert.error('错误', '保存失败');
             }
-            this.goBack();
           })
           .catch(e => {
             AmosAlert.error('错误', '保存失败');
@@ -280,6 +284,7 @@ class FireTruckDetailInfo extends Component {
             <div className="fire-truck-performance-title">车辆图片</div>
             <div>
               <Upload
+                className={`upload-${editable}`}
                 fileList={imgFiles}
                 listType="picture-card"
                 beforeUpload={this.beforeUpload}
@@ -287,7 +292,10 @@ class FireTruckDetailInfo extends Component {
                 onRemove={this.fileRemove}
                 multiple
               >
-                <Button transparent>选择图片</Button>
+                {
+                  editable &&
+                  <Button transparent>选择图片</Button>
+                }
               </Upload>
               <Modal className='preview-photo-modal' content={<img style={{ width: '100%' }} src={previewImage} />} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} />
             </div>

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

@@ -43,7 +43,7 @@ const fireDetectorTableColumns = self => {
       key: 'equip_status',
       width: '5%',
       render: (text) => {
-        
+
         if(text===0){
           return "正常";
         }
@@ -277,7 +277,7 @@ class FireDetectorView extends Component {
           deleteFireEquipmentAction(ids).then(
             data => {
               AmosAlert.success('提示', '删除成功');
-              if (Math.ceil(this.props.totalCount / this.pageConfig.pageSize) === this.pageConfig.current + 1  &&  this.props.dataList.length === selectedRowKeys.length && this.pageConfig.current > 0) {
+              if (Math.ceil(this.state.totalCount / this.pageConfig.pageSize) === this.pageConfig.current + 1  &&  this.state.dataList.length === selectedRowKeys.length && this.pageConfig.current > 0) {
                 this.setPageConfig( this.pageConfig );
               }
               this.setState({ selectedRows: [], selectedRowKeys: [] });

src/view/bizview/point/PointListView.js

@@ -175,6 +175,8 @@ class PointListView extends Component {
       //前端的current 即后端的pageNumber
       param.pageNumber = param.current;
     }
+    this.pageConfig.pageSize = param.pageSize;
+    this.pageConfig.current = param.current;
     Object.assign(searchParam, { ...param });
     fetchPointListAction(searchParam).then(data => {
       this.setState({

src/view/bizview/point/PointSearch.js

@@ -72,7 +72,7 @@ class PointSearch extends Component {
       selectStatus = value;
     }
 
-    Object.assign(searchParam,{ pageNumber: 0,pageSize: 10 });
+    Object.assign(searchParam,{ pageNumber: 0,pageSize: 10, current: 0 });
     this.setState({ searchParam,selectData: selectStatus });
     searchParam && this.props.setSearchParam(searchParam);
   }
@@ -93,8 +93,6 @@ class PointSearch extends Component {
 
   }
 
-
-
   queryUserByDept = deptId => {
 
     queryUserByDeptIdAction(deptId).then(data => {

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

@@ -156,6 +156,9 @@ class RiskModel extends Component {
       if (selectedKeys.length === 0) {
         selectedKeys.push(data[0].id + '');
         this.setState({ node: data[0], selectedKeys });
+      } else {
+        const node = data[0].children.filter(e => e.id === selectedKeys);
+        this.setState({ node });
       }
       if (riskSourceId){//3d屏互动
         this.setState({ treeData: data, autoExpandParent: true }, ()=>this.queryRiskSourceDetail(riskSourceId));
@@ -239,7 +242,7 @@ class RiskModel extends Component {
         rpni: data.rpni,
         node:data
       });
- 
+
     });
   }
 
@@ -641,7 +644,7 @@ class RiskModel extends Component {
     let header = '';
     if (modelFlag === 'risk'){
       if (toolBarFlag === '2') {
-        header = '编辑风险层级';  
+        header = '编辑风险层级';
       } else {
         header = '添加风险层级';
       }

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

@@ -66,7 +66,6 @@ class RiskSourceModel extends Component {
   };
 
   componentWillReceiveProps = (nextProps) => {
-    debugger
     let { form } = this.state;
     let { selectedRow } = nextProps;
     if (selectedRow && form.id !== selectedRow.id) {

src/view/bizview/task/taskSearch.js

@@ -136,7 +136,7 @@ class TaskSearch extends Component {
         </div>
         <div className="catalog-select">
           <RangePicker
-            format="YYYY-MM-DD" 
+            format="YYYY-MM-DD"
             value = {[startTime === void 0 ?'':moment(startTime, 'YYYY-MM-DD'), endTime === void 0 ?'':moment(endTime, 'YYYY-MM-DD')]}
             onChange={e => {
               this.onSelectedChange(e, 'time');