修改

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/points/marker3DFactory.js

@@ -160,7 +160,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
       this.outlineHelper = this.stagePilot ? this.stagePilot.outlineHelper : undefined;
       markersCache.eachValue(obj=>{
         this.setTopCardConf(obj, obj.extData);
-        if(obj.extData.type === "riskSource"){
+        if(obj.extData.type === "riskSource" && markerType != 'impEquipmentMode'){
           this.setTwinkleConf(obj);
         }
       });
@@ -193,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