修改bug

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireEquipment/MonitorPointConfig.js

@@ -103,10 +103,9 @@ class MonitorPointConfig extends Component {
         ],
         name: [
           { required: true, message: '请输入名称' }
-        ],
-        type: [
-          { required: true, message: '请选择类型' }
-        ],
+        ],      
+
+        type: [{ required: true, message: '请选择类型' }],
         unit: [
           { required: true, message: '请输入单位' }
           // { pattern: new RegExp(/^(-?\d+)(\.\d+)?$/), message: '请输入正确参数' }
@@ -116,7 +115,7 @@ class MonitorPointConfig extends Component {
       selectedRowKeys: [],
       selectedRows: [],
       searchParam: [],
-      fireEquipmentId: -1,
+      fireEquipmentId: null,
       monitorPointId: -1,
       totals: 0 //所有数据总和
     };
@@ -436,6 +435,8 @@ class MonitorPointConfig extends Component {
     });
   }
 
+
+
   render() {
     let { dataList, totalCount, form, rules, selectedRowKeys, alarmTypeData, show } = this.state;
     const pagination = { pageSizeOptions: ['10'], defaultPageSize: 10 };//分页：10条每页，默认为10

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireEquipment/PointConfigModel.js

@@ -27,7 +27,8 @@ class PointConfigModel extends Component {
       fireEquipmentData: [],
       rules: {
         code: [{ required: true, message: '编码不能为空' }],
-        name: [{ required: true, message: '名称不能为空' }]
+        name: [{ required: true, message: '名称不能为空' }],
+        type: [{ required: true, message: '请选择类型' }],
       }
     };
   }
@@ -135,7 +136,7 @@ class PointConfigModel extends Component {
         className: 'colspan'
       }
     };
