1、风险点添加风险等级修改

src/consts/urlConsts.js

@@ -214,7 +214,8 @@ export const FasSerUrl = {
   lookHtmlTextNavData: completePrefix(baseURI, 'file/lookHtmlTextNav'), //文档转换为html,带导航
   getTextPlanUrl: completePrefix(baseURI, 'api/visual/plan/text/{id}'),//获取文字预案信息
   uploadTextPlan: completePrefix(baseURI, 'file/plan/{appId}/texts'),
-  getTreeNodeTypeUrl: completePrefix(baseURI, 'api/riskModel/riskSource/getChildTypeByPid?riskSourceId={riskSourceId}')// 根据节点ID获取子节点可能的类型
+  getTreeNodeTypeUrl: completePrefix(baseURI, 'api/riskModel/riskSource/getChildTypeByPid?riskSourceId={riskSourceId}'),// 根据节点ID获取子节点可能的类型
+  getAllUserUrl: completePrefix(baseURI, 'api/common/user/list')//获取所有用户
 };
 
 

src/services/preControlService.js

@@ -178,3 +178,7 @@ export const getTextPlanAction = (id) => {
   return commonGet(url);
 };
 
+export const queryAllUserAction = () => {
+  return commonGet(FasSerUrl.getAllUserUrl);
+};
+

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

@@ -360,8 +360,13 @@
     min-width: 25rem;
   }
 
-  .risk_factor_input {
+  .fmea-model-select {
     min-width: 25rem;
+     
+    &.short-select{
+      width: 15rem;
+      min-width: 10rem;
+    }
   }
 }
 

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

 import React, { Component } from 'react';
 import { Form, Input, Select, Divider } from 'amos-framework';
-import { accidentTypeNoPageAction, queryRiskFactorNoPageAction, queryEvaModelAction, queryAllRiskLevelAction } from '../../../../../services/preControlService';
+import {
+  accidentTypeNoPageAction, 
+  queryRiskFactorNoPageAction, 
+  queryEvaModelAction, 
+  queryAllRiskLevelAction,
+  queryAllUserAction
+} from '../../../../../services/preControlService';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -32,6 +38,7 @@ class EvaluationModel extends Component {
       },
       riskFactorData: [],
       accidentTypeData: [],
+      userData: [],
       sData: [],
       dData: [],
       oData: [],
@@ -58,6 +65,7 @@ class EvaluationModel extends Component {
     this.getRiskFactorData();
     this.getEvaModel('');
     this.getRiskLevel();
+    this.getUser();
   };
 
 
@@ -99,6 +107,12 @@ class EvaluationModel extends Component {
     });
   }
 
+  getUser = () => {
+    queryAllUserAction().then(data => {
+      this.setState({ userData: data });
+    });
+  }
+
   confiremLevel = () => {
     let { riskLevelData, form } = this.state;
     let rpni = form.evaluationS * form.evaluationO * form.evaluationD;
@@ -134,7 +148,7 @@ class EvaluationModel extends Component {
   };
 
   render() {
-    const { form, rules, sData, dData, oData } = this.state;
+    const { form, rules, sData, dData, oData, userData } = this.state;
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
@@ -147,12 +161,37 @@ class EvaluationModel extends Component {
         className: 'colspan'
       }
     };
+    const formItemShortLayout = {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 10 },
+        className: 'colspanlab'
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 },
+        className: 'colspan'
+      }
+    };
+    const formItemShortLayout2 = {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 },
+        className: 'colspanlab'
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 },
+        className: 'colspan'
+      }
+    };
 
     return (
       <div className="fmea-model">
         <Form model={form} rules={rules} ref={component => this.form = component}>
           <span className="fmea-item-span">风险评价：</span>
           <Divider />
+          <FormItem label={<span>风险评价方法</span>} className="fmea-item-risk-factor" field="" {...formItemLayout} ><span style={{ lineHeight: '32px' }}>FMEA</span></FormItem>
           <FormItem label={<span>风险评价准则</span>} className="fmea-item-risk-factor" field="" {...formItemLayout} />
           <div className="fmea-model-evaluation">
             <FormItem label={<span>S准则</span>} field="evaluationSid" {...formItemLayout}>
@@ -203,9 +242,48 @@ class EvaluationModel extends Component {
             <div style={{ lineHeight: '32px' }}>{this.confiremLevel()}</div>
           </FormItem>
           <span className="fmea-item-span">责任人：</span>
-          <FormItem label={<span>责任人</span>} className="fmea-item-influence" field="identifyUser" {...formItemLayout}>
-            <Input className="risk_factor_input" value={form.influence} onChange={e => this.onSelectChange('influence', e.target.value)} />
-          </FormItem>
+          <div style={{ display: 'flex' }}>
+            <div style={{ width: '50%' }}>
+              <FormItem label={<span>公司责任人</span>} className="fmea-item-influence" field="companyLeader" {...formItemShortLayout}>
+                <Select
+                  className="fmea-model-select short-select"
+                  data={userData}
+                  renderOption={item => <Option value={parseInt(item.id)}>{item.name}</Option>}
+                  value={parseInt(form.companyLeader)}
+                  onChange={(e, item) => this.onSelectChange('companyLeader', e, item)}
+                />
+              </FormItem>
+              <FormItem label={<span>班组责任人</span>} className="fmea-item-influence" field="groupLeader" {...formItemShortLayout}>
+                <Select
+                  className="fmea-model-select short-select"
+                  data={userData}
+                  renderOption={item => <Option value={parseInt(item.id)}>{item.name}</Option>}
+                  value={parseInt(form.groupLeader)}
+                  onChange={(e, item) => this.onSelectChange('groupLeader', e, item)}
+                />
+              </FormItem>
+            </div>
+            <div style={{ width: '50%' }}>
+              <FormItem label={<span>部门责任人</span>} className="fmea-item-influence" field="departmentLeader" {...formItemShortLayout2}>
+                <Select
+                  className="fmea-model-select short-select"
+                  data={userData}
+                  renderOption={item => <Option value={parseInt(item.id)}>{item.name}</Option>}
+                  value={parseInt(form.departmentLeader)}
+                  onChange={(e, item) => this.onSelectChange('departmentLeader', e, item)}
+                />
+              </FormItem>
+              <FormItem label={<span>个人责任人</span>} className="fmea-item-influence" field="personLeader" {...formItemShortLayout2}>
+                <Select
+                  className="fmea-model-select short-select"
+                  data={userData}
+                  renderOption={item => <Option value={parseInt(item.id)}>{item.name}</Option>}
+                  value={parseInt(form.personLeader)}
+                  onChange={(e, item) => this.onSelectChange('personLeader', e, item)}
+                />
+              </FormItem>
+            </div>
+          </div>
           <Divider />
           <span className="fmea-item-span">管控措施：</span>
           <Divider />

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

@@ -31,7 +31,6 @@ class RiskSourceModel extends Component {
       rules: {
         name: [{ required: true, message: '风险名称不能为空' }],
         code: [{ required: true, message: '参考编号不能为空' }],
-        riskLevelId: [{ required: true, message: '风险等级不能为空' }],
         isRegion: [{ required: true, message: '是否区域不能为空' }],
         isIndoor: [{ required: true, message: '是否室内不能为空' }],
         position3d: [{ validator: this.validPositon3d }]
@@ -112,6 +111,15 @@ class RiskSourceModel extends Component {
     }
   }
 
+  getriskLevel = (riskLevelData, riskLevelId) => {
+    let { selectedRow } = this.props;
+    if (selectedRow && riskLevelData.length > 0) {
+      let target = riskLevelData.filter(data => data.id === riskLevelId);
+      return target[0] && target[0].name;
+    } else {
+      return '';
+    }
+  }
 
   render() {
     const { form, rules, riskLevelData } = this.state;
@@ -139,16 +147,11 @@ 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 &&
           <FormItem label={<span>风险等级</span>} field="riskLevelId" {...formItemLayout}>
-            <Select
-              className="risk-model-select"
-              data={riskLevelData}
-              value={form.riskLevelId}
-              renderOption={item => <Option value={item.id}>{item.name || item.level}</Option>}
-              onChange={e => this.onSelectChange('riskLevelId', e)}
-              disabled={disabled}
-            />
+            <span style={{ lineHeight: '32px' }}>{this.getriskLevel(riskLevelData, form.riskLevelId)}</span>
           </FormItem>
+          }
           { showIsRegionSelection && <FormItem label={<span>是否区域</span>} field="isRegion" {...formItemLayout}>
             <RadioGroup disabled={disabled} defaultValue={form.isRegion} onChange={e => this.onSelectChange('isRegion', e)}>
               <Radio value="FALSE">否</Radio>
@@ -184,7 +187,8 @@ class RiskSourceModel extends Component {
 
 RiskSourceModel.propTypes = {
   treeNodeType: PropTypes.number,
-  parentId: PropTypes.number
+  parentId: PropTypes.number,
+  selectedRow: PropTypes.array
 };
 
 export default RiskSourceModel;