Skip to content

A
amos-station-module-view
Commit 28f1cb4b authored by 张博's avatar 张博
Browse files
Options

bug

parent 7641b3fe
Expand all Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 85 deletions
mods/components/3dviewConvertor/styles/actionbar.scss
View file @ 28f1cb4b
.action-pane-data{ .action-pane-data {
position: absolute; position: absolute;
bottom: 5%; bottom: 5%;
left: 50%; left: 50%;
...@@ -7,46 +7,46 @@ ...@@ -7,46 +7,46 @@
.action-list { .action-list {
height: 40px; height: 40px;
padding: 0 1rem; padding: 0 1rem;
background-color: rgba(216, 216, 216, 0.24);
border: 1px solid rgba(146, 149, 151, 1);
border-radius: 6px; border-radius: 6px;
background:rgba(216,216,216,0.24);
border:1px solid rgba(146,149,151,1);
.action-item{ .action-item {
float: left; float: left;
width: 40px; width: 40px;
height: 38px; height: 38px;
text-align: center; text-align: center;
cursor: pointer ; cursor: pointer;
border:1px solid rgba(146,149,151,1); border: 1px solid rgba(146, 149, 151, 1);
.action-item-title{ .action-item-title {
color: #e0e0e0;
position: absolute; position: absolute;
top: -20px; top: -20px;
white-space: nowrap;
width: 51px; width: 51px;
-webkit-transform-origin-x: 0; color: #e0e0e0;
-webkit-transform: scale(0.80);
text-align: center; text-align: center;
white-space: nowrap;
-webkit-transform-origin-x: 0;
-webkit-transform: scale(0.8);
} }
.action-item-content{ .action-item-content {
text-align: center;
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: center;
.action-item-icon{ .action-item-icon {
margin: 8px; position: relative;
width: 21px; width: 21px;
height: 21px; height: 21px;
position: relative; margin: 8px;
} }
} }
} }
.action-active{ .action-active {
background: linear-gradient(180deg,rgba(0,96,154,0.8) 0%,rgba(0,54,105,0.5) 100%); background: linear-gradient(180deg, rgba(0, 96, 154, 0.8) 0%, rgba(0, 54, 105, 0.5) 100%);
} }
} }
} }
mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js
View file @ 28f1cb4b
/* eslint-disable react/prop-types */
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Connect, Modal, Tree,Select,Search,Button } from 'amos-framework'; import { Connect,Tree,Select,Search,Button } from 'amos-framework';
import * as endConf from 'amos-processor/lib/config/endconf';
import { getAreaTreeAction,saveAreaDataAction } from '../../services/moduleEditServices'
const eventConnect = Connect.eventConnect; const eventConnect = Connect.eventConnect;
const TreeNode = Tree.TreeNode; const TreeNode = Tree.TreeNode;
const Option = Select.Option; const Option = Select.Option;
...@@ -33,47 +31,41 @@ class PointLeftTree extends Component { ...@@ -33,47 +31,41 @@ class PointLeftTree extends Component {
autoExpandParent: true, autoExpandParent: true,
checkedKeys: [], checkedKeys: [],
selectedKeys: [], selectedKeys: [],
treeData:[], treeData: [],
pointTypeArr:[], pointTypeArr: [],
pointType:'', pointType: '',
treeDataList : [], treeDataList: [],
searchValue:'' searchValue: ''
}; };
} }
componentDidMount() { componentDidMount() {
let {treeData,pointTypeArr,treeDataList} = this.props; let { treeData,pointTypeArr,treeDataList } = this.props;
this.setState({ this.setState({
treeData, treeData,
treeDataList, treeDataList,
pointTypeArr, pointTypeArr,
pointType: pointTypeArr[0]?pointTypeArr[0].code:'' pointType: pointTypeArr[0] ? pointTypeArr[0].code : ''
}) });
// console.log(this.props)
} }
componentWillUnmount() {
}
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
console.log(nextProps) console.log(nextProps);
let {treeData,pointTypeArr,treeDataList} = nextProps; let { treeData,treeDataList } = nextProps;
this.setState({ this.setState({
treeData, treeData,
treeDataList, treeDataList
//pointTypeArr, });
//pointType: pointTypeArr[0]?pointTypeArr[0].code:''
})
} }
onSelectChange = (value, item) =>{ onSelectChange = (value, item) =>{
console.log(value, item); console.log(value, item);
this.setState({pointType:value}) this.setState({ pointType: value });
this.props.pointTypeChange(value); this.props.pointTypeChange(value);
} }
onSearchChange = e => { onSearchChange = e => {
const {treeDataList,treeData} = this.state const { treeDataList,treeData } = this.state;
const value = e.target.value; const value = e.target.value;
const expandedKeys = treeDataList const expandedKeys = treeDataList
.map(item => { .map(item => {
...@@ -91,9 +83,6 @@ class PointLeftTree extends Component { ...@@ -91,9 +83,6 @@ class PointLeftTree extends Component {
} }
onExpand = (expandedKeys) => { onExpand = (expandedKeys) => {
//console.log('onExpand', arguments);
// if not set autoExpandParent to false, if children expanded, parent can not collapse.
// or, you can remove all expanded children keys.
this.setState({ this.setState({
expandedKeys, expandedKeys,
autoExpandParent: false autoExpandParent: false
...@@ -107,10 +96,11 @@ class PointLeftTree extends Component { ...@@ -107,10 +96,11 @@ class PointLeftTree extends Component {
} }
// eslint-disable-next-line react/sort-comp
renderTreeNodes = (data) => { renderTreeNodes = (data) => {
let {searchValue} =this.state let { searchValue } = this.state;
// console.log(data); // console.log(data);
if (data.length>0) { if (data.length > 0) {
return data.map((item) => { return data.map((item) => {
const index = item.name.indexOf(searchValue); const index = item.name.indexOf(searchValue);
const beforeStr = item.name.substr(0, index); const beforeStr = item.name.substr(0, index);
...@@ -130,32 +120,37 @@ class PointLeftTree extends Component { ...@@ -130,32 +120,37 @@ class PointLeftTree extends Component {
<TreeNode <TreeNode
title={ title={
<div> <div>
{item.isRegion? {item.isRegion ?
<span> <span>
{title} {title}
<span className='icon'> <span className='icon'>
{ {
item.isRegion?item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />: // eslint-disable-next-line jsx-a11y/alt-text
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />: item.isRegion ? item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />: // eslint-disable-next-line jsx-a11y/alt-text
item.position3d?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' />: <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> :
// eslint-disable-next-line jsx-a11y/alt-text
item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
// eslint-disable-next-line jsx-a11y/alt-text
item.position3d ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' /> :
// eslint-disable-next-line jsx-a11y/alt-text
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
} }
</span> </span>
</span>: </span> :
<span <span
draggable={true} draggable
onDragStart={() => { onDragStart={() => {
this.props.dragItemChange(item) this.props.dragItemChange(item);
}} }}
> >
{title} {title}
<span className='icon'> <span className='icon'>
{ {
item.isRegion?item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />: item.isRegion ? item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />: <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> :
item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />: item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
item.position3d?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' />: item.position3d ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' /> :
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
} }
</span> </span>
...@@ -165,8 +160,9 @@ class PointLeftTree extends Component { ...@@ -165,8 +160,9 @@ class PointLeftTree extends Component {
key={item.id} key={item.id}
dataRef={item} dataRef={item}
onDragStart={() => { onDragStart={() => {
this.props.dragItemChange(item) this.props.dragItemChange(item);
}}> }}
>
{this.renderTreeNodes(item.children)} {this.renderTreeNodes(item.children)}
</TreeNode> </TreeNode>
); );
...@@ -184,18 +180,17 @@ class PointLeftTree extends Component { ...@@ -184,18 +180,17 @@ class PointLeftTree extends Component {
this.props.selectPointChange(selectItem); this.props.selectPointChange(selectItem);
} }
render() { render() {
let { treeData, checkedPointsKeys,pointTypeArr,pointType } = this.state; let { treeData,pointTypeArr,pointType } = this.state;
let { pageType } = this.props;
return ( return (
<div className="leftTree"> <div className="leftTree">
<div className='leftContainer'> <div className='leftContainer'>
<div className='topForm'> <div className='topForm'>
{(pointType!='') && {(pointType !== '') &&
<Select onChange={this.onSelectChange} defaultValue={pointType} value={pointType} className='leftSelect'> <Select onChange={this.onSelectChange} defaultValue={pointType} value={pointType} className='leftSelect'>
{ {
pointTypeArr.map(item => { pointTypeArr.map((item )=> {
return (<Option className='selectOption' value={item.code} >{item.name}</Option>) return (<Option key={item} className='selectOption' value={item.code} >{item.name}</Option>);
}) })
} }
</Select> </Select>
...@@ -205,14 +200,10 @@ class PointLeftTree extends Component { ...@@ -205,14 +200,10 @@ class PointLeftTree extends Component {
</div> </div>
<div className='treeBox'> <div className='treeBox'>
<Tree <Tree
// checkable selectable
// checkStrictly
selectable={true}
onExpand={this.onExpand} onExpand={this.onExpand}
expandedKeys={this.state.expandedKeys} expandedKeys={this.state.expandedKeys}
autoExpandParent={this.state.autoExpandParent} autoExpandParent={this.state.autoExpandParent}
// onCheck={this.onCheck}
// checkedKeys={checkedPointsKeys}
onSelect={this.onTreeSelect} onSelect={this.onTreeSelect}
selectedKeys={this.state.selectedKeys} selectedKeys={this.state.selectedKeys}
blockNode blockNode
...@@ -224,13 +215,15 @@ class PointLeftTree extends Component { ...@@ -224,13 +215,15 @@ class PointLeftTree extends Component {
<Button <Button
className='sureBtn' className='sureBtn'
onClick={() => { onClick={() => {
this.props.savePointData() this.props.savePointData();
}} ></Button> }}
/>
<Button <Button
className='deleteBtn' className='deleteBtn'
onClick={() => { onClick={() => {
this.props.deletePointBind() this.props.deletePointBind();
}} ></Button> }}
/>
</div> </div>
</div> </div>
......
mods/components/3dviewConvertor/view/moduleEditComponent/RightEditRegionPanel.js
View file @ 28f1cb4b
...@@ -87,7 +87,6 @@ class RightEditRegionPanel extends Component { ...@@ -87,7 +87,6 @@ class RightEditRegionPanel extends Component {
this.form.validate((valid, dataValues, errors) => { this.form.validate((valid, dataValues, errors) => {
console.log('返回内容:', dataValues, valid, errors); console.log('返回内容:', dataValues, valid, errors);
if (valid) { if (valid) {
let routePathData=[ { let routePathData=[ {
riskSourceId: detailData.id, riskSourceId: detailData.id,
routePath: JSON.stringify({ routePath: JSON.stringify({
...@@ -104,8 +103,10 @@ class RightEditRegionPanel extends Component { ...@@ -104,8 +103,10 @@ class RightEditRegionPanel extends Component {
}) })
} }
this.props.changeRoutePath(routePathDataNode); this.props.changeRoutePath(routePathDataNode);
this.props.closeRightPanel()
} else { } else {
console.log('error submit!!'); console.log('error submit!!');
this.props.closeRightPanel()
return false; return false;
} }
}); });
......
mods/components/3dviewConvertor/view/points/marker3DFactory.js
View file @ 28f1cb4b
...@@ -199,7 +199,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -199,7 +199,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
} }
buildMarkerOptions = (markers, markerType, defaultParams = {}) => { buildMarkerOptions = (markers, markerType, defaultParams = {}) => {
console.log(markers) console.log(markers);
const { isEditMode } = this.props; const { isEditMode } = this.props;
if (!utils.isEmpty(markers)){ if (!utils.isEmpty(markers)){
markers.forEach(m => { markers.forEach(m => {
...@@ -209,17 +209,17 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -209,17 +209,17 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
position = Object.values(m.position); position = Object.values(m.position);
} }
for (let k of Object.keys(defaultParams)) { for (let k of Object.keys(defaultParams)) {
if((markerType === 'riskSource' || markerType === 'patrol' ) && k != 'useModel' && !isEditMode){ if ((markerType === 'riskSource' || markerType === 'patrol' ) && k !== 'useModel' && !isEditMode){
m[k] = formatUrl(defaultParams[k], { url: `${markerType}-${m.level}` }); m[k] = formatUrl(defaultParams[k], { url: `${markerType}-${m.level}` });
}else if((markerType === 'riskSource' || markerType === 'patrol' ) && k != 'useModel' && isEditMode){ } else if ((markerType === 'riskSource' || markerType === 'patrol' ) && k !== 'useModel' && isEditMode){
if(markerType === 'riskSource'){ if (markerType === 'riskSource'){
m[k] = formatUrl(defaultParams[k], { url: `${markerType}-4` }); m[k] = formatUrl(defaultParams[k], { url: `${markerType}-4` });
}else{ } else {
m[k] = formatUrl(defaultParams[k], { url: `${markerType}-1` }); m[k] = formatUrl(defaultParams[k], { url: `${markerType}-1` });
} }
}else if(markerType === 'fireResource' && k != 'useModel' && isEditMode && urlMapper[m.type]){ } else if (markerType === 'fireResource' && k !== 'useModel' && isEditMode && urlMapper[m.type]){
m[k] = formatUrl(defaultParams[k], { url: `${urlMapper[m.type].file}`}); m[k] = formatUrl(defaultParams[k], { url: `${urlMapper[m.type].file}` });
}else{ } else {
m[k] = defaultParams[k]; m[k] = defaultParams[k];
} }
} }
...@@ -236,7 +236,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -236,7 +236,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
}; };
render() { render() {
const { markers,isEditMode, ...rest } = this.props; const { markers, isEditMode , ...rest } = this.props;
const { planStarted } = this.state; const { planStarted } = this.state;
let dialogStyle = { zIndex: 1000 }; let dialogStyle = { zIndex: 1000 };
......
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