Skip to content

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

pointPool

parent e42dd624
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 3 deletions
mods/components/3dviewConvertor/view/PointsPool.js
View file @ 1884b7df
...@@ -120,6 +120,7 @@ class PointsPool extends Component { ...@@ -120,6 +120,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<PersonPoint3D <PersonPoint3D
{...rest} {...rest}
...@@ -135,6 +136,7 @@ class PointsPool extends Component { ...@@ -135,6 +136,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<FireResourcePoint <FireResourcePoint
{...rest} {...rest}
...@@ -144,6 +146,7 @@ class PointsPool extends Component { ...@@ -144,6 +146,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<FireResourcePoint <FireResourcePoint
{...rest} {...rest}
...@@ -153,6 +156,7 @@ class PointsPool extends Component { ...@@ -153,6 +156,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<FireResourcePoint <FireResourcePoint
{...rest} {...rest}
...@@ -162,6 +166,7 @@ class PointsPool extends Component { ...@@ -162,6 +166,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<FireResourcePoint <FireResourcePoint
{...rest} {...rest}
...@@ -171,6 +176,7 @@ class PointsPool extends Component { ...@@ -171,6 +176,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<FireResourcePoint <FireResourcePoint
{...rest} {...rest}
...@@ -180,6 +186,7 @@ class PointsPool extends Component { ...@@ -180,6 +186,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
{!hideDetector ? {!hideDetector ?
<FireResourcePoint <FireResourcePoint
...@@ -198,6 +205,7 @@ class PointsPool extends Component { ...@@ -198,6 +205,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<MonitorPoint <MonitorPoint
{...rest} {...rest}
...@@ -224,6 +232,7 @@ class PointsPool extends Component { ...@@ -224,6 +232,7 @@ class PointsPool extends Component {
addMarker={this.addMarker} addMarker={this.addMarker}
stagePilot={this.props.stagePilot} stagePilot={this.props.stagePilot}
selectPoints={this.props.selectPoints} selectPoints={this.props.selectPoints}
showRightPanelOnclick={(d)=>this.props.showRightPanelOnclick(d)}
/> />
<PointStatistics <PointStatistics
{...rest} {...rest}
...@@ -249,7 +258,8 @@ PointsPool.propTypes = { ...@@ -249,7 +258,8 @@ PointsPool.propTypes = {
isEditMode: PropTypes.bool, isEditMode: PropTypes.bool,
selectPoints: PropTypes.object, selectPoints: PropTypes.object,
stagePilot: PropTypes.object, stagePilot: PropTypes.object,
addMarker: PropTypes.func addMarker: PropTypes.func,
showRightPanelOnclick: PropTypes.func
}; };
......
mods/components/3dviewConvertor/view/panoramic/statistical/SafetyIndexWeek.js
View file @ 1884b7df
...@@ -138,10 +138,10 @@ class SafetyIndexWeek extends Component { ...@@ -138,10 +138,10 @@ class SafetyIndexWeek extends Component {
data: map.get('values'), data: map.get('values'),
type: 'line', type: 'line',
symbol: 'circle', //折线点设置为实心点 symbol: 'circle', //折线点设置为实心点
smooth: 0.6, smooth: 0.2,
itemStyle: { itemStyle: {
normal: { normal: {
color: 'rgba(255, 0, 0, 0.3)', //折线点的颜色 color: 'rgba(255, 0, 0, 0.2)' //折线点的颜色
// lineStyle: { // lineStyle: {
// width: 3, //折线宽度 // width: 3, //折线宽度
// color: '#DDBF28' //折线颜色 // color: '#DDBF28' //折线颜色
......
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