Merge branch 'develop_20200601' of http://172.16.10.76/bank/AmosBankView into develop_20200601

src/consts/imgStatic.js

@@ -71,6 +71,7 @@ export default {
     impEquipment_01: require('./../assets/3dview/markers/impEquip1.png'),
     impEquipment_02: require('./../assets/3dview/markers/impEquip2.png'),
     impEquipment_03: require('./../assets/3dview/markers/impEquip3.png'),
+    impEquipment_04: require('./../assets/3dview/markers/impEquip3.png'),
     dynamicRingData_01: require('./../assets/3dview/markers/dynamicRingData2.png'),
     dynamicRingData_02: require('./../assets/3dview/markers/fireDetect.png'),
 

src/styles/view/3dview/points.scss

@@ -28,6 +28,7 @@
   @include create-point-level('impEqu_01', $equ-color-type-1);
   @include create-point-level('impEqu_02', $equ-color-type-2);
   @include create-point-level('impEqu_03', $equ-color-type-3);
+  @include create-point-level('impEqu_04', $equ-color-type-4);
   @include create-point-level('dynamicRingData_01', $dynamic-color-type-1);
   @include create-point-level('dynamicRingData_02', $dynamic-color-type-2);
 }

src/styles/view/var.scss

@@ -31,6 +31,7 @@ $point-color-level-0: rgb(141, 8, 25);
 $equ-color-type-1: rgb(19, 213, 184);
 $equ-color-type-2: rgb(1, 126, 211);
 $equ-color-type-3: rgb(7, 24, 212);
+$equ-color-type-4: rgb(7, 24, 212);
 
 $dynamic-color-type-1:rgb(1, 126, 211);
 $dynamic-color-type-2:rgb(230, 84, 4);

src/view/bank/3dview/conf.js

@@ -83,10 +83,11 @@ export const bizControls = [
     { key: 'level_1', label: '合格' },
     { key: 'level_0', label: '未计划' }
   ] },
-  { key: 'impEquipment-point', icon: 'zhongdianshebeixiangqing', type: 'impEquipment', label: '网络设备', subs: [
+  { key: 'impEquipment-point', icon: 'zhongdianshebeixiangqing', type: 'impEquipment', label: '设备中心', subs: [
     { key: 'impEqu_01', label: '网络设备' },
     { key: 'impEqu_02', label: '服务器' },
-    { key: 'impEqu_03', label: '虚拟设备' }
+    { key: 'impEqu_03', label: '虚拟设备' },
+    { key: 'impEqu_04', label: 'IP设备' }
   ] },
   // { key: 'monitorEquipment-point', icon: 'shujudian', type: 'monitorEquipment', label: '动环数据' },
   { key: 'dynamicRingData-point', icon: 'shujudian', type: 'dynamicRingData', label: '动环数据', subs: [

src/view/bank/3dview/points/markerFactory.js

@@ -54,6 +54,12 @@ export default function markerFactory(WrappedComponent = 'div', options){
      * @memberof MarkerPoints
      */
     onMarkerDblClick = (marker, e) => {
+
+       if(marker.extData.levelStr==='impEqu_04'){
+
+        return ;
+       }
+      debugger
       clearTimeout(this.time);
       tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData });
       // if (marker.extData.markerType === 'impEquipment' && void 0 !== marker.extData.show) {