-
+debugger
     return (
       <div className='monitor-point-config-form'>
         <Form model={form} rules={rules} ref={component => this.form = component}>

src/view/bizview/common/tableComponent/table/AmosGridTable.js

@@ -125,7 +125,10 @@ class AmosGridTable extends Component {
    * 获取表格数据（刷新）
    */
   reload = () => {
+    debugger
     let { current,pageSize,filter,otherFilter } = this.state;
+
+    
     this.props.getTableDataAction({ current: current - 1, pageSize },JSON.stringify(filter),otherFilter);
     this.getHeightOffset();
   }

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

@@ -93,6 +93,9 @@ class MonitorPointConfig extends Component {
       pageSize: 10
     },
     this.state = {
+      form:{
+        fireEquipmentId: null,
+      },
       showAdd: false, //是否显示添加页面
       showEdit: false, //是否显示编辑页面
       shwoConfig: false,
@@ -112,13 +115,15 @@ class MonitorPointConfig extends Component {
         unit: [
           { required: true, message: '请输入单位' }
           // { pattern: new RegExp(/^(-?\d+)(\.\d+)?$/), message: '请输入正确参数' }
-        ]
+        ],
+        
+        
       },
       data: [],
       selectedRowKeys: [],
       selectedRows: [],
       searchParam: [],
-      fireEquipmentId: -1,
+      fireEquipmentId: null,
       monitorPointId: -1,
       totals: 0 //所有数据总和
     };
@@ -166,6 +171,7 @@ class MonitorPointConfig extends Component {
   }
 
   getMonitorPointListData = (param) => {
+    debugger
     if (!param) {
       return;
     }
@@ -198,10 +204,10 @@ class MonitorPointConfig extends Component {
   }
 
   getContext = () => {
-    let { showAdd, monitorPointId, operateFlag, recordId, showDetail, shwoConfig } = this.state;
+    let { showAdd, monitorPointId, operateFlag, recordId, showDetail,fireEquipmentId, shwoConfig } = this.state;
 
     if (shwoConfig) {
-      return (<PointConfig setParam={this.setParam} ref={component => this.model = component}></PointConfig>);
+      return (<PointConfig setParam={this.setParam} fireEquipmentId={fireEquipmentId} ref={component => this.model = component}></PointConfig>);
     }
     if (showAdd) {
       operateFlag = 0;
@@ -249,6 +255,7 @@ class MonitorPointConfig extends Component {
   };
 
   getSelectedRows = (selectedRows, selectedRowKeys) => {
+    
     this.setState({ selectedRows, selectedRowKeys });
   };
 
@@ -279,7 +286,7 @@ 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(
@@ -365,7 +372,13 @@ class MonitorPointConfig extends Component {
   }
 
   edit() {
-    let { selectedRowKeys } = this.state;
+    let { selectedRowKeys ,selectedRows,form} = this.state;
+
+
+    if(selectedRows.length>1){
+      AmosAlert.warning('提示', '只能选择一条!');
+      return;
+    }
     if (selectedRowKeys === undefined || selectedRowKeys.length <= 0) {
       AmosAlert.warning('提示', '请先选择需要编辑的监测点');
       return;
@@ -395,6 +408,7 @@ class MonitorPointConfig extends Component {
             data => {
               AmosAlert.success('提示', '删除成功');
               this.reloadPage();
+             
             },
             err => {
               AmosAlert.error('错误', err);
@@ -429,18 +443,37 @@ class MonitorPointConfig extends Component {
   }
 
   configEquip = () => {
+    debugger
+    let { selectedRowKeys ,selectedRows,form} = this.state;
+
+
+    if(selectedRows.length>1){
+      AmosAlert.warning('提示', '只能选择一条!');
+      return;
+    }
+
+    if (selectedRowKeys === undefined || selectedRowKeys.length <= 0) {
+      AmosAlert.warning('提示', '请先选择监测点');
+      return;
+    }
+    let monitorPointId = selectedRowKeys[0];
+    let fireEquipmentIdh=selectedRows[0].fireEquipmentId;
+    form['fireEquipmentId']=fireEquipmentIdh;
+    
     this.setState({
       show: true,
       showAdd: false,
       showEdit: false,
       shwoConfig: true,
-      monitorPointId: undefined
+      monitorPointId: undefined,
+      fireEquipmentId:fireEquipmentIdh,
+      form
     });
   }
 
   render() {
     let { dataList, totalCount, form, rules, selectedRowKeys, alarmTypeData, show, searchParam } = this.state;
-    const pagination = { pageSizeOptions: ['10'], defaultPageSize: 10 };//分页：10条每页，默认为10
+    const pagination = { pageSizeOptions: ['10','20','30','40'], defaultPageSize: 10 };//分页：10条每页，默认为10
     const formItemLayout = {
       labelCol: {
         xs: { span: 26 },

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

@@ -19,19 +19,29 @@ class PointConfig extends Component {
     this.state = {
       searchParam: [],
       form: {
+        fireEquipmentId:null
       },
       _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 = () => {
@@ -43,6 +53,9 @@ class PointConfig extends Component {
   onSelectChange = (key, value) => {
     let { form } = this.state;
     form[key] = value;
+    this.setState({
+      form  
+    });
     this.props.setParam(form);
   };
 
@@ -69,7 +82,7 @@ class PointConfig 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"
             />

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

@@ -27,7 +27,9 @@ class PointConfigModel extends Component {
       fireEquipmentData: [],
       rules: {
         code: [{ required: true, message: '编码不能为空' }],
-        name: [{ required: true, message: '名称不能为空' }]
+        name: [{ required: true, message: '名称不能为空' }],
+        type: [{ required: true, message: '请选择类型' }],
+
       }
     };
   }
@@ -64,11 +66,14 @@ class PointConfigModel extends Component {
         _this.setState({
           form: data
         });
+        const { form } = _this.state; 
+        this.props.setParam(form)
       },
       err => {
         AmosAlert.error('错误', err);
       }
     );
+   
   }
 
   onChange = (key, e) => {
@@ -91,10 +96,15 @@ class PointConfigModel extends Component {
   }
 
   onSelectChange = (key, value) => {
+    debugger
     let { form } = this.state;
     form[key] = value;
     let _this = this;
     if (key === 'type') {
+       if(value==='SWITCH'){
+        form['unit'] = "";
+       }
+    
       this.setState({form, alarmTypeData: []});
       queryDictsByCode(value === 'ANALOGUE' ? 'fire_equipment_analogue': 'fire_equipment_switch').then(
         data => {