Skip to content

A
AmosBankView
Commit 48925c86 authored by zhengjiangtao's avatar zhengjiangtao
Browse files
Options

Merge branch 'develop' of http://172.16.10.76/bank/AmosBankView into develop

parents 3c0ee6cd caf63335
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 22 deletions
src/consts/urlConsts.js
View file @ 48925c86
......@@ -145,7 +145,7 @@ export const FscSerUrl = {
bottomTableDataUrl: completePrefix(baseURI, 'bank/inspection/bottomTable'),
middleHeaderAction1:completePrefix(baseURI, 'bank/inspection/patrolPlanList?start={start}&end={end}&deptId={depId}&deptName={deptName}'),
getporintAction:completePrefix(baseURI, 'bank/inspection/getporint?pointid={pointid}'),
// 告警数据
alarmDataUrl: completePrefix(baseURI, 'bank/alarm/list'),
// impEquAlarmUrl: completePrefix(deviceURI, 'alarm/equipAttr'),
......
src/services/3dService.js
View file @ 48925c86
......@@ -294,3 +294,8 @@ export const BottomTableAction = ( ) => {
export const middleHeaderAction1 = (start, end,depId,deptName ) => {
return commonGet(formatUrl(FscSerUrl.middleHeaderAction1,{ start, end , depId, deptName }));
};
export const getporintAction = (pointid ) => {
return commonGet(formatUrl(FscSerUrl.getporintAction,{ pointid }));
};
\ No newline at end of file
src/view/bank/3dview/View3D.js
View file @ 48925c86
......@@ -470,19 +470,43 @@ class View3D extends Component {
this.timer = setTimeout(() => {
this.transferAlarmData();
let flag= this.props.flag;
debugger
if(flag&&flag===1){
let pointName= this.props.pointName;
let pointAttrs= this.props.pointAttrs;
let pid= this.props.pid;
this.onAlarmClick1('floor_3',{
//楼层
let floor= this.props.floor;
let pointtype= this.props.pointtype;
if(this.props.city==='xian'){
this.onAlarmClick1(pointtype,'floor_'+floor,{
'authOrg': null,
'code': "",
'content': "",
'id': 0,
'isAlarm': 0,
'pointAttrs': `{"position":"`+pointAttrs+`","storey":"`+floor+`"}`,
'pointId': pid,
'pointName': pointName,
'pointType': "3",
'sourceId': null,
'updateDate': "",
});
}else{
this.onAlarmClick1(pointtype,'xy_floor_'+floor,{
'authOrg': null,
'code': "",
'content': "",
'id': 0,
'isAlarm': 0,
'pointAttrs': `{"position":"`+pointAttrs+`","storey":"3"}`,
'pointAttrs': `{"position":"`+pointAttrs+`","storey":"`+floor+`"}`,
'pointId': pid,
'pointName': pointName,
'pointType': "3",
......@@ -490,6 +514,12 @@ class View3D extends Component {
'updateDate': "",
});
}
}
}, 1500);
......@@ -1323,7 +1353,7 @@ class View3D extends Component {
}
onAlarmClick1 = (type, item) => {
onAlarmClick1 = (pointtype,type, item) => {
this.clearAlarms();
this.clearMarkers();
const _this = this;
......@@ -1338,13 +1368,34 @@ class View3D extends Component {
// 延迟显示告警点
setTimeout(() => {_this.renderAlarmMarker1(type, item);}, 1100);
setTimeout(() => {_this.renderAlarmMarker1(pointtype,type, item);}, 1100);
}
}
});
}
if (type === FLOOR.FLOOR_XY) {
if (type === FLOOR.FLOOR_6) {
_this.objs.forEach( obj => {
if (obj.userData && obj.userData.key === FLOOR.FLOOR_6) {
if (!obj.isForceParent ) {
_this.outlineFactory.toggleOutline(obj);
_this.focusObject(obj);
// 延迟显示告警点
setTimeout(() => {_this.renderAlarmMarker1(pointtype,type, item);}, 1100);
}
}
});
}
if (type === FLOOR.XY_FLOOR_3) {
_this.objs.forEach( obj => {
if (obj.userData && obj.userData.key === FLOOR.XY_FLOOR_3) {
if (!obj.isForceParent ) {
......@@ -1353,7 +1404,7 @@ class View3D extends Component {
_this.focusObject(obj);
// 延迟显示告警点
setTimeout(() => {_this.renderAlarmMarker1(type, item);}, 1100);
setTimeout(() => {_this.renderAlarmMarker1(pointtype,type, item);}, 1100);
}
}
});
......@@ -1386,7 +1437,7 @@ class View3D extends Component {
renderAlarmMarker1 = (type, item) => {
renderAlarmMarker1 = (pointtype,type, item) => {
const { markers } = this.state;
const pointAttrs = JSON.parse(item.pointAttrs);
if (pointAttrs.position) {
......@@ -1418,7 +1469,7 @@ class View3D extends Component {
alarmPoint.position = pointPosition;
alarmPoint.title = item.pointName;
alarmPoint.sourceId = item.sourceId;
alarmPoint.twinkle = false;
alarmPoint.twinkle = pointtype;
alarmPoint.type = pointType === 3 ? 'patrol' : ((pointType === 2)||(pointType === 6)) ? 'dynamicRingData' : 'impEquipment';
let points = [];
points.push(alarmPoint);
......
src/view/bank/3dview/index.js
View file @ 48925c86
......@@ -34,6 +34,8 @@ class View3DRoot extends Component {
pid:null,
pointName:"",
pointAttrs:"",
floor:"",
pointtype:false,
};
this.pushTimeOutId = null;
}
......@@ -144,6 +146,10 @@ class View3DRoot extends Component {
pid:status.pid,
pointName:status.pointName,
pointAttrs:status.pointAttrs,
floor:status.floor,
pointtype:status.pointtype,
});
}else{
this.setState({
......@@ -167,7 +173,7 @@ class View3DRoot extends Component {
return (
<div className="sys-view-3d">
<AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
<Three3dView onLoadCompleted={this.onLoadCompleted} hiddenScreenSaver={this.hiddenScreenSaver} indexViewChange={this.indexViewChange} city={this.state.city} orgCode={this.state.orgCode} pointName={this.state.pointName} pointAttrs={this.state.pointAttrs} flag={this.state.flag} pid={this.state.pid} />
<Three3dView onLoadCompleted={this.onLoadCompleted} hiddenScreenSaver={this.hiddenScreenSaver} indexViewChange={this.indexViewChange} city={this.state.city} orgCode={this.state.orgCode} pointName={this.state.pointName} pointAttrs={this.state.pointAttrs} flag={this.state.flag} pid={this.state.pid} floor={this.state.floor} pointtype={this.state.pointtype}/>
{this.getScreenSaver()}
</div>
);
......
src/view/bank/3dview/indexCharts/rightChartChild/patrolDetail.js
View file @ 48925c86
......@@ -15,7 +15,7 @@ import { List } from 'amos-framework';
// import Three3dView from './View3D';
// import { eventTopics } from './consts';
// import IndexChart from './indexChart';
import { middleHeaderAction1 } from '../../../../../services/3dService';
import { middleHeaderAction1 ,getporintAction} from '../../../../../services/3dService';
const chartStyle = {
width: '100%', height: '100%'
};
......@@ -139,9 +139,18 @@ class PatrolDetail extends Component {
}
go3xq = (id,name,coordinates) => {
go3xq = (id,name,coordinates,floor) => {
debugger
this.props.markerOnClick1("xian",1,id,name,coordinates);
getporintAction(id).then(data => {
if(data!=null){
this.props.markerOnClick1(data.cstype,1,id,name,coordinates,floor,data.pointtype);
}
});
}
......@@ -191,24 +200,24 @@ go3xq = (id,name,coordinates) => {
if (f.isFinish==='0'){
return (
<Tooltip className="item" title={ f.name } direction="up" align="middle">
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#CCCCCC' }} ></div>
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates,f.floor)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#CCCCCC' }} ></div>
</Tooltip>
);
} else if(f.isFinish==='1'){
return (
<Tooltip className="item" title={ f.name } direction="up" align="middle">
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#00FF00' }} ></div>
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates,f.floor)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#00FF00' }} ></div>
</Tooltip>
);
} else if(f.isFinish==='2'){
return (
<Tooltip className="item" title={ f.name } direction="up" align="middle">
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#FFFF33' }} ></div>
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates,f.floor)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#FFFF33' }} ></div>
</Tooltip>
);
} else{
return <Tooltip className="item" title={ f.name } direction="up" align="middle">
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#FF0000' }} ></div>
<div onClick={ () => {this.go3xq(f.id,f.name,f.coordinates,f.floor)} } style={{ width: '17px' ,height: '17px' ,border: '1px solid #fff',margin:'3px' ,float:'left',background:'#FF0000' }} ></div>
</Tooltip>
}
})
......
src/view/bank/3dview/indexMap.js
View file @ 48925c86
......@@ -732,7 +732,7 @@ class IndexMap extends Component {
}
}
markerOnClick1 = (city,flag,id, pointName,pointAttrs) => {
markerOnClick1 = (city,flag,id, pointName,pointAttrs,floor,pointtype) => {
// let { orgCode } = this.getOrgCode(city, this.state.companys);
let dictionaryList = lsTool.read('dictionaryList');
let dicCodeList = JSON.parse(dictionaryList);
......@@ -742,10 +742,10 @@ class IndexMap extends Component {
let companyName = this.getSelectCityByOrgCode(selectedCompanyOrg, dicCodeList);
let map = null;
if (companyName.indexOf("清算中心")!==-1){
map = { 'is3DPage': true, 'city': city, 'orgCode': orgCode ,'flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs};
} else {
map = { 'is3DPage': true, 'city': city, 'orgCode': orgCode ,'flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype};
} else {
//如果不是西安CCPC，orgCode为空
map = { 'is3DPage': true, 'city': city, 'orgCode': '','flag':flag ,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs};
map = { 'is3DPage': true, 'city': city, 'orgCode': '','flag':flag ,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype};
}
this.props.indexViewChange(map);
......
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