风险详情修改

src/consts/urlConsts.js

@@ -138,7 +138,8 @@ export const FscSerUrl = {
   impEquInterfaceUrl: completePrefix(baseURI, 'bank/equipment/netwoerkInterface?id={id}'),//查询网络接口
   dynamicRingDataUrl: completePrefix(baseURI, 'bank/dynamicRingData/{id}'),//查询动环接口
   pointItemPatroltaUrl: completePrefix(baseURI, 'bank/equipment/pointItemPatrol?factorId={factorId}'),
-  pointItemDevicetaUrl: completePrefix(baseURI, 'bank/equipment/getPointItemDatas?factorId={factorId}'),
+  pointItemDevicetaUrl: completePrefix(baseURI, 'bank/equipment/pointItemEquipment?factorId={factorId}'),
+  pointItemAllUrl: completePrefix(baseURI, 'bank/equipment/getPointItemDatas?factorId={factorId}'),
 
   getxuncountActionUrl: completePrefix(baseURI, 'bank/alarm/mobile/getxuncount'),
   rightTopChartDataUrl: completePrefix(baseURI, 'bank/inspection/rightTopChart?companyId={companyId}'),

src/services/3dService.js

@@ -301,12 +301,18 @@ export const getporintAction = (pointid ) => {
 };
 
 
-export const queryPatrolPointDatas = (id) => {
+export const queryPatrolPointDatas = (factorId) => {
   // return commonGet(formatUrl(DeviceURI.dynamicRingDataUrl, { id }));
-  return commonGet(formatUrl(FscSerUrl.pointItemPatroltaUrl, { id }));
+  return commonGet(formatUrl(FscSerUrl.pointItemPatroltaUrl, { factorId }));
 };
 
-export const queryDevicePointDatas = (id) => {
+export const queryDevicePointDatas = (factorId) => {
   // return commonGet(formatUrl(DeviceURI.dynamicRingDataUrl, { id }));
-  return commonGet(formatUrl(FscSerUrl.pointItemDevicetaUrl, { id }));
-};
+  return commonGet(formatUrl(FscSerUrl.pointItemDevicetaUrl, { factorId }));
+};
\ No newline at end of file
+
+
+export const queryPointItemAllDatas = (factorId) => {
+  // return commonGet(formatUrl(DeviceURI.dynamicRingDataUrl, { id }));
+  return commonGet(formatUrl(FscSerUrl.pointItemAllUrl, { factorId }));
+};

src/view/bank/3dview/points/dialogModel/RiskSourceDetailModal.js

@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import { CONSTS } from 'CONSTS/storageConsts';
 import AmosGridTable from '../../../../bizview/common/tableComponent/table/AmosGridTable';
 import { riskSoureDetail3dAction } from 'SERVICES/bizService';
+import {queryPointItemAllDatas } from '../../../../../services/3dService';
+
 
 const checkListColumns = (self) => {
   return [
@@ -23,7 +25,7 @@ const checkListColumns = (self) => {
 
         if (arr && arr !== null) {
           arr.map((e, index) => {
-            if(0==index){
+            if (0 == index) {
               let grandChildItem = document.createElement('p');
               grandChildItem.innerText = "公司:";
               let font = document.createElement('font');
@@ -32,7 +34,7 @@ const checkListColumns = (self) => {
               p.append(grandChildItem);
             }
 
-            if(1==index){
+            if (1 == index) {
               let grandChildItem = document.createElement('p');
               grandChildItem.innerText = "部门:";
               let font = document.createElement('font');
@@ -41,7 +43,7 @@ const checkListColumns = (self) => {
               p.append(grandChildItem);
             }
 
-            if(2==index){
+            if (2 == index) {
               let grandChildItem = document.createElement('p');
               grandChildItem.innerText = "班组:";
               let font = document.createElement('font');
@@ -50,7 +52,7 @@ const checkListColumns = (self) => {
               p.append(grandChildItem);
             }
 
-            if(3==index){
+            if (3 == index) {
               let grandChildItem = document.createElement('p');
               grandChildItem.innerText = "岗位:";
               let font = document.createElement('font');
@@ -82,17 +84,83 @@ const checkListColumns = (self) => {
 };
 
 
-// export const data =
+export const datamoni = {
+
+
+  "id": 349,
+  "name": "XAP-P-EXD-SW01",
+  "code": "0010020003",
+  "user": null,
+  "identificationMethod": null,
+  "riskLevel": "3级",
+  "riskType": null,
+  "riskFactors": [
+    {
+      "id": 57,
+      "name": "噪音",
+      "type": " , , , ",
+      "level": "3级",
+      "controlStatus": ""
+    },
+    {
+      "id": 58,
+      "name": "设备故障",
+      "type": " , , , ",
+      "level": "4级",
+      "controlStatus": null
+    }
+  ],
+  "riskFactorsControlMeasures": [
+    {
+
+      "id": 22,
+      "label": "测试",
+      "content": "正文"
+    },
+    {
 
-//   [
-//     {
-//       "id": 16,
-//       "name": "Y巡检点就是危险因素",
-//       "type": "公司22,部门,班组,岗位",
-//       "level": "4级",
-//       "controlStatus": null
-//     }
-//   ]
+      "id": 23,
+      "label": "测试",
+      "content": "正文"
+    },
+    {
+
+      "id": 24,
+      "label": "测试",
+      "content": "正文"
+    }
+  ],
+  "dangerDetails":null
+}
+
+const deviceData = [
+  {
+      "type": "device",
+      "name": "中心机房新风机",
+      "value": "高湿报警",
+      "identification": "qualified",
+      "factorId": 26
+  }
+]
+
+const patrolData =  [
+  {
+     
+    "type": "patrol",
+      "name": "A02机柜",
+      "value": "【（2U-14U）750服务器01】工作指示灯",
+      "identification": "qualified",
+      "factorId": 31
+  },
+  {
+   
+      "type": "patrol",
+      "name": "A02机柜",
+      "value": "【（2U-14U）750服务器01】噪声",
+      "identification": "qualified",
+      "factorId": 31
+  }
+]
 
 /**
  * 风险详情
@@ -106,7 +174,9 @@ class RiskSourceDetailModal extends Component {
     this.state = {
       selectedRows: [],
       selectedRowKeys: [],
-      data: {}
+      data: {},
+      patroList: [],
+      deviceList:[]
     };
   }
 
@@ -123,8 +193,29 @@ class RiskSourceDetailModal extends Component {
   }
 
   queryRiskSoureDetail = (riskSourceId) => {
+   
+  
     riskSoureDetail3dAction(riskSourceId).then(data => {
       this.setState({ data });
+       
+      data.riskFactors.map(e =>{
+       let {patroList,deviceList} =this.state;
+        queryPointItemAllDatas(e.id).then(datas =>{
+          datas.patrol&& datas.patrol.map(item =>{
+            patroList.push(item)
+          })
+
+          datas.device && datas.device.map(item =>{
+            deviceList.push(item)
+          })
+          this.setState({ patroList:patroList, deviceList:deviceList});
+        })
+       
+      })
+
+     
+
+     
     });
   }
   /**
@@ -142,18 +233,82 @@ class RiskSourceDetailModal extends Component {
     );
   };
 
-  renderDanger = (danger) => {
-    return (danger || []).map(item => {
-      return (<p key={item.id} >
-        <span>{item.label} &nbsp;</span>
-        <span>{item.content}：</span>
-        <span style={{ color: '#FF0000' }}>管控措施失效</span>
+  // renderDanger = (danger) => {
+  //   return (danger || []).map(item => {
+  //     return (<p  >
+  //       <span>{item.label} &nbsp;</span>
+  //       <span>{item.content}：</span>
+  //       <span style={{ color: '#FF0000' }}>管控措施失效</span>
+  //     </p>);
+  //   });
+  // }
+
+  renderDangersPatrol = (danger) => {
+    return (danger || []).map(item =>{
+      if(item && item.identification==="unqualified"){
+        return (<p > <font style={{ color: '#FF0000' }}>巡检不合格：</font>
+        <span>{item.name} &nbsp;</span>
+        <span>{item.value} &nbsp;</span>
       </p>);
-    });
+      }
+    })
+    // return (danger || []).map(item => {
+    //   return (<p > <font style={{ color: '#FF0000' }}>巡检不合格：</font>
+    //     <span>{item.name} &nbsp;</span>
+    //     <span>{item.value} &nbsp;</span>
+    //   </p>);
+    // });
+  }
+
+  renderDangersDevice= (danger) => {
+    // return (danger || []).map(item => {
+    //   return (<p > <font style={{ color: '#FF0000' }}>设备告警：</font>
+    //     <span>{item.name} &nbsp;</span>
+    //     <span>{item.value} &nbsp;</span>
+    //   </p>);
+    // });
+    return (danger || []).map(item =>{
+      if(item && item.identification==="unqualified"){
+        return (<p > <font style={{ color: '#FF0000' }}>设备告警：</font>
+        <span>{item.name} &nbsp;</span>
+        <span>{item.value} &nbsp;</span>
+      </p>);
+      }
+    })
   }
 
+
+   handledata =(data,patroList,deviceList)=>{
+
+      if(data.riskFactors){
+        data.riskFactors.map(e =>{
+          e.controlStatus =  "受控";
+        })
+
+        data.riskFactors.map(item =>{
+          patroList.map(p =>{
+            if(item.id = p.factorId &&  p.identification==="unqualified"){
+              item.controlStatus =  "失效";
+            }
+          })
+
+          deviceList.map(p =>{
+            if(item.id = p.factorId &&  p.identification==="unqualified"){
+              item.controlStatus =  "失效";
+            }
+          })
+        })
+      }
+
+      return data;
+   }
+
+
+
   render() {
-   const { data = {} } = this.state;
+    let { data = {} } = this.state;
+    let {patroList,deviceList} = this.state;
+    let newData = this.handledata(data,patroList,deviceList);
     return (
       <div className="risk-warn">
         <div className="risk-source-header">
@@ -168,12 +323,13 @@ class RiskSourceDetailModal extends Component {
             callBack={this.reload}
             isPageable={false}
             isChecked={false}
-            dataList={data.riskFactors || []}
+            dataList={newData.riskFactors || []}
           />
         </div>
         <div className="risk-warn-content">
-          <div className="risk-warn-content-header">隐患：</div>
-          {data.riskFactorsControlMeasures && this.renderDanger(data.riskFactorsControlMeasures)}
+          <div className="risk-warn-content-header">风险触发原因：巡检不合格/设备告警</div>
+          {patroList &&this.renderDangersPatrol(patroList)}
+          {deviceList &&this.renderDangersDevice(deviceList)}
         </div>
       </div>
     );