Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

mods/components/3dviewConvertor/consts/imgStatic.js

@@ -102,13 +102,14 @@ export default {
     fireDetection: require('../assets/convertor/3dview/markers/fireDetector.png'),
 
 
-//重点设备模式
-impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
-impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'),
-impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'),
-impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),//
-impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),//
-impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'),
+    //重点设备模式
+    impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
+    impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'),
+    impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'),
+    impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),//
+    impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),//
+    impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'),
+
   },
   color: {
     hydrant: {color: '#f12525'},
@@ -126,7 +127,7 @@ impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fi
     shmMap: require('../assets/convertor/situation/background-shm.png'),
     snMap: require('../assets/convertor/situation/background-sn.png'),
     ynMap: require('../assets/convertor/situation/background-yn.png'),
-    hainanMap: require('../assets/convertor/situation/background-hainan.png')
+    // hainanMap: require('../assets/convertor/situation/background-hainan.png')
   },
 
   region: {
@@ -198,11 +199,11 @@ impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fi
 
 export const marker3DIoncMapper = {
   riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'),
-    riskSource_1: require('../assets/convertor/3dview/markers/risk-1.png'),
-    riskSource_2: require('../assets/convertor/3dview/markers/risk-2.png'),
-    riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'),
-    riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'),
-    riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'),
+  riskSource_1: require('../assets/convertor/3dview/markers/risk-1.png'),
+  riskSource_2: require('../assets/convertor/3dview/markers/risk-2.png'),
+  riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'),
+  riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'),
+  riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'),
   risk_0: '/mods/components/3dviewConvertor/threeres/markers/risk-0.png',
   risk_1: '/mods/components/3dviewConvertor/threeres/markers/risk-1.png',
   risk_2: '/mods/components/3dviewConvertor/threeres/markers/risk-2.png',
@@ -242,3 +243,7 @@ export const safetyIndexIconMapper = {
   riskEror: '/mods/components/3dviewConvertor/threeres/markers/exception_risk.png',
   transparent_rpn: require('./../threeres/markers/transparent_rpn.png')
 };
+
+export const markerTitleBgMapper = {
+  base: require('../assets/convertor/3dview/markers/markerTitle.png')
+}; 
\ No newline at end of file

mods/components/3dviewConvertor/view/PointsPool.js

@@ -60,6 +60,7 @@ class PointsPool extends Component {
   onMarkersCreated = (type, { markersCache }) => {
     this.markerList[type] = markersCache;
     let stagePilot = this.props.stagePilot;
+    debugger;
     // if(markersCache&&stagePilot) {
     //   // console.log(this.markerList)
     //   console.log(markersCache)

mods/components/3dviewConvertor/view/View3D.js

@@ -1436,6 +1436,7 @@ class View3D extends Component {
       ...desigerConf,
       enableAnimator: true,
       enableOutline: true,
+      enableObjOutline: true,
       enableCSS2D: true,
       onCreated: this.onGraphCreated,
       afterRender: this.afterRender

mods/components/3dviewConvertor/view/points/marker3DFactory.js

@@ -78,7 +78,6 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
           }
         },
         mouseout: (marker) => {
-          console.log('2222')
           if(marker.object2DPipe){
             marker.object2DPipe.pipeNode.visible = false;
             marker.object2DPipe.pipeNode.elementVisible = false;
@@ -151,17 +150,32 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
     markerCreated = ({ markersCache }) => {
       this.markersCache = markersCache;
       this.props.positionCtl && this.props.positionCtl.addListener('changeDone', this.onEditorChangeDone);
-       // 拖拽过程即刻改变line
-       this.props.positionCtl &&this.props.positionCtl.addListener('objectChange', this.onEditorChange);
-       // 绑定 positionCtl
-       this.props.positionCtl && this.markersCache.eachValue(item => {
-       this.props.positionCtl.addObjects(item.node);
-     });
-      markersCache.eachValue(item=>{
-        const obj = item.node;
-        const boh = new BaseObjHelper({ obj });
-        obj.baseObjHelper = boh;
-        this.setTopCardConf(obj, item.extData);
+      // 拖拽过程即刻改变line
+      this.props.positionCtl &&this.props.positionCtl.addListener('objectChange', this.onEditorChange);
+      // 绑定 positionCtl
+      this.props.positionCtl && this.markersCache.eachValue(item => {
+        this.props.positionCtl.addObjects(item.node);
+      });
+      this.stagePilot = this.props.stagePilot;
+      this.outlineHelper = this.stagePilot ? this.stagePilot.outlineHelper : undefined;
+      markersCache.eachValue(obj=>{
+        this.setTopCardConf(obj, obj.extData);
+        if(obj.extData.type === "riskSource" && markerType != 'impEquipmentMode'){
+          this.setTwinkleConf(obj);
+        }
+      });
+    }
+
+    setTwinkleConf = ( obj ) => {
+      const { twinkle,frequency } = obj.extData;
+      let pulsePeriod = (twinkle && frequency != 0  ? 1 / frequency : null)
+      let color = twinkle && frequency != 0 ? '#FF0000': null;
+      if (!obj.baseObjHelper.outlineHelper){
+        obj.baseObjHelper.setOutlineHelper(this.outlineHelper);
+      }
+      obj.baseObjHelper.style.outlineColor = color;
+      pulsePeriod && obj.baseObjHelper.outlineHelper.setConfig({
+        pulsePeriod: pulsePeriod.toFixed(2)
       });
     }
 
@@ -179,14 +193,14 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
         },
         canvasOptions: {
           font: '34px Microsoft YaHei',
-          // fillStyle: 'white',
+          fillStyle: 'white',
           textBaseline: 'middle',
           textAlign: 'center',
           textX: 128,
         },
         imgWidth: 256,
         imgHeight: 128,
-        // image: markerTitleBgMapper['quanjing']
+        image: markerTitleBgMapper['base']
       };
       if(type === 'riskSource'){
         cardTitle = '风险值' + title