重点设备弹框

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

@@ -159,7 +159,11 @@
   width: 100%;
   height: 100%;
   .amos-modal-container{
-    // width: 310px !important;
+    background-image: url('./../assets/convertor/3dview/toolmodalbg.png');
+    background-repeat: no-repeat;
+    height:262px;
+    width: 452px !important;
+    background-color: rgba(255,255,255,0);
     .amos-modal-close{
       color: white;
       background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
@@ -170,36 +174,43 @@
       }
     }
     .amos-modal-header{
-      background: $model-header-color-3d;
-      height: 30px;
+      background: rgba(255,255,255,0);
+      height: 50px;
       padding: 0;
+      border-width: 0em;
       .amos-modal-title{
-        line-height: 30px;
+        line-height: 50px;
         padding-left: 9px;
-
+        color: #fff;
+        font-size: 18px;
       }
     }
     .amos-modal-content{
       padding: 0;
       .point-dialog-body{
+        margin:10px;
+        max-height: 180px;
+        color: #fff;
         .point-dialog-modal-row {
+          border: solid 1px rgba(234, 234, 234, 0.3);
           display: flex;
-          background: $model-body-color-3d;
+          background: transparent;
           .colTitle {
             float: left;
             font-weight: bold;
             height: 40px;
             padding-left: 8px;
-            border-left: 1px solid $core-border-color;
+            line-height: 40px;
             box-sizing: border-box;
             flex: 1;
+            background-color: rgba(25, 86, 147, 0.6);
           }
           .colValue {
             float: left;
             height: 40px;
             padding-left: 8px;
-            flex: 1;
-            border-left: 1px solid $core-border-color;
+            line-height: 40px;
+            flex: 1.5;
           }
         }
       }
@@ -214,7 +225,7 @@
     height: 8px;
   }
   ::-webkit-scrollbar-thumb {           /* 拖动条 */
-    background-image: url('./../assets/convertor/3dview/control-track.png') ;
+    background-image: url('./../assets/convertor/3dview/scrollslider.png') ;
     background-repeat: no-repeat;
     height: 10px;
   }
@@ -222,13 +233,13 @@
     background-color:rgba(17, 44, 88, 0.2);
   }
   ::-webkit-scrollbar-button{
-
-    background-image: url('./../assets/convertor/3dview/control-track.png') ;
+    background-image: url('./../assets/convertor/3dview/scrollbutton.png') ;
+    background-repeat: no-repeat;
   }
 
    height:100%;
   .amos-modal-container{
-    background-image: url('./../assets/convertor/3dview/modalbg.png');
+     background-image: url('./../assets/convertor/3dview/modalbg.png');
      height:497px;
      width: 866px !important;
      background-color: rgba(255,255,255,0);

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

@@ -109,7 +109,8 @@ class MaskContent extends Component {
     return (
       <div className="mask-content">
         <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        { sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
+        {/* { sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />} */}
+        <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />
         { sideControlShow && <DataPane animationProps={datapaneAnim} />}
         <TopMsg alarmStart={alarmStart} />
         {!isShowActionBar && <ModelHeader headerName={headerName} handleExceptModel={this.handleExceptModel} />}

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

@@ -1240,9 +1240,9 @@ class View3D extends Component {
   }
 
   getExceptionAreaList = () => {
-    exceptionRegionListAction().then(data=>{
-      this.setState({ exceptionAreas: data });
-    });
+    // exceptionRegionListAction().then(data=>{
+    //   this.setState({ exceptionAreas: data });
+    // });
   }
 
   renderPolygonRegion = (exceptionAreas)=> {

mods/components/3dviewConvertor/view/common/tableComponent/table/AmosGridTable.js

@@ -238,8 +238,7 @@ class AmosGridTable extends Component {
 
               rowSelection={rowSelection}
               columns={columns}
-              //dataSource={dataList}
-              dataSource={[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}]}
+              dataSource={dataList}
               pagination={_pagination}
               size={size}
               bordered={bordered}

mods/components/3dviewConvertor/view/points/dialogModel/FireEquipmentModal.js

@@ -47,8 +47,8 @@ class FireEquipmentModal extends Component {
             <Col className="colTitle">安装位置：</Col>
             <Col className="colValue">{position}</Col>
           </Row>
-        </Row> 
-      );  
+        </Row>
+      );
     }else {
       return (
         <Row className="point-dialog-body">