Merge branch 'dev_upgrade' of http://172.16.10.76/station/amos-convertor-view into dev_upgrade

amos.config.js

@@ -7,8 +7,8 @@
   Amos.config = {
     // 普通http
     httpURI: {
-      // baseURI: 'http://172.16.3.41:8083/',
-      baseURI: 'http://172.16.11.36:10005/',
+    //  baseURI: 'http://172.16.3.122:8083/',//ss
+     baseURI: 'http://172.16.11.36:10005/',
       //patrolURI: 'http://172.16.10.91:8082/',
       // 安全模块api地址
       securityBaseURI: 'http://172.16.10.72:10005/',
@@ -16,8 +16,10 @@
       // 监控视图 url
       //view3dURI: 'http://172.16.10.91:9000/',
       // plugin uri
+      // pluginURI: 'http://172.16.3.70:8989/',//ss
       pluginURI: 'http://172.16.10.91:8091/',
       // webstudio uri
+      // studioURI: 'http://172.16.3.89:8099/',//ss
       studioURI: 'http://172.16.10.91:8091/',
       //设计器数据绑定
       dataBindUrl: 'http://172.16.10.91:8083/api/visual/common/dataBind'
@@ -34,10 +36,12 @@
     // 外部链接地址
     outterURI: {
 		  xunjian: 'http://172.16.10.91:3001/outter?isSub=true&user={userId}&token={token}&orgCode={orgCode}',
+
       // 管控模型
       mgtCtrlModel: 'http://172.16.10.91:8080',
       prePlan: 'http://172.16.10.91:3004',
       ue4URI: 'http://172.16.3.69:8089'
+
     },
     // 系统配置信息 主要是为了区分各子系统
     sysConf: {
@@ -48,8 +52,8 @@
       is3dUe4: false
     },
 
-    //三维模型配置 yinan 沂南站 shm 上海庙站  sn 苏南 hainan 海南站
-    view3dFile:'/threeres/models/hainan/index.json',
+    //三维模型配置
+    view3dFile:'/threeres/models/shm/index_dev.json',
 	  rule: {
       packageName: '消防专项预案'
     },
@@ -79,7 +83,7 @@
     },
     // 区域风险点ID与态势图位置对应关系配置
     riskDynamicChart:{
-      projectName:'hainan',  //yn 沂南站 shm 上海庙站  sn 苏南 hainan 海南站
+      projectName:'shm',  //yn 沂南站 shm 上海庙站
       riskSourceIdMap: {
         'mapItem-1': 195,
         'mapItem-2': 95,

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

@@ -75,6 +75,7 @@
         width: 264px;
         height: 100%;
         padding: 32px 0;
+        user-select: none;
         .leftContainer {
             width: 100%;
             height: 100%;

src/view/3dview/ModuleEdit.js

@@ -119,20 +119,7 @@ class ModuleEdit extends Component {
 
   componentDidMount() {
     // this._registerEvents();
-    getAreaTreeAction().then(data => {
-      console.log(data);
-      this.setState({
-          treeData:data || []
-      })
-    })
-    getPointTypeAction().then(data => {
-      console.log(data);
-      this.setState({
-        pointTypeArr: data||[],
-        pointType:data[0]?data[0].code:''
-      })
-    })
-    this.getPointList();
+    
 
   }
   genPenId = () => {
@@ -581,8 +568,16 @@ class ModuleEdit extends Component {
     })
   }
 
+  dragItemChange = (dragItem) => {
+    this.state.dragItem = dragItem;
+    this.setState({
+      dragItem
+    })
+  }
+
   drop = (event) => {
     event.preventDefault();
+    let { dragItem,markers }=this.state;
     console.log(event.clientX)
     const objs = this.a3dRef.pickerCoordinate(event.clientX, event.clientY, null, true);
     let position;
@@ -590,13 +585,53 @@ class ModuleEdit extends Component {
       // get point
       position = objs[0].point;
     }
+    
+    console.log(objs)
     console.log(position)
+    console.log(position.x)
+    if (dragItem) {
+      let uid = UUID.uuidFast()
+      let addPointParam = {
+        type: dragItem.type,
+        position: position,
+        uid: uid,
+        id: uid,
+        key: `${dragItem.type}-${uid}`,
+        title: dragItem.name,
+        label: dragItem.name,
+        level:'1',
+        levelStr: 'level_2',
+        treeNodeId: dragItem.id
+  
+      }
+      markers.riskSource.push(addPointParam)
+      console.log(markers)
+      this.setState({
+        markers
+      })
+    }
   }
 
   editButtonChange = () => {
     let { editFlag } = this.state;
     editFlag = !editFlag;
     this.setState({ editFlag })
+    if(editFlag == true) {
+      getAreaTreeAction().then(data => {
+        console.log(data);
+        this.setState({
+            treeData:data || []
+        })
+      })
+      getPointTypeAction().then(data => {
+        console.log(data);
+        this.setState({
+          pointTypeArr: data||[],
+          pointType:data[0]?data[0].code:''
+        })
+      })
+      this.getPointList();
+    }
   }
 
   render() {
@@ -683,6 +718,7 @@ class ModuleEdit extends Component {
               // pointType={pointType}
               pointTypeArr={pointTypeArr}
               pointTypeChange={this.pointTypeChange}
+              dragItemChange={this.dragItemChange}
             />
             <div className='topBox'>
               <span className='editTitle'>

src/view/3dview/PointsPoolEditPage.js

@@ -105,7 +105,7 @@ class PointsPoolEditPage extends Component {
         />
         <PatrolPoint
           {...rest}
-          markers={markers.risk}
+          markers={markers.patrol}
           onCreated={(val) => this.onMarkersCreated('risk', val)}
         />
         <PersonPoint3D

src/view/3dview/moduleEditComponent/AreaLeftTree.js

@@ -105,24 +105,44 @@ class AreaLeftTree extends Component {
         if (item.children) {
           return (
           <TreeNode 
-            title={<div>
-              <span draggable={item.isRegion?false:true} >{item.name}</span>
-            </div>} 
+            title={
+              <div>
+                {item.isRegion?<span>{item.name}</span>:
+                <span 
+                  draggable={true}
+                  onDragStart={() => {
+                    this.props.dragItemChange(item)
+                  }}
+                >{item.name}</span>}
+              </div>
+            } 
             key={item.id} 
             dataRef={item}
-            onDragStart={(e)=>{console.log(e)}}>
+            onDragStart={() => {
+              console.log(11)
+              this.props.dragItemChange(item)
+            }}>
               {this.renderTreeNodes(item.children)}
             </TreeNode>
           );
         }
         return <TreeNode 
           key={item.id} 
-          title={<div>
-            <span draggable={item.isRegion?false:true} >{item.name}</span>
-          </div>}  
+          title={
+            <div>
+              {item.isRegion?<span>{item.name}</span>:
+              <span 
+                draggable={true}
+                onDragStart={() => {
+                  this.props.dragItemChange(item)
+                }}
+              >{item.name}
+              </span>}
+            </div>
+          }  
           {...item} 
           onClick={() => {console.log('aaa')}} 
-          onDragStart={(e)=>{console.log(e)}}/>;
+          />;
       });
     }