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

amos.config.js

@@ -11,10 +11,10 @@
       objModelURI: '/a3dres',
       // 根url
       // baseURI: 'http://172.16.11.30:9008/',
-      baseURI: 'http://172.16.3.122:8083/',
+      baseURI: 'http://172.16.3.77:8083/',
       // convertorURI: 'http://172.16.3.122:8083/',
-      convertorURI: 'http://172.16.3.122:8083/',
-      patrolURI: 'http://172.16.3.122:8082/',
+      convertorURI: 'http://172.16.3.77:8083/',
+      patrolURI: 'http://172.16.3.77:9000/',
       rulesConfigURI: 'http://172.16.10.91:8080/',
       // plugin URI
       pluginURI: 'http://172.16.11.40:8099/',
@@ -26,7 +26,7 @@
       studioURI: 'ws://172.16.11.40:10600/',
       securityBaseURI: 'ws://172.16.10.91:10600/',
       convertorView3dURI: 'ws://172.16.10.91:10600/',
-      ruleURI: 'ws://172.16.10.91:8080/'
+      ruleURI: 'ws://172.16.3.77:8083/'
     },
     // 外部链接地址
     outterURI: {

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

@@ -366,3 +366,15 @@
       }
   }
 }
+
+.amos-toast{
+  .amos-toast-inner{
+   background: #5a94f5;
+   opacity: 0.78;
+   color: white;
+   .amos-toast-inner-title{
+     color: white;
+   }
+  }
+}
+

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

@@ -294,4 +294,43 @@
     // }
 }
 
-
+.ant-calendar-picker-container{
+    .ant-calendar{
+        border: 1px solid #2b8dd4;
+        background-color: #2b8dd4;
+        .ant-calendar-date-input-wrap{
+            color: white;
+            .ant-calendar-input{
+                background-color: #2b8dd4;
+            }
+            .ant-calendar-input::-webkit-input-placeholder {
+                color: white; 
+              }
+        }
+        .ant-calendar-header{
+            color: white;
+            div a{
+                color: white; 
+            }
+            div span a{
+                color: white;  
+            }
+        }
+        .ant-calendar-body{
+            color: white;
+            .ant-calendar-cell>.ant-calendar-date{
+              color: white;
+           }
+           .ant-calendar-today>.ant-calendar-date{
+            color: black;
+         }
+        }
+        .ant-calendar-footer{
+            color: white;
+            .ant-calendar-today-btn {
+                color: white;
+            }
+        }
+       
+    }
+}
\ No newline at end of file

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

@@ -782,7 +782,7 @@ class View3D extends Component {
   selectPointChange = (selectPoints) => {
     const { markers, pointType } = this.state;
     if (selectPoints.isRegion){
-      this.setState({ selectArea: selectPoints });
+      this.setState({ selectArea: selectPoints, selectPoints });
     } else {
       this.dragItemChange(selectPoints);
       markers[pointType].map(e => {
@@ -799,9 +799,7 @@ class View3D extends Component {
   }
 
   getAreas = (treeData) => {
-    let { dragItem ,selectArea} = this.state;
-    // console.log(treeData)
-    // let areas = [];
+    let { dragItem ,selectArea } = this.state;
     if (treeData && treeData.length > 0) {
       treeData.map((item) => {
         if (item.isRegion && item.isBind) {
@@ -908,6 +906,10 @@ class View3D extends Component {
         position3d: item.position.length > 1 ? `${item.position[0]},${item.position[1]},${item.position[2]}` : null
       };
     });
+    this.savePointList(pointType,paramsArr);
+  }
+
+  savePointList = (pointType,paramsArr) => {
     savePointListAction(paramsArr).then(
       data => {
         getPointTreeAction(pointType).then(
@@ -922,9 +924,8 @@ class View3D extends Component {
         message.success('保存成功');
       },error => message.error('保存失败')
     );
-
-
   }
+
   // 删除点绑定
   deletePointBind = () => {
     let { selectPoints ,pointTypeArr,pointType,markers} = this.state;
@@ -935,43 +936,42 @@ class View3D extends Component {
         pointId: selectPoints.id,
         pointType: selectPoints.type,
         position3d: ``
-      })
-
-      savePointListAction(pointParams).then(data => {
-        getPointTreeAction(pointType).then(data => {
-          this.getPointList(pointType,data);
-          // getPointListAction().then(data => {
-          //   let newMarkers ={
-          //     riskSource:[],//风险点 - riskSource；
-          //     patrol:[],//巡检点 -
-          //     impEquipment:[],//重点设备 -
-          //     monitorEquipment:[],//探测器 -
-          //     video:[],//摄像头 -
-          //     fireEquipment:[],//消防设备 -
-          //     person:[],
-          //     pool:[],
-          //     hydrant:[],
-          //     fireChamber:[],
-          //     fireCar:[],
-          //     fire:[],
-          //     fireDetection:[]
-          //   }
-          //   for (let i = 0; i < data.length;i++){
-          //     newMarkers[data[i].type].push(data[i]);
-          //   }
-          //   this.setState( {markers: newMarkers });
-          // })
-          this.setState({
+      });
+      this.savePointAndRefreshMarker(pointType,pointParams);
+    }else if(selectPoints && selectPoints.isRegion && selectPoints.children){
+      AmosAlert.confirm('提示', '是否删除该区域下所有点?', {
+        callback: (flag) => {
+          if (flag){
+            let pointParams = [];
+            pointParams = selectPoints.children.filter(e => e.position3d && e.position3d.length > 0).map(item=>{
+              return {
+                pointId: item.id,
+                pointType: item.type,
+                position3d: ''
+              };
+            });
+            this.savePointAndRefreshMarker(pointType,pointParams);
+          } else {
 
-            treeData: data || [],
-            pageType: 'point',
-            showRightPanel: false
-          });
-        });
-      })
+          }
+        }
+      });
     }
   }
 
+  savePointAndRefreshMarker = (pointType,pointParams) => {
+    savePointListAction(pointParams).then(data => {
+      getPointTreeAction(pointType).then(data => {
+        this.getPointList(pointType,data);
+        this.setState({
+          treeData: data || [],
+          pageType: 'point',
+          showRightPanel: false
+        });
+      });
+    });
+  }
+
   //删除区域
   deleteAreaBind = () => {
     let { selectArea,treeData } = this.state;

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

@@ -181,7 +181,7 @@ class PointLeftTree extends Component {
     console.log('onSelect', info);
     let selectItem = info.node.props.dataRef;
     this.setState({ selectedKeys });
-    this.props.selectPointChange(selectItem)
+    this.props.selectPointChange(selectItem);
   }
   render() {
       let { treeData, checkedPointsKeys,pointTypeArr,pointType } = this.state;