Skip to content

A
amos-station-module-view
Commit 872063cb authored by baoshuang's avatar baoshuang
Browse files
Options

解决冲突

parents b9166369 e17d3cef
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 67 deletions
amos.config.js
View file @ 872063cb
......@@ -12,7 +12,9 @@
// 根url
// baseURI: 'http://172.16.11.30:9008/',
baseURI: 'http://172.16.3.122:8083/',
// convertorURI: 'http://172.16.3.122:8083/',
convertorURI: 'http://172.16.3.122:8083/',
patrolURI: 'http://172.16.3.122:8082/',
rulesConfigURI: 'http://172.16.10.91:8080/',
// plugin URI
pluginURI: 'http://172.16.11.40:8099/',
......@@ -45,7 +47,7 @@
delayTime: 10 // 屏保出现时间(单位：秒) 10s
},
//三维模型配置 yinan 沂南站 shm 上海庙站 sn 苏南 hainan 海南站
view3dFile:'/mods/components/3dviewConvertor/threeres/models/shm/index.json',
view3dFile:'/mods/components/3dviewConvertor/threeres/models/shm/index_dev.json',
}
}
};
......
mods/components/3dviewConvertor/styles/actionbar.scss
View file @ 872063cb
......@@ -20,21 +20,28 @@
border:1px solid rgba(146,149,151,1);
.action-item-title{
color: rgb(224, 224, 224);
position: relative;
top: -23px;
font-size:1vw;
color: #e0e0e0;
position: absolute;
top: -20px;
white-space: nowrap;
width: 38px;
-webkit-transform-origin-x: 0;
-webkit-transform: scale(0.60);
white-space: nowrap;
text-align: end;
}
.action-item-icon{
width: 21px;
height: 21px;
top: -16px;
.action-item-content{
text-align: center;
position: relative;
width: 100%;
height: 100%;
.action-item-icon{
margin: 8px;
width: 21px;
height: 21px;
position: relative;
}
}
}
......
mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss
View file @ 872063cb
......@@ -202,6 +202,8 @@
right: 0;
top: 0;
z-index: 1;
.echart-week {
width: 321px !important;
height: 248px !important;
......
mods/components/3dviewConvertor/view/PointsPool.js
View file @ 872063cb
......@@ -4,7 +4,7 @@ import { Connect } from 'amos-framework';
import { Store } from 'amos-tool';
import { connect3D } from 'amos-3d/lib/designer';
import { RiskPoint, PatrolPoint, PersonPoint3D, MonitorPoint, ProbePoint,
FireResourcePoint, EquipmentPoint, FireCar3D, FirePoint, WorkerMen3D, PointStatistics } from './points';
FireResourcePoint, EquipmentPoint, FireCar3D, FirePoint, WorkerMen3D, PointStatistics, ImpEquipmentMode } from './points';
import { eventTopics, isPointEvent , isLevelFilter } from './consts';
import { parseMarkers, parseLevelFilter, objRunning } from './dataProcessor';
......@@ -193,6 +193,11 @@ class PointsPool extends Component {
markers={markers.statistics}
onCreated={(val) => this.onMarkersCreated('statistics', val)}
/>
<ImpEquipmentMode
{...rest}
markers={markers.impEquipmentMode}
onCreated={(val) => this.onMarkersCreated('impEquipmentMode', val)}
/>
</Shuttle>
);
}
......
mods/components/3dviewConvertor/view/View3D.js
View file @ 872063cb
......@@ -1224,23 +1224,13 @@ class View3D extends Component {
const { markers } = this.state;
pointModelistAction(actionType).then(d =>{
// if (markerType === 'fireResource') {
markers['hydrant'] = d['hydrant'];
markers['monitorEquipment'] = d['monitorEquipment'];
markers['fireCar'] = d['fireCar'];
markers['impEquipment'] = d['impEquipment'];
markers['fireChamber'] = d['fireChamber'];
markers['pool'] = d['pool'];
markers['impEquipmentMode'] = d.filter(item => item.position != null);
// markers[markerType] = d;
this.setState({
markers
markers,
// markerType: "monitorEquipment"
});
return;
// }
// markers[markerType] = d;
// this.setState({
// markers,
// markerType
// });
});
}
......
mods/components/3dviewConvertor/view/actionbar/index.js
View file @ 872063cb
......@@ -51,7 +51,9 @@ class ActionBar extends Component {
<div className="action-item-title">
<p className="">{a.label}</p>
</div>
<img className="action-item-icon" src={require(`./../../assets/convertor/3dview/actionbars/${a.icon}.png`)} />
<div className="action-item-content">
<img className="action-item-icon" src={require(`./../../assets/convertor/3dview/actionbars/${a.icon}.png`)} />
</div>
</div>
);
})
......
mods/components/3dviewConvertor/view/moduleEditComponent/AreaLeftTree.js
View file @ 872063cb
......@@ -24,7 +24,7 @@ class AreaLeftTree extends Component {
pointTypeArr:[],
pointType:''
};
}
componentDidMount() {
......@@ -37,7 +37,7 @@ class AreaLeftTree extends Component {
}
componentWillUnmount() {
}
componentWillReceiveProps(nextProps) {
console.log(nextProps)
......@@ -62,7 +62,7 @@ class AreaLeftTree extends Component {
}
onExpand = (expandedKeys) => {
console.log('onExpand', arguments);
//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({
......@@ -91,7 +91,7 @@ class AreaLeftTree extends Component {
// }else {
// this.props.stopDrowing()
// }
// }
drowArea = (editItem) => {
......@@ -110,7 +110,7 @@ class AreaLeftTree extends Component {
return data.map((item) => {
if (item.children) {
return (
<TreeNode
<TreeNode
title={
<div>
{
......@@ -119,8 +119,8 @@ class AreaLeftTree extends Component {
<span className='icon'>
{
item.isBind?'':
<img
src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/editBtn.png'
<img
src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/editBtn.png'
onClick={(e) => {
e.nativeEvent.stopImmediatePropagation();
e.stopPropagation();
......@@ -137,16 +137,16 @@ class AreaLeftTree extends Component {
</span>
}
</div>
}
key={item.id}
}
key={item.id}
dataRef={item}
>
{this.renderTreeNodes(item.children)}
</TreeNode>
);
}
return <TreeNode
key={item.id}
return <TreeNode
key={item.id}
title={
<div>
{
......@@ -155,8 +155,8 @@ class AreaLeftTree extends Component {
<span className='icon'>
{
item.isBind?'':
<img
src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/editBtn.png'
<img
src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/editBtn.png'
onClick={(e) => {
e.nativeEvent.stopImmediatePropagation();
e.stopPropagation();
......@@ -173,15 +173,15 @@ class AreaLeftTree extends Component {
</span>
}
</div>
}
}
dataRef={item}
{...item}
/>;
});
}
}
render() {
let { treeData, checkedKeys,pointTypeArr,pointType } = this.state;
......@@ -210,19 +210,19 @@ class AreaLeftTree extends Component {
</Tree>
</div>
<div className='bottomBtns'>
<Button
<Button
className='sureBtn'
onClick={() => {
this.props.saveAreaData()
}} ></Button>
<Button
<Button
className='deleteBtn'
onClick={() => {
this.props.deleteAreaBind()
}} ></Button>
</div>
</div>
</div>
);
}
......
mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js
View file @ 872063cb
......@@ -24,7 +24,7 @@ class PointLeftTree extends Component {
pointTypeArr:[],
pointType:''
};
}
componentDidMount() {
......@@ -38,7 +38,7 @@ class PointLeftTree extends Component {
}
componentWillUnmount() {
}
componentWillReceiveProps(nextProps) {
console.log(nextProps)
......@@ -49,7 +49,7 @@ class PointLeftTree extends Component {
pointType: pointTypeArr[0]?pointTypeArr[0].code:''
})
}
onSelectChange = (value, item) =>{
console.log(value, item);
this.state.pointType = value;
......@@ -63,7 +63,7 @@ class PointLeftTree extends Component {
}
onExpand = (expandedKeys) => {
console.log('onExpand', arguments);
//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({
......@@ -73,11 +73,11 @@ class PointLeftTree extends Component {
}
onCheck = (checkedKeys,e) => {
console.log('onCheck', checkedKeys,e);
this.setState({ checkedPointsKeys: checkedKeys });
this.props.selectPointChange(checkedKeys);
}
renderTreeNodes = (data) => {
// console.log(data);
......@@ -85,7 +85,7 @@ class PointLeftTree extends Component {
return data.map((item) => {
if (item.children) {
return (
<TreeNode
<TreeNode
title={
<div>
{item.isRegion?
......@@ -101,7 +101,7 @@ class PointLeftTree extends Component {
}
</span>
</span>:
<span
<span
draggable={true}
onDragStart={() => {
this.props.dragItemChange(item)
......@@ -119,8 +119,8 @@ class PointLeftTree extends Component {
</span>
</span>}
</div>
}
key={item.id}
}
key={item.id}
dataRef={item}
onDragStart={() => {
this.props.dragItemChange(item)
......@@ -129,8 +129,8 @@ class PointLeftTree extends Component {
</TreeNode>
);
}
return <TreeNode
key={item.id}
return <TreeNode
key={item.id}
title={
<div>
{item.isRegion?
......@@ -146,7 +146,7 @@ class PointLeftTree extends Component {
}
</span>
</span>:
<span
<span
draggable={true}
onDragStart={() => {
this.props.dragItemChange(item)
......@@ -164,16 +164,16 @@ class PointLeftTree extends Component {
</span>
</span>}
</div>
}
}
dataRef={item}
{...item}
// onClick={() => {console.log('aaa')}}
{...item}
// onClick={() => {console.log('aaa')}}
/>;
});
}
}
onTreeSelect = (selectedKeys, info) => {
// e.nativeEvent.stopImmediatePropagation();
console.log('onSelect', info);
......@@ -182,7 +182,7 @@ class PointLeftTree extends Component {
this.props.selectPointChange(selectItem)
}
render() {
......@@ -221,19 +221,19 @@ class PointLeftTree extends Component {
</Tree>
</div>
<div className='bottomBtns'>
<Button
<Button
className='sureBtn'
onClick={() => {
this.props.savePointData()
}} ></Button>
<Button
<Button
className='deleteBtn'
onClick={() => {
this.props.deletePointBind()
}} ></Button>
</div>
</div>
</div>
);
}
......
mods/components/3dviewConvertor/view/points/index.js
View file @ 872063cb
......@@ -126,3 +126,11 @@ export const PointStatistics = markerFactory(BasicPoint,
markerType: 'statistics'
}
);
/**
* 重点设备模式
*/
export const ImpEquipmentMode = markerFactory(BasicPoint,
{
markerType: 'impEquipmentMode'
}
);
\ No newline at end of file
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