修改样式及fmea辨识人、辨识方法修改

src/styles/view/biz/riskModel/riskModel.scss

@@ -52,6 +52,12 @@
         height: calc(100% - 36px);
         display: inline-block;
         overflow-x: scroll;
+
+        .amos-tree {
+          .amos-tree-node-content-wrapper {
+            height: 32px;
+          }
+        }
       }
     }
     .risk-model-eva {
@@ -153,6 +159,13 @@
         }
       }
     }
+
+    .quyu-info-tab {
+      .ant-tabs-content {
+        left: -50px;
+        padding-top: 50px;
+      }
+    }
   }
 
   .risk-model-table {

src/view/bizview/preControl/riskModel/common/ToolBar.js

@@ -32,7 +32,7 @@ class ToolBar extends Component {
       <div  className='risk-lever-toolbar'>
         <div className='risk-lever-button' >
           <Button title='添加' icon={<BizIcon icon="tianjia" />} transparent onClick={e => this.onClick(e,'1')} />
-          { activeKey === '2' && <Button title='修改' icon={<BizIcon icon="xiugai" />} transparent onClick={e => this.onClick(e,'2')} />}
+          <Button title='修改' icon={<BizIcon icon="xiugai" />} transparent onClick={e => this.onClick(e,'2')} />
           { activeKey === '1' && <Button title='评价' icon={<BizIcon icon="buzhou-queren" />} transparent onClick={e => this.onClick(e,'4')} />}
           <Button title='删除' icon={<BizIcon icon="shanchu" />} transparent onClick={e => this.onClick(e,'3')} />
         </div>

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

@@ -70,7 +70,8 @@ class RiskModel extends Component {
       selectedKeys: [],
       rightClickNodeTreeItem: null,
       treeNodeType: 3, //3:无孩子节点，2:子节点有风险节点，1:子节点有风险区域
-      panes
+      panes,
+      isRegion: 'TRUE'
     };
   }
 
@@ -153,9 +154,12 @@ class RiskModel extends Component {
   }
 
   queryRiskSourceTree =(riskSourceId)=>{
-    let { editRiskSource } = this.state;
+    let { editRiskSource, selectedKeys } = this.state;
     queryRiskSourceTreeAction().then(data =>{
-      // let obj = this.loopTreeNodes(data[0]);
+      if (selectedKeys.length === 0) {
+        selectedKeys.push(data[0].id + '');
+        this.setState({ node: data[0], selectedKeys });
+      }
       if (riskSourceId){//3d屏互动
         this.setState({ treeData: data, autoExpandParent: true }, ()=>this.queryRiskSourceDetail(riskSourceId));
       } else {//业务屏刷新
@@ -336,7 +340,7 @@ class RiskModel extends Component {
       });
     } else if (modelFlag === 'fmea') {
       if (riskSourceId) {
-        let { node } = this.state;
+        let { node, isEdit } = this.state;
         Object.assign(form, { 'riskSourceId': riskSourceId });
         this.model.form.validate((valid, dataValues) => {
           if (valid) {
@@ -351,6 +355,9 @@ class RiskModel extends Component {
                 fmeaObj.riskFactorsId = id;
                 fmeaObjList.push(fmeaObj);
               });
+              if (dataValues.isEdit) { //fmea编辑时
+                fmeaObjList.push(form);
+              }
             }
             this.femaEdit(fmeaObjList);
             this.setState({ modal: false }, () => this.refeshRiskSourceDetail(node.id));
@@ -566,7 +573,10 @@ class RiskModel extends Component {
       if (toolBarFlag){
         if (toolBarFlag === '1'){//新增
           return <RiskFactorModel ref={component => this.model = component} /> ;
-        } else if (this.fmeaRef) {
+        } else if (toolBarFlag === '2') {//编辑
+          const { selectedRows } = this.fmeaRef.state;
+          return <RiskFactorModel {...selectedRows[0]} isEdit ref={component => this.model = component} /> ;
+        } else if (this.fmeaRef) {//评价
           const { selectedRows } = this.fmeaRef.state;
           return <EvaluationModel {...selectedRows[0]} ref={component =>this.model = component} />;
         }
@@ -607,6 +617,8 @@ class RiskModel extends Component {
     } else if (modelFlag === 'fmea'){
       if (toolBarFlag === '4') {
         header = '风险评价';
+      } else if (toolBarFlag === '2') {
+        header = '修改危险因素';
       } else {
         header = '添加危险因素';
       }
@@ -736,15 +748,6 @@ class RiskModel extends Component {
     });
   }
 
-  loopTreeNodes = (data) => {
-    if (data) {
-      if (data.children && data.children.length > 0) {
-        return this.loopTreeNodes(data.children[0]);
-      }
-    }
-    return data;
-  }
-
   onClick = (e,key)=>{
 
   }
@@ -877,9 +880,12 @@ class RiskModel extends Component {
         </div>
         <div className='risk-model-tab'>
           { isRegion === 'TRUE' ?
-            <div style={{ paddingTop: '50px' }} >
-              <RiskSourceModel selectedRow={this.state.node} disabled={true} />
-            </div>
+            <Tabs
+              className="quyu-info-tab"
+              type="card"
+            >
+              <TabPane tab={<span>区域信息</span>}><RiskSourceModel disabled style={{ paddingTop: '50px' }} selectedRow={this.state.node} /></TabPane>
+            </Tabs>
             :
             <Tabs
               activeKey={activeKey}

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

 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Form, Input, Select, Divider, MultiSelect } from 'amos-framework';
 import { accidentTypeNoPageAction, queryRiskFactorNoPageAction, queryEvaModelAction,
   queryAllUserAction } from '../../../../../services/preControlService';
@@ -37,6 +38,12 @@ class RiskFactorModel extends Component {
   componentDidMount = () => {
     this.getRiskFactorData();
     this.getUser();
+    const { form } = this.state;
+    const { isEdit } = this.props;
+    if (isEdit) {
+      form.isEdit = isEdit;
+      this.setState({ form });
+    }
   };
 
 
@@ -76,6 +83,7 @@ class RiskFactorModel extends Component {
 
   render() {
     const { form, rules, riskFactorData, userData } = this.state;
+    const { isEdit } = this.props;
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
@@ -104,26 +112,34 @@ class RiskFactorModel extends Component {
             />
           </FormItem>
           <FormItem label={<span>辨识方法</span>} className="fmea-item-influence" field="identifyMethod" {...formItemLayout}>
-            <Input className="risk_factor_input" value={form.identifyMethod} onChange={e => this.onSelectChange('identifyMethod', e.target.value)} />
+            <Input className="risk_factor_input" style={{ width: '25rem' }} value={form.identifyMethod} onChange={e => this.onSelectChange('identifyMethod', e.target.value)} />
           </FormItem>
-          <span className="fmea-item-span">危险有害因素：</span>
-          <Divider />
-          <FormItem label={<span>危险因素</span>} className="fmea-item-risk-factor" field="riskFactorsId" {...formItemLayout}>
-            <div className="risk-factor-select" style={{ height: '200px' }} >
-              <MultiSelect
-                className="fmea-model-select"
-                data={riskFactorData}
-                renderOption={item => <multiSelectOption value={parseInt(item.id)}>{item.name}</multiSelectOption>}
-                values={form.riskFactorIds}
-                onChange={(e)=>this.onSelectedChange(e, 'riskFactorIds')}
-                placeholder='危险因素'
-              />
+          { !isEdit &&
+            <div>
+              <span className="fmea-item-span">危险有害因素：</span>
+              <Divider />
+              <FormItem label={<span>危险因素</span>} className="fmea-item-risk-factor" field="riskFactorsId" {...formItemLayout}>
+                <div className="risk-factor-select" style={{ height: '200px' }} >
+                  <MultiSelect
+                    className="fmea-model-select"
+                    data={riskFactorData}
+                    renderOption={item => <multiSelectOption value={parseInt(item.id)}>{item.name}</multiSelectOption>}
+                    values={form.riskFactorIds}
+                    onChange={(e)=>this.onSelectedChange(e, 'riskFactorIds')}
+                    placeholder='危险因素'
+                  />
+                </div>
+              </FormItem>
             </div>
-          </FormItem>
+          }
         </Form>
       </div>
     );
   }
 }
 
+RiskFactorModel.propTypes = {
+  isEdit: PropTypes.bool
+};
+
 export default RiskFactorModel;

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

@@ -153,7 +153,7 @@ class RiskSourceModel extends Component {
           <FormItem label={<span>参考编号</span>} field="code" {...formItemLayout}>
             <Input disabled={disabled} className="risk-model-input" required value={form.code} onChange={e => this.onSelectChange('code', e.target.value)} />
           </FormItem>
-          { form.riskLevelId &&
+          { (form.riskLevelId !== 0) &&
           <FormItem label={<span>风险等级</span>} field="riskLevelId" {...formItemLayout}>
             <span style={{ lineHeight: '32px' }}>{this.getriskLevel(riskLevelData, form.riskLevelId)}</span>
           </FormItem>