修改bug

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

@@ -79,6 +79,9 @@ class FireResourceView extends Component {
       param.pageNumber = param.current;
     }
     Object.assign(fireTruckSearchParam, { ...param });
+    if (param[0] === undefined){
+      fireTruckSearchParam.shift();
+    }
     getFireTruckListAction(fireTruckSearchParam, param.pageNumber, param.pageSize).then(data => {
       this.setState({
         fireTruckDataList: data.content,
@@ -94,8 +97,10 @@ class FireResourceView extends Component {
       //前端的current 即后端的pageNumber
       param.pageNumber = param.current;
     }
-
     Object.assign(fireEquipmentSearchParam, { ...param });
+    if (param.name === undefined){
+      delete fireEquipmentSearchParam.name;
+    }
     getFireEquipmentListAction(fireEquipmentSearchParam, param.pageNumber, param.pageSize).then(data => {
       let monitorData = data.content.filter(item => item.equipClassify === 2);
       let filterData = data.content.filter(item => !new Set(monitorData).has(item));

src/view/bizview/point/ExecutionSituation.js

@@ -3,7 +3,7 @@ import AmosEcharts from 'amos-viz/lib/echarts';
 import AmosGridTable from './../common/tableComponent/table/AmosGridTable';
 import { fetchXJChkExecuteAction } from './../../../services/checkInfoService';
 import moment from 'moment';
-const finishStatusEnum = {'0':'进行中','1':'未开始','2':'已结束','3':'已超时'};
+const finishStatusEnum = { '0': '未开始', '1': '进行中', '2': '已结束','3': '已超时' };
 const xjColumns = (actions) => {
   return [
     {
@@ -85,7 +85,7 @@ class ExecutionSituation extends Component{
 
     componentWillUnmount() {
     }
-  
+
    getStatistiscData = param => {
     let { searchParam } = this.state;
     // searchParam.checkDate ='20181123';
@@ -128,21 +128,21 @@ class ExecutionSituation extends Component{
                 setPageConfig={this.setPageConfig}
                 defaultPageConfig={defaultPageConfig}
                 getPanelHeight={this.getPanelHeight}
-                /> 
-            </div>   
+                />
+            </div>
         </div>
         );
     }
 }
 
 ExecutionSituation.propTypes = {
-   
+
   };
-  
+
   ExecutionSituation.defaultProps = {
     data: {},
     legend: [],
     chartStyle: { width: '100%',height: '20rem' }
   };
-  
-  export default ExecutionSituation;
\ No newline at end of file
+
+  export default ExecutionSituation;

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

@@ -87,7 +87,7 @@ class RiskSourceModel extends Component {
     let { form, isEdit } = this.state;
     form[key] = value;
     if (key === 'isRegion') {
-      isEdit = !isEdit;
+      //isEdit = !isEdit;
     }
     this.setState({ form, isEdit });
   }
@@ -170,7 +170,7 @@ class RiskSourceModel extends Component {
           </FormItem>
           }
           { showIsRegionSelection && <FormItem label={<span>是否区域</span>} field="isRegion" {...formItemLayout}>
-            <RadioGroup disabled={disabled} value={form.isRegion} defaultValue={form.isRegion} onChange={e => this.onSelectChange('isRegion', e)}>
+            <RadioGroup disabled={disabled || isEdit} value={form.isRegion} defaultValue={form.isRegion} onChange={e => this.onSelectChange('isRegion', e)}>
               <Radio value="FALSE">否</Radio>
               <Radio value="TRUE">是</Radio>
             </RadioGroup>

src/view/bizview/xjcheck/XJCheckSearch.js

@@ -6,6 +6,7 @@ import { browserHistory } from 'amos-react-router/lib';
 import { checkStatusEnum } from './../xjcheck/common/CheckEnum';
 import { enums2array } from './../xjcheck/common/CheckLang';
 import { fetchXJUserInfoAction } from './../../../services/checkInfoService';
+import { queryAllUserAction } from './../../../services/preControlService';
 import BizIcon from './../../common/icon/BizIcon';
 
 const Option = Select.Option;
@@ -68,16 +69,25 @@ class XJCheckSearch extends Component {
     }
 
     if (pd !== undefined) {
-
-      fetchXJUserInfoAction(pd).then(data => {
+      queryAllUserAction().then(data => {
         let xjuserPlist = [];
         data
         ? data.map(e => {
-          xjuserPlist.push(<Option value={`${e.UserID}`}>{e.realName}</Option>);
+          xjuserPlist.push(<Option value={`${e.userId}`}>{e.realName}</Option>);
         })
         : [];
         this.setState({ checkUserOptions: xjuserPlist });
       });
+
+      // fetchXJUserInfoAction(pd).then(data => {
+      //   let xjuserPlist = [];
+      //   data
+      //   ? data.map(e => {
+      //     xjuserPlist.push(<Option value={`${e.UserID}`}>{e.realName}</Option>);
+      //   })
+      //   : [];
+      //   this.setState({ checkUserOptions: xjuserPlist });
+      // });
     }
   };
 

src/view/region/index.js

@@ -211,7 +211,7 @@ class RegionSelect extends Component {
       }
     };
     return (
-      <div key={userId} className="region-item">
+      <div key={userId} className="region-item" style={{ height: '340px' }}>
         <Form className="region-form">
           <FormItem {...formItemLayout}>
             <Select