Commit 29c7663f authored by shanqiyun's avatar shanqiyun

整理代码

parent dc32c2c9
...@@ -5,9 +5,7 @@ import A3DDesigner, { r3d, Connect, DESIGNER_CONSTS } from 'amos-3d/lib/designer ...@@ -5,9 +5,7 @@ import A3DDesigner, { r3d, Connect, DESIGNER_CONSTS } from 'amos-3d/lib/designer
import { A3DUtil } from 'amos-3d/lib/threeTools'; import { A3DUtil } from 'amos-3d/lib/threeTools';
import { ObjAnchorHelper } from 'base-r3d/lib/plugins'; import { ObjAnchorHelper } from 'base-r3d/lib/plugins';
import { ELEMENT_TYPE } from 'amos-iot-3dgraph/lib/view/pubview/../design/conf'; import { ELEMENT_TYPE } from 'amos-iot-3dgraph/lib/view/pubview/../design/conf';
import { isArray } from 'amos-pluggable/lib/_utils';
import { Button, Modal, Row, Col } from 'amos-framework'; import { Button, Modal, Row, Col } from 'amos-framework';
import AmosGridTable from './../../../bizview/common/tableComponent/table/AmosGridTable';
import PlayTaskTabs from './taskTabs'; import PlayTaskTabs from './taskTabs';
import Play from './play'; import Play from './play';
...@@ -15,21 +13,6 @@ const { resizeConnect } = Connect; ...@@ -15,21 +13,6 @@ const { resizeConnect } = Connect;
const { Tools } = A3DUtil; const { Tools } = A3DUtil;
const { ANIMATION_CONSTS } = DESIGNER_CONSTS; const { ANIMATION_CONSTS } = DESIGNER_CONSTS;
const detailColumns = (self) => {
return [
{
title: '属性',
dataIndex: 'label',
key: 'label',
width: '50%'
},{
title: '属性值',
dataIndex: 'value',
key: 'value',
width: '50%'
}]
};
/** /**
* 3d 执行器 * 3d 执行器
* *
...@@ -116,19 +99,6 @@ class StageActuator extends Component { ...@@ -116,19 +99,6 @@ class StageActuator extends Component {
if (dataItem.objParam.mtlPath && !dataItem.objParam.mtlPath.includes(dataItem.objParam.baseUrl)){ if (dataItem.objParam.mtlPath && !dataItem.objParam.mtlPath.includes(dataItem.objParam.baseUrl)){
dataItem.objParam.mtlPath = `${dataItem.objParam.baseUrl}${dataItem.objParam.mtlPath}`; dataItem.objParam.mtlPath = `${dataItem.objParam.baseUrl}${dataItem.objParam.mtlPath}`;
} }
// 常显
// if(alwaysShow && alwaysShow.length > 0){
// let div = document.getElementById(dataItem.eid);
// if(!div){
// this.objAnchorHelper.create({
// parent: dataItem,
// element: this.createPanel(dataItem.eid,dataItem.displayName || 'name','alwaysShow'),
// position: [dataItem.basicAttr.position.x, dataItem.basicAttr.position.y + 5, dataItem.basicAttr.position.z]
// });
// }
// }
} }
return dataItem; return dataItem;
}, fmtData => { }, fmtData => {
...@@ -339,23 +309,9 @@ class StageActuator extends Component { ...@@ -339,23 +309,9 @@ class StageActuator extends Component {
this.r3d.on('mouseout', (evt) => { this.r3d.on('mouseout', (evt) => {
// console.log('mouseout'); // console.log('mouseout');
}); });
}; };
getText(arr){
let text = '';
if(isArray(arr)){
arr.forEach(e => {
if(text != ''){
text += '\n'
}
text += e.key + ':' + e.value
});
return text;
}
}
createInfowindow = (text) => { createInfowindow = (text) => {
const div = document.createElement('div'); const div = document.createElement('div');
div.style.position = 'absolute'; div.style.position = 'absolute';
...@@ -453,15 +409,12 @@ class StageActuator extends Component { ...@@ -453,15 +409,12 @@ class StageActuator extends Component {
penProps={penProps} penProps={penProps}
enableParticles enableParticles
particlesProps={particlesProps} particlesProps={particlesProps}
onCreated={this.onGraphCreated} onCreated={this.onGraphCreated}
afterRender={this.afterRender} afterRender={this.afterRender}
handleModelParserData={this.handleModelParserData} handleModelParserData={this.handleModelParserData}
/> />
} }
<PlayTaskTabs content={this.props.content} ref={e => this.taskTabs = e}/> <PlayTaskTabs content={this.props.content} ref={e => this.taskTabs = e}/>
<Play <Play
playAll={this.playAll} playAll={this.playAll}
playPrev={this.playPrev} playPrev={this.playPrev}
...@@ -472,15 +425,12 @@ class StageActuator extends Component { ...@@ -472,15 +425,12 @@ class StageActuator extends Component {
playTargetAnimate={this.playTargetAnimate} playTargetAnimate={this.playTargetAnimate}
playing = {playing} playing = {playing}
/> />
<Modal <Modal
header='提示' header='提示'
visible={modal} visible={modal}
destroyContent destroyContent
width='20%' width='20%'
// onCancel={() => this.cancel()}
content={this.getContext()} content={this.getContext()}
// onOk={() => this.onOk()}
outterClosable={false} outterClosable={false}
footer={this.getFooter()} footer={this.getFooter()}
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment