3d页面修改

src/consts/urlConsts.js

@@ -58,7 +58,7 @@ export const FscSerUrl = {
   stepUrl: completePrefix(baseURI, 'api/timeline/contingency/page?current={page}&pageSize={size}'), //右侧菜单-步骤 *
   broadcastTypeListUrl: completePrefix(view3dURI, 'broadcastTypeListUrl'), //右侧菜单-播报-类型集合
   broadcastUrl: completePrefix(baseURI, 'api/timeline/{instanceNo}?recordType={recordType}'), //右侧菜单-播报 *
-  markerDetailsUrl: completePrefix(view3dURI, 'view3d/node/detail?id={id}&type={type}'), //三维地图中各种点详情
+  markerDetailsUrl: completePrefix(view3dURI, 'view3d/node/info?id={id}&type={type}'), //三维地图中各种点详情
   tellRegionSelectUrl: completePrefix(view3dURI, 'patrol/save/curCompany/{orgCode}'), // 注入选择的厂区信息 post
   loadPackagesUrl: completePrefix(ruleURI, 'urule/packageeditor/loadPackages?project={project}'), //风险管控查询
 

src/view/3dview/View3D.js

@@ -427,6 +427,10 @@ class View3D extends Component {
           console.log('风险触发风险点闪烁~~~~~~~~~~~~~~~~~~~~');
           flickerTroubleMarkers(this, data);//风险触发风险点闪烁
           break;
+        case 'base3d.fromws.riskSituation_colour':
+          console.log('风险触发风险点颜色改变~~~~~~~~~~~~~~~~~~~~');
+          flickerTroubleMarkers(this, data);//风险触发风险点闪烁
+          break;
         default:
           console.log(topic,'：类型不支持');
       }

src/view/3dview/ruleActionView.js

 
-import { initView3DAction } from './../../services/3dService';
+import { initView3DAction, markerDetailsAction } from './../../services/3dService';
 import { getMatchEquipmentListAction } from './../../services/ledgerService';
 import { eventTopics } from './consts';
 import { desigerHelperConfig } from './conf';
@@ -321,33 +321,29 @@ const updateMarker = (instance, content, markers) => {
 
 export const flickerTroubleMarkers = (instance, content) => {
   let type = 'riskSource';
-  let { bizobj, frequency } = content;
+  let { bizobj } = content;
   content.type = type;
   let { markers = {} } = instance.state;
   let riskSourceList = markers[type];
-  if (riskSourceList && riskSourceList.length === 0) {
-    initView3DAction(type).then(d => {
-      d.map(o => {
-        if (o.id === bizobj.id) {
-          o.frequency = frequency;
-          if (frequency === 3) { //等级上升
-            o.level = o.level === '1' ? o.level : (o.level - 1) + '';
-          }
-        }
-      });
-      markers[type] = d;
-      updateMarker(instance, content, markers);
-    });
-  } else if (riskSourceList && riskSourceList.length > 0){
+  if (riskSourceList && riskSourceList.length > 0){
+    let target;
     markers[type].map(o => {
       if (o.id === bizobj.id) {
-        o.frequency = frequency;
-        if (frequency === 3) { //等级上升
-          o.level = o.level === '1' ? o.level : (o.level - 1) + '';
-        }
+        target = o;
       }
     });
-    updateMarker(instance, content, markers);
+    target &&  markerDetailsAction(target.id, type).then(data => {
+      let node = data[0];
+      target.level = node.dataLevel;
+      markers[type].map(o => {
+        if (o.id === target.id) {
+          o.level = target.level;
+          o.frequency = node.frequency;
+          o.title = node.nodeState;
+        }
+      });
+      updateMarker(instance, content, markers);
+    });
   }
 };
 

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

@@ -641,7 +641,11 @@ class RiskModel extends Component {
   getModalHeader =(modelFlag, toolBarFlag)=>{
     let header = '';
     if (modelFlag === 'risk'){
-      header = '添加风险层级';
+      if (toolBarFlag === '2') {
+        header = '编辑风险层级';  
+      } else {
+        header = '添加风险层级';
+      }
     } else if (modelFlag === 'fmea'){
       if (toolBarFlag === '4') {
         header = '风险评价';

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

@@ -28,14 +28,14 @@ class EvaluationModel extends Component {
         evaluationOid: '',
         evaluationDid: '',
         evaluationS: '',
-        evaluationO: '',
+        evaluationO: '1',
         evaluationD: '',
         engineering: '',
         train: '',
         management: '',
         protection: '',
         disposal: '',
-        rpni: 0
+        rpni: 1
       },
       riskFactorData: [],
       accidentTypeData: [],
@@ -99,7 +99,10 @@ class EvaluationModel extends Component {
 
   getEvaModel = searchParam => {
     queryEvaModelAction(searchParam).then(data => {
-      this.setState({ sData: data.S, dData: data.D, oData: data.O });
+      let { form } = this.state;
+      data.O = data.O.filter(item => item.coefficient === '1');
+      form.evaluationOid = data.O[0].id;
+      this.setState({ sData: data.S, dData: data.D, oData: data.O, form });
     });
   };
 
@@ -149,22 +152,9 @@ class EvaluationModel extends Component {
     });
   };
 
-  handelScrolling() {
-    let elements = document.getElementsByClassName('amos-modal-content');
-    for (var i = 0; i < elements.length; i++) {
-      elements[i].onscroll = function() {
-        let dropdown = document.getElementsByClassName('amos-popover-down');
-        if (dropdown) {
-          for (var j = 0; j < dropdown.length; j++) {
-            dropdown[j].style.display = 'none';
-          }
-        }
-      };
-    }
-  }
-
   render() {
     const { form, rules, sData, dData, oData, userData, scrolling } = this.state;
+    let oValue = oData[0] && (oData[0].coefficient + '-' + oData[0].influence + '-' + oData[0].describe);
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
@@ -225,14 +215,18 @@ class EvaluationModel extends Component {
                 className="fmea-model-select"
                 data={oData}
                 searchable
-                renderOption={item => (
-                  <Option value={parseInt(item.id)}>
-                    {item.coefficient}-{item.influence}-{item.describe}
-                  </Option>
-                )}
-                value={form.evaluationOid}
+                disabled
+                // renderOption={item => (
+                //   <Option value={parseInt(item.id)}>
+                //     {item.coefficient}-{item.influence}-{item.describe}
+                //   </Option>
+                // )}
+                defaultValue={oData[0] && oData[0].id}
+                value={oData[0] && oData[0].id}
                 onChange={(e, item) => this.onSelectChange('evaluationOid', e, item)}
-              />
+              >
+                <Option value={51}>{oValue}</Option>
+              </Select>
             </FormItem>
             <FormItem label={<span>D准则</span>} className="fmea-item-evaluationDid" field="evaluationDid" {...formItemLayout}>
               <Select