解决冲突

amos.config.js

@@ -12,7 +12,9 @@
       // 根url
       // baseURI: 'http://172.16.11.30:9008/',
       baseURI: 'http://172.16.3.122:8083/',
+      // convertorURI: 'http://172.16.3.122:8083/',
       convertorURI: 'http://172.16.3.122:8083/',
+      patrolURI: 'http://172.16.3.122:8082/',
       rulesConfigURI: 'http://172.16.10.91:8080/',
       // plugin URI
       pluginURI: 'http://172.16.11.40:8099/',
@@ -45,7 +47,7 @@
           delayTime: 10 // 屏保出现时间(单位：秒) 10s
         },
         //三维模型配置 yinan 沂南站 shm 上海庙站  sn 苏南 hainan 海南站
-        view3dFile:'/mods/components/3dviewConvertor/threeres/models/shm/index.json',
+        view3dFile:'/mods/components/3dviewConvertor/threeres/models/shm/index_dev.json',
       }
     }
   };

mods/components/3dviewConvertor/styles/actionbar.scss

@@ -20,23 +20,30 @@
             border:1px solid rgba(146,149,151,1);
 
             .action-item-title{
-                color: rgb(224, 224, 224);
-                position: relative;
-                top: -23px;
-                font-size:1vw;
+                color: #e0e0e0;
+                position: absolute;
+                top: -20px;
+                white-space: nowrap;
+                width: 38px;
                 -webkit-transform-origin-x: 0;
                 -webkit-transform: scale(0.60);
-                white-space: nowrap;
                 text-align: end;
             }
 
+            .action-item-content{
+                text-align: center;
+                position: relative;
+                width: 100%;
+                height: 100%;
+
                 .action-item-icon{
+                    margin: 8px;
                     width: 21px;
                     height: 21px;
-                top: -16px;
                     position: relative;
                 }
             }
+        }
 
         .action-active{
             background: linear-gradient(180deg,rgba(0,96,154,0.8) 0%,rgba(0,54,105,0.5) 100%);

mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss

@@ -202,6 +202,8 @@
     right: 0;
     top: 0;
 
+    z-index: 1;
+    
     .echart-week {
       width: 321px !important;
       height: 248px !important;

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

@@ -4,7 +4,7 @@ import { Connect } from 'amos-framework';
 import { Store } from 'amos-tool';
 import { connect3D } from 'amos-3d/lib/designer';
 import { RiskPoint, PatrolPoint, PersonPoint3D, MonitorPoint, ProbePoint,
-  FireResourcePoint, EquipmentPoint, FireCar3D, FirePoint, WorkerMen3D, PointStatistics } from './points';
+  FireResourcePoint, EquipmentPoint, FireCar3D, FirePoint, WorkerMen3D, PointStatistics, ImpEquipmentMode } from './points';
 import { eventTopics, isPointEvent , isLevelFilter } from './consts';
 import { parseMarkers, parseLevelFilter, objRunning } from './dataProcessor';
 
@@ -193,6 +193,11 @@ class PointsPool extends Component {
           markers={markers.statistics}
           onCreated={(val) => this.onMarkersCreated('statistics', val)}
         />
+        <ImpEquipmentMode
+          {...rest}
+          markers={markers.impEquipmentMode}
+          onCreated={(val) => this.onMarkersCreated('impEquipmentMode', val)}
+        />
       </Shuttle>
     );
   }

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

@@ -1224,23 +1224,13 @@ class View3D extends Component {
     const { markers } = this.state;
     pointModelistAction(actionType).then(d =>{
       // if (markerType === 'fireResource') {
-        markers['hydrant'] = d['hydrant'];
-        markers['monitorEquipment'] = d['monitorEquipment'];
-        markers['fireCar'] = d['fireCar'];
-        markers['impEquipment'] = d['impEquipment'];
-        markers['fireChamber'] = d['fireChamber'];
-        markers['pool'] = d['pool'];
+        markers['impEquipmentMode'] = d.filter(item => item.position != null);
         // markers[markerType] = d;
         this.setState({
-          markers
+          markers,
+          // markerType: "monitorEquipment"
         });
         return;
-      // }
-      // markers[markerType] = d;
-      // this.setState({
-      //   markers,
-      //   markerType
-      // });
     });
 
   }

mods/components/3dviewConvertor/view/actionbar/index.js

@@ -51,8 +51,10 @@ class ActionBar extends Component {
                   <div className="action-item-title">
                     <p className="">{a.label}</p>
                   </div>
+                  <div className="action-item-content">
                     <img className="action-item-icon" src={require(`./../../assets/convertor/3dview/actionbars/${a.icon}.png`)} />
                   </div>
+                </div>
               );
             })
           }

mods/components/3dviewConvertor/view/moduleEditComponent/AreaLeftTree.js

@@ -62,7 +62,7 @@ class AreaLeftTree extends Component {
   }
 
   onExpand = (expandedKeys) => {
-    console.log('onExpand', arguments);
+    //console.log('onExpand', arguments);
     // if not set autoExpandParent to false, if children expanded, parent can not collapse.
     // or, you can remove all expanded children keys.
     this.setState({

mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js

@@ -63,7 +63,7 @@ class PointLeftTree extends Component {
   }
 
   onExpand = (expandedKeys) => {
-    console.log('onExpand', arguments);
+    //console.log('onExpand', arguments);
     // if not set autoExpandParent to false, if children expanded, parent can not collapse.
     // or, you can remove all expanded children keys.
     this.setState({

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

@@ -126,3 +126,11 @@ export const PointStatistics = markerFactory(BasicPoint,
     markerType: 'statistics'
   }
 );
+/**
+ * 重点设备模式
+ */
+export const ImpEquipmentMode = markerFactory(BasicPoint,
+  {
+    markerType: 'impEquipmentMode'
+  }
+);
\ No newline at end of file