风险模型

src/consts/urlConsts.js

@@ -175,6 +175,7 @@ export const FasSerUrl = {
   fmeaPageListUrl: completePrefix(baseURI, 'api/riskModel/fmea/list?pageNumber={page}&pageSize={size}'),  //fmea分页查询
   assoPointListUrl: completePrefix(baseURI, 'api/risksource/getBindPoints?fmeaId={fmeaId}&pageNumber={page}&pageSize={size}'),
   assoEquipListUrl: completePrefix(baseURI, 'api/risksource/{fmeaId}/fireequiment/relations?pageNumber={page}&pageSize={size}'),
+  getAssoEquipsUrl: completePrefix(baseURI, 'api/equipment/getAssoEquips?fmeaId={fmeaId}&pageNumber={page}&pageSize={size}'),// 查询指定风险点绑定关系
   riskFactorNoPageUrl: completePrefix(baseURI, 'api/riskFactor/all-list'),
   deptByOrgCodeUrl: completePrefix(baseURI, 'api/common/deptment/list'),//部门查询,
   pointListUrl: completePrefix(baseURI, 'api/common/pointList?pageNumber={page}&pageSize={size}'),//巡检点查询
@@ -182,8 +183,13 @@ export const FasSerUrl = {
   bindPointUrl: completePrefix(baseURI, 'api/risksource/bindFmea/pointInputitem'),//巡检点关联
   riskSourceRpnCountUrl: completePrefix(baseURI,'api/risksource/rpn/list'),  // 查询风险点RPN统计
   bindEquipListUrl: completePrefix(baseURI, 'api/risksource/fireequiment/relation/all?equimentId={equimentId}&fname={fname}&pageNumber={page}&pageSize={size}'),//配套设施查询（已绑定及未绑定）
+  getFireEquimentsUrl: completePrefix(baseURI, 'api/equipment/fireequiment?equipmentId={equipmentId}&fname={fname}'),// 新-配套设施查询（已绑定及未绑定）
   getBindEquipIndexUrl: completePrefix(baseURI, 'api/risksource/listEquipmentPointById?fmeaId={fmeaId}&importantEquipId={importantEquipId}&equimentId={equimentId}&equipmentPointName={equipmentPointName}'),//获取配套设备指标项
-  bindEquipIndexUrl: completePrefix(baseURI, 'api/risksource/bingFmea/equimentPoint'),
+
+  getBindEquipmentUrl: completePrefix(baseURI, 'api/equipment/getBindEquipment?fmeaId={fmeaId}&importantEquipId={importantEquipId}&equimentId={equimentId}&equipmentPointName={equipmentPointName}'),// 新-获取配套设备指标项
+
+  bindEquipIndexUrl: completePrefix(baseURI, 'api/risksource/bingFmea/equimentPoint'),// 绑定消防设备指标
+  upDateEquimentPointUrl: completePrefix(baseURI, 'api/equipment/upDateEquimentPoint'),// 绑定消防设备指标
   deleteBindEquipUrl: completePrefix(baseURI, 'api/risksource/fireequiment/relation/{ids}'),
   removeByRSIdAndPIdUrl: completePrefix(baseURI, 'api/risksource/removeByRSIdAndPId'),//删除绑定的设备
   riskSourceMatrixUrl: completePrefix(baseURI,'api/risksource/matrix'),  // 查询风险点发生率/严重度矩阵

src/services/preControlService.js

@@ -95,6 +95,11 @@ export const queryAssoEquipListAction = (fmeaId, page, size) => {
   return commonGet(formatUrl(FasSerUrl.assoEquipListUrl, { fmeaId, page, size }));
 };
 
+export const getAssoEquipsAction = (fmeaId, page, size) => {
+  return commonGet(formatUrl(FasSerUrl.getAssoEquipsUrl, { fmeaId, page, size }));
+};
+
+
 export const queryDeptByOrgCodeAction = () => {
   return commonGet(formatUrl(FasSerUrl.deptByOrgCodeUrl, {}));
 };
@@ -115,15 +120,38 @@ export const bindEquipListAction = (riskSourceId , equimentId, page, size,fname)
   return commonGet(formatUrl(FasSerUrl.bindEquipListUrl, { riskSourceId,equimentId,fname,page,size }));
 };
 
+
+export const getFireEquimentsAction = (equipmentId,fname) => {
+  fname = fname === undefined ? null : fname ;
+  return commonGet(formatUrl(FasSerUrl.getFireEquimentsUrl, { equipmentId,fname }));
+};
+
+
+
 export const getBindEquipIndexAction = (fmeaId, importantEquipId, equimentId, equipmentPointName) => {
   let url = formatUrl(FasSerUrl.getBindEquipIndexUrl, { fmeaId, importantEquipId, equimentId, equipmentPointName });
   return commonGet(url);
 };
 
+export const getBindEquipmentAction = (fmeaId, importantEquipId, equimentId, equipmentPointName) => {
+  fmeaId = fmeaId === undefined ? null : fmeaId ;
+  importantEquipId = importantEquipId === undefined ? null : importantEquipId ;
+  equimentId = equimentId === undefined ? null : equimentId ;
+  equipmentPointName = equipmentPointName === undefined ? null : equipmentPointName ;
+  let url = formatUrl(FasSerUrl.getBindEquipmentUrl, { fmeaId, importantEquipId, equimentId, equipmentPointName });
+  return commonGet(url);
+};
+
+
 export const bindEquipIndexAction = (body) => {
   return commonPost(FasSerUrl.bindEquipIndexUrl, body);
 };
 
+export const upDateEquimentPointAction = (body) => {
+  return commonPost(FasSerUrl. upDateEquimentPointUrl, body);
+};
+
+
 export const deleteBindEquipAction = (ids) => {
   return commonDelete(formatUrl(FasSerUrl.deleteBindEquipUrl, { ids }));
 };

src/view/bizview/equipmentLedger/Equipment/EquipmentFireEquipmentAdd.js

@@ -253,7 +253,7 @@ class EquipmentFireEquipmentAdd extends Component {
               onChange={(value, b)=> this.onSelectChange(value)}
             />
             {/* <span>名称：</span> */}
-            <Input value={name} onChange={e => this.onChange('name', e.target.value)} placeholder="按编号搜索" />
+            <Input value={name} onChange={e => this.onChange('name', e.target.value)} placeholder="按名称搜索" />
           </div>
         </div>
         <AmosGridTable

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

@@ -34,7 +34,11 @@ const getColumns = () => {
       className: 'uant-table-thead',
       render: (text, record) => {
         //根据换行符分隔
-        let arr = text.split('\n');
+        // let arr = text.split('\n');
+        let arr;
+        if ( text ) {
+          arr = text.split(',');
+        }
         let p = document.createElement('span');
 
         if (arr && arr != null){

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

@@ -11,8 +11,10 @@ import {
   fmeaDeleteAction,
   queryAssoPointListAction,
   queryAssoEquipListAction,
+  getAssoEquipsAction,
   bindPointsAction,
   bindEquipIndexAction ,
+  upDateEquimentPointAction,
   deleteBindEquipAction,
   deleteAssoPointAction,
   queryRiskSourceDetailAction,
@@ -215,7 +217,10 @@ class RiskModel extends Component {
   }
 
   queryAssoEquipListData = (fmeaId, pageNumber, pageSize) =>{
-    queryAssoEquipListAction(fmeaId, pageNumber, pageSize).then(data =>{
+    // queryAssoEquipListAction(fmeaId, pageNumber, pageSize).then(data =>{
+    //   this.setState({ equipData: data.content, equipDataTotalNum: data.totalElements });
+    // });
+    getAssoEquipsAction(fmeaId, pageNumber, pageSize).then(data =>{
       this.setState({ equipData: data.content, equipDataTotalNum: data.totalElements });
     });
   }
@@ -453,7 +458,8 @@ class RiskModel extends Component {
     param.importantEquipmentId = importEquipId;
     param.equipmentId = equipmentId;
     param.equipmentPointIds = equipmentPointIds;
-    bindEquipIndexAction(param).then(
+    upDateEquimentPointAction(param).then(
+    // bindEquipIndexAction(param).then(
       data => {
         AmosAlert.success('提示', '操作成功');
         this.setState({ modal: false });

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

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { bindEquipListAction, getBindEquipIndexAction } from '../../../../../services/preControlService';
+import { bindEquipListAction, getBindEquipIndexAction,getFireEquimentsAction,getBindEquipmentAction } from '../../../../../services/preControlService';
 import FireEquipTable from './FireEquipTable';
 import EquipTable from './EquipTable';
 import FireEquipIndexTable from './FireEquipIndexTable';
@@ -68,7 +68,9 @@ class EquipModel extends Component {
       }
     });
     this.setState({ importEquipId: equipmentId });
-    equipmentId && bindEquipListAction(riskSourceId, equipmentId,0,-1,fname).then(data=>{//查询巡检点项
+
+    // equipmentId && bindEquipListAction(riskSourceId, equipmentId,0,-1,fname).then(data=>{      //查询巡检点项
+    equipmentId && getFireEquimentsAction(equipmentId,fname).then(data =>{
       let { selectData } = this.state;
       let content = data.content;//内容
       //过滤已经添加的配套设备
@@ -107,7 +109,8 @@ class EquipModel extends Component {
 
   queryBindEquipIndex = (fmeaId, equipmentId, equipmentPointName) => {
     let { importEquipId } = this.state;
-    fmeaId && equipmentId && getBindEquipIndexAction(fmeaId, importEquipId, equipmentId, equipmentPointName).then(data => {
+    fmeaId && equipmentId && getBindEquipmentAction(fmeaId, importEquipId, equipmentId, equipmentPointName).then(data => {
+    // fmeaId && equipmentId && getBindEquipIndexAction(fmeaId, importEquipId, equipmentId, equipmentPointName).then(data => {
       console.log(data);
       let { selectData } = this.state;
       if (!equipmentPointName){

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

@@ -7,16 +7,9 @@ import BizIcon from './../../../../common/icon/BizIcon';
 const getAssoEquipColumns = () => {
   return [
     {
-      title: '编号',
-      dataIndex: 'code',
-      key: 'code',
-      width: '30%'
-    },
-    {
       title: '指标项',
       dataIndex: 'name',
-      key: 'name',
-      width: '70%'
+      key: 'name'
     }
   ];
 };
@@ -128,7 +121,7 @@ class FireEquipIndexTable extends Component {
     this.props.bindEquipIndexCallback(importantEquipId, equipmentId);
   }
 
-  render() {   
+  render() {
     let { pagination, isChecked, fname, selectedRowKeys } = this.state;
     let { dataList, selects } = this.props;
     selectedRowKeys = [...selects];