3dzuobiao

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

@@ -1490,10 +1490,10 @@ class View3D extends Component {
             </div>
             <div className='rightBox'>
               {
-                showRightPanel && pageType === 'region' ? <RightEditRegionPanel detailData={selectArea} /> : ''
+                showRightPanel && pageType === 'region' ? <RightEditRegionPanel detailData={selectArea}  closeRightPanel={()=>this.setState({showRightPanel:false})}/> : ''
               }
               {
-                showRightPanel && pageType === 'point' ? <RightEditPointPanel detailData={selectPoints} /> : ''
+                showRightPanel && pageType === 'point' ? <RightEditPointPanel detailData={selectPoints} closeRightPanel={()=>this.setState({showRightPanel:false})}/> : ''
               }
             </div>
           </div>

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

@@ -95,6 +95,8 @@ class RightEditPointPanel extends Component {
   render() {
     let { rules, form,pointTypeArr,pointType ,detailData} = this.state;
     let { pageType } = this.props;
+    let radio = detailData.isIndoor ? "prop1":"prop2"
+    let position = (detailData.position3d) && detailData.position3d.split(",")
     const formItemLayout = {
       labelCol: {
         xs: { span: 28 },
@@ -162,17 +164,17 @@ class RightEditPointPanel extends Component {
                     <div className='position'>
                       <div className='positionItem'>
                       <FormItem label="X"  field="positionX" {...formItemLayout}>
-                      <Input value={detailData.ue4Location && detailData.ue4Location[0]}  />
+                      <Input value={position && position[0]}  />
                       </FormItem>
                       </div>
                       <div className='positionItem'>
                         <FormItem label="Y"  field="positionY" {...formItemLayout}>
-                        <Input value={detailData.ue4Location && detailData.ue4Location[1]}  />
+                        <Input value={position && position[1]}  />
                         </FormItem>
                       </div>
                       <div className='positionItem'>
                         <FormItem label="Z"  field="positionZ" {...formItemLayout}>
-                        <Input value={detailData.ue4Location && detailData.ue4Location[2]}  />
+                        <Input value={position && position[2]}  />
                         </FormItem>
                       </div>
                     </div>
@@ -187,7 +189,7 @@ class RightEditPointPanel extends Component {
                   <div className='msgItem'>
                     <div className='itemLabel'>是否位于室内</div>
                     <FormItem  field="isIndoor" >
-                      <RadioGroup defaultValue="prop2" onChange={value => {this.onRadioChange(value)}}>
+                      <RadioGroup value={radio} onChange={value => {this.onRadioChange(value)}}>
                         <Radio className='radio-text' value="prop1">是</Radio>
                         <Radio className='radio-text' value="prop2">否</Radio>
                       </RadioGroup>
@@ -208,7 +210,7 @@ class RightEditPointPanel extends Component {
               <Button
                 className='cancelBtn'
                 onClick={() => {
-                  // this.props.save()
+                this.props.closeRightPanel()
               }} ></Button>
             </div>
         </div>

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

@@ -189,7 +189,7 @@ class RightEditRegionPanel extends Component {
               <Button
                 className='cancelBtn'
                 onClick={() => {
-                  // this.props.save()
+                this.props.closeRightPanel()
               }} ></Button>
 
             </div>