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

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

@@ -98,7 +98,16 @@ export default {
     risk_3: require('../assets/convertor/3dview/markers/pa-3.png'),
 
     fire: require('../assets/convertor/3dview/markers/fire.png'),
-    fireDetection: require('../assets/convertor/3dview/markers/fireDetector.png')
+    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'),
   },
   color: {
     hydrant: {color: '#f12525'},
@@ -206,7 +215,17 @@ export const marker3DIoncMapper = {
   data_1: '/mods/components/3dviewConvertor/threeres/markers/data-1.png',
 
   croom_0: '/mods/components/3dviewConvertor/threeres/markers/croom-0.png',
-  croom_1: '/mods/components/3dviewConvertor/threeres/markers/croom-1.png'
+  croom_1: '/mods/components/3dviewConvertor/threeres/markers/croom-1.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'),
+
+
 };
 
 

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

@@ -232,5 +232,11 @@
     width: 1px;
   }
 }
-
+.three-ui-anchor{
+  white-space: nowrap;
+  width: 90px;
+  text-align: center;
+  color:#cecdcd;
+  background-image: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(0, 0, 0, 0.3) 24%, rgba(0, 0, 0, 0.3) 78%, rgba(255, 255, 255, 0) 100%);
+}
 

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

@@ -9,6 +9,7 @@
     width: 350px;
     float: left;
     z-index: 1;
+    color: white;
 
     .equipStatusList{
       padding-left: 97px;
@@ -203,7 +204,7 @@
     top: 0;
 
     z-index: 1;
-    
+
     .echart-week {
       width: 321px !important;
       height: 248px !important;

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

@@ -109,6 +109,7 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.riskSource}
           onCreated={(val) => this.onMarkersCreated('riskSource', val)}
+          isEditMode={this.props.isEditMode}
         />
         {/* <PatrolPoint
           {...rest}
@@ -119,47 +120,56 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.patrol}
           onCreated={(val) => this.onMarkersCreated('patrol', val)}
+          isEditMode={this.props.isEditMode}
         />
         <PersonPoint3D
           {...rest}
           markers={markers.person}
           onCreated={(val) => this.onMarkersCreated('person', val)}
+          isEditMode={this.props.isEditMode}
         />
         <EquipmentPoint
           {...rest}
           markers={markers.impEquipment}
           onCreated={(val) => this.onMarkersCreated('impEquipment', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.pool}
           onCreated={(val) => this.onMarkersCreated('pool', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.hydrant}
           onCreated={(val) => this.onMarkersCreated('hydrant', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireEquipment}
           onCreated={(val) => this.onMarkersCreated('fireEquipment', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireChamber}
           onCreated={(val) => this.onMarkersCreated('fireChamber', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireFoamRoom}
           onCreated={(val) => this.onMarkersCreated('fireFoamRoom', val)}
+          isEditMode={this.props.isEditMode}
         />
         {!hideDetector ?
           <FireResourcePoint
             {...rest}
             markers={markers.fireDetection}
             onCreated={(val) => this.onMarkersCreated('fireDetection', val)}
+            isEditMode={this.props.isEditMode}
           />
           : ''
         }
@@ -167,16 +177,19 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.monitorEquipment}
           onCreated={(val) => this.onMarkersCreated('monitorEquipment', val)}
+          isEditMode={this.props.isEditMode}
         />
         <MonitorPoint
           {...rest}
           markers={markers.video}
           onCreated={(val) => this.onMarkersCreated('video', val)}
+          isEditMode={this.props.isEditMode}
         />
         <FirePoint
           {...rest}
           markers={markers.fire}
           onCreated={(val) => this.onMarkersCreated('fire', val)}
+          isEditMode={this.props.isEditMode}
         />
         {/*<FireResourcePoint
           {...rest}
@@ -187,16 +200,19 @@ class PointsPool extends Component {
           {...rest}
           markers={markers.fireCar}
           onCreated={(val) => this.onMarkersCreated('fireCar', val)}
+          isEditMode={this.props.isEditMode}
         />
         <PointStatistics
           {...rest}
           markers={markers.statistics}
           onCreated={(val) => this.onMarkersCreated('statistics', val)}
+          isEditMode={this.props.isEditMode}
         />
         <ImpEquipmentMode
           {...rest}
           markers={markers.impEquipmentMode}
           onCreated={(val) => this.onMarkersCreated('impEquipmentMode', val)}
+          isEditMode={this.props.isEditMode}
         />
       </Shuttle>
     );

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

@@ -440,7 +440,7 @@ class View3D extends Component {
     let { totalDelta, markerType, showMap } = this.state;
     totalDelta = totalDelta + delta;
     // if (totalDelta < mousewheelCount && showMap) {
-    if(showMap){
+    if(showMap && markerType != "impEquipmentMode"){
       this.asyncLoadMarkerData(markerType);
     }
     // } else if (totalDelta >= mousewheelCount && !showMap) {
@@ -1006,6 +1006,12 @@ class View3D extends Component {
       })
     }
   }
+  quitEditMode = () => {
+    this.setState({
+      editFlag: false
+    })
+    this.props.editModelChange(false)
+  }
 
   editButtonClick = () => {
     let { editFlag } = this.state;
@@ -1173,6 +1179,7 @@ class View3D extends Component {
     markers['fireFoamRoom'] = [];
     markers['fireDetection'] = [];
     markers['statistics'] = [];
+    markers['impEquipmentMode'] = [];
     this.setState({
       markers
     });
@@ -1246,7 +1253,7 @@ class View3D extends Component {
         // markers[markerType] = d;
         this.setState({
           markers,
-          // markerType: "monitorEquipment"
+          markerType: "impEquipmentMode"
         });
         return;
     });
@@ -1453,6 +1460,16 @@ class View3D extends Component {
               />
 
             }
+<<<<<<< HEAD
+=======
+
+            <div className='topBox'>
+              <span className='editTitle'>
+                <span className='titleText'>编辑模式</span>
+              </span>
+              <span className='quipBtn' onClick={this.quitEditMode}></span>
+            </div>
+>>>>>>> c22bff23958536ca788be2c9cf7316bdd7f6153d
             <div className='bottomBox'>
               <span className={`editAreaBtn ${pageType == 'region'?'selected':'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'region')}></span>
               <span className={`editPointBtn ${pageType == 'point'?'selected':'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'point')}></span>

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

@@ -300,7 +300,7 @@ export default {
 
 export const desigerConf = {
   sceneOptions: {
-    background: 0x626667
+    background: 0x070709
     // background: 0x253366,
     // skyBox: 'bluesky'
     // skyBox: ['pos_x', 'neg_x', 'pos_y', 'neg_y', 'pos_z', 'neg_z'].map(item => `/threeres/bg/bluesky2/${item}.jpg`)

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

@@ -12,7 +12,7 @@ const markerIoncColorMapper = imgStatic.color;
 const pointIcon = imgStatic.pointIcon;
 
 const getIcon = (markerType, level, type) => {
-  if (markerType === 'riskSource' || markerType === 'risk') {
+  if (markerType === 'riskSource' || markerType === 'risk' || markerType === 'impEquipmentMode') {
     return markerIoncMapper[`${markerType}_${level}`];
   }
   return markerIoncMapper[`${markerType}`];

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

@@ -129,7 +129,7 @@ export const PointStatistics = markerFactory(BasicPoint,
 /**
  * 重点设备模式
  */
-export const ImpEquipmentMode = markerFactory(BasicPoint,
+export const ImpEquipmentMode = marker3DFactory(BasicPoint,
   {
     markerType: 'impEquipmentMode'
   }

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

@@ -15,6 +15,7 @@ const getIcon = (markerType, level) => {
 const buildMarkerOptions = (markers, markerType, defaultParams = {}) => {
   if (!utils.isEmpty(markers)){
     markers.forEach(m => {
+      debugger;
       const url = getIcon(markerType, m.level);
       let position;
       if (!utils.isArray(m.position)){
@@ -27,11 +28,21 @@ const buildMarkerOptions = (markers, markerType, defaultParams = {}) => {
       m.url = url;
       m.position = utils.isArray(m.position) ? m.position : position;
       m.size = 10;
+      m.label = createMarkerLabel(m.name);
     });
   }
   return markers;
 };
 
+const createMarkerLabel = (text) => {
+  const div = document.createElement('div');
+  div.style.position = 'absolute';
+  div.style.marginTop = '-3rem';
+  div.className = 'three-ui-anchor';
+  div.innerText = text;
+  return div;
+};
+
 export default function marker3DFactory(WrappedComponent = 'div', options){
   const { markerType, markerParams } = options;
   class MarkerPoints extends Component {

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

@@ -38,7 +38,7 @@ export default function markerFactory(WrappedComponent = 'div', options){
     }
 
     componentDidMount() {
-
+      console.log(this.props)
     }
 
     componentWillReceiveProps = nextProps => {
@@ -46,6 +46,9 @@ export default function markerFactory(WrappedComponent = 'div', options){
     }
 
     onMarkerClick = (marker, e) => {
+      if (this.props.isEditMode) {
+        return false
+      }
       clearTimeout(this.time);
       tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData });
       if (marker.extData.markerType === 'fire' && void 0 !== marker.extData.show) {
@@ -56,6 +59,9 @@ export default function markerFactory(WrappedComponent = 'div', options){
     }
 
     onMarkerDblClick = (marker, e) => {
+      if (this.props.isEditMode) {
+        return false
+      }
       clearTimeout(this.time);
       tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData });
       if (marker.extData.markerType === 'fire' && void 0 !== marker.extData.show) {

mods/components/panoramic/styles/view/panoramic/index.scss

@@ -6,5 +6,4 @@
     height: calc(100% - 40px);
     width: 100%;
     //background: black;
-    color: white;
 }

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

@@ -9,6 +9,7 @@
     width: 350px;
     float: left;
     z-index: 1;
+    color: white;
 
     .equipStatusList{
       padding-left: 97px;
@@ -453,7 +454,7 @@
 //}
 
 .warnModal {
-  position: absolute;
+  position: fixed;
   // width: 1000px;
   // height: 600px;
   width: calc(100% - 800px);