Skip to content

A
AmosBankView
Commit 8584caa4 authored by xinglei's avatar xinglei
Browse files
Options

首页跳转告警页

parent db00198a
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 96 deletions
src/styles/view/3dview/indexCharts.scss
View file @ 8584caa4
......@@ -791,6 +791,7 @@
position: absolute;
margin-top: 1px;
margin-left: 30px;
cursor: pointer;
}
.pulse-spread-div{
......@@ -806,6 +807,7 @@
animation: pulseAnim 1.5s ease-out;
animation-iteration-count: infinite;
z-index: 1;
cursor: pointer;
}
}
......@@ -829,6 +831,7 @@
position: absolute;
margin-left: 30px;
margin-top: 1px;
cursor: pointer;
}
.pulse-spread-div{
......@@ -844,6 +847,7 @@
animation: pulseAnim 1.5s ease-out;
animation-iteration-count: infinite;
z-index: 1;
cursor: pointer;
}
}
......@@ -873,6 +877,7 @@
position: absolute;
margin-top: 1px;
margin-left: 16px;
cursor: pointer;
}
.pulse-spread-div{
......@@ -888,6 +893,7 @@
animation: pulseAnim 1.5s ease-out;
animation-iteration-count: infinite;
z-index: 1;
cursor: pointer;
}
}
......@@ -917,6 +923,7 @@
position: absolute;
margin-top: 1px;
margin-left: 30px;
cursor: pointer;
}
.pulse-spread-div{
......@@ -932,6 +939,7 @@
animation: pulseAnim 1.5s ease-out;
animation-iteration-count: infinite;
z-index: 1;
cursor: pointer;
}
}
......@@ -961,6 +969,7 @@
position: absolute;
margin-top: 1px;
margin-left: 30px;
cursor: pointer;
}
.pulse-spread-div{
......@@ -976,6 +985,7 @@
animation: pulseAnim 1.5s ease-out;
animation-iteration-count: infinite;
z-index: 1;
cursor: pointer;
}
}
......
src/view/bank/3dview/indexChart.js
View file @ 8584caa4
......@@ -35,7 +35,7 @@ class IndexChart extends Component {
if(pointData && pointData.name && pointData.name === '西安'){
this.props.indexViewChange(true);
}else if (seriesType === 'lines') {
} else if (seriesType === 'lines') {
// window.localStorage.setItem('cityLine',JSON.stringify(pointData))
browserHistory.push({pathname: '/biz/defaultRoute',state: { cityLine: JSON.stringify(pointData) }});
......
src/view/bank/3dview/indexMap.js
View file @ 8584caa4
......@@ -365,12 +365,12 @@ class IndexMap extends Component {
click: (e) => {
let line = e.target.F.extData;
let pointData = { citys: line.name };
setTimeout(()=> {//设置延时判断点击的线还是点
setTimeout(() => {//设置延时判断点击的线还是点
let { isOnClickCity } = this.state;
if (isOnClickCity === false && line.name[0] === '西安') {
browserHistory.push({ pathname: '/biz/defaultRoute', state: { cityLine: JSON.stringify(pointData) } });
}
},500);
}, 500);
}
};
......@@ -560,7 +560,7 @@ class IndexMap extends Component {
<div className={`after_line_${type} line${item.id}`} style={styleCss} ></div>
<div className={`after_circle_title`}>
<span>{item.aName}</span>
{ item.status === 1 && <div className={`pulse-spread-circle`} /> }
{item.status === 1 && <div className={`pulse-spread-circle`} />}
</div>
</Marker>)
}
......@@ -604,8 +604,8 @@ class IndexMap extends Component {
return (<Marker key={item} zIndex={20} position={{ longitude: item.lng, latitude: item.lat }} events={this.markerEvents} extData={{ 'city': item.eName }}>
<div className={`after_circle_title_center`}>
<span onClick={() => { this.markerOnClick(item.eName) }}>{item.aName}</span>
{item.eName === 'xian' && xianVisible && <div className="pulse-spread-xian" /> }
{item.eName === 'xianyang' && xianyangVisible && <div className="pulse-spread-xianyang" /> }
{item.eName === 'xian' && xianVisible && <div className="pulse-spread-xian" />}
{item.eName === 'xianyang' && xianyangVisible && <div className="pulse-spread-xianyang" />}
</div>
<div className={`after_circle_center`}>
<img src="/src/assets/sy/center.png" onClick={() => { this.markerOnClick(item.eName) }}></img>
......@@ -661,81 +661,95 @@ class IndexMap extends Component {
/**
* 点击名称切换三维
*/
markerOnClick = (city) => {
this.state.isOnClickCity=true;
markerOnClick = (city, sourceIdStr) => {
//跳转告警页面
if (city !== 'xian' && city !== 'xianyang' && city !== 'xidajie'){
if (!sourceIdStr){
message.danger('该银行未绑定设备');
return;
}
let path = {
pathname: '/main/warn',
state: { sourceId: sourceIdStr }
};
browserHistory.push(path);
return;
}
this.state.isOnClickCity = true;
let selectedCompanyOrg = lsTool.read('selectedCompanyOrg');
let dictionaryList = lsTool.read('dictionaryList');
let dicCodeList = JSON.parse(dictionaryList);
let companyName = this.getSelectCityByOrgCode(selectedCompanyOrg, dicCodeList);
let map = null;
if(companyName && companyName.indexOf("清算中心") !== -1){
if (companyName && companyName.indexOf("清算中心") !== -1) {
let orgCode = this.getSelectOrgCode(city, dicCodeList);
if (city === 'xian' || city === 'xianyang' || city === 'xidajie'){
if (city === 'xian' || city === 'xianyang' || city === 'xidajie') {
map = { 'is3DPage': true, 'city': city, 'orgCode': orgCode };
}else{
map = { 'is3DPage': true, 'city': '', 'orgCode': '' };
} else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '' };
}
} else if (companyName && companyName.indexOf("科技处") !== -1){
// map = { 'is3DPage': true, 'city': '', 'orgCode': selectedCompanyOrg };
} else if (companyName && companyName.indexOf("科技处") !== -1) {
// map = { 'is3DPage': true, 'city': '', 'orgCode': selectedCompanyOrg };
let newOrgCode = null;
if(city === 'xian'){
if (city === 'xian') {
newOrgCode = this.getSelectOrgCode('科技处西安', dicCodeList);
} ;
};
if(city === 'xianyang') {
if (city === 'xianyang') {
newOrgCode = this.getSelectOrgCode('科技处咸阳', dicCodeList);
};
if (city === 'xian' || city === 'xianyang' || city === 'xidajie'){
if (city === 'xian' || city === 'xianyang' || city === 'xidajie') {
map = { 'is3DPage': true, 'city': city, 'orgCode': newOrgCode };
}else{
map = { 'is3DPage': true, 'city': '', 'orgCode': '' };
} else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '' };
}
}else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '' };
} else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '' };
}
this.props.indexViewChange(map);
}
markerOnClick1 = (city,flag,id, pointName,pointAttrs,floor,pointtype) => {
markerOnClick1 = (city, flag, id, pointName, pointAttrs, floor, pointtype) => {
this.state.isOnClickCity=true;
this.state.isOnClickCity = true;
let selectedCompanyOrg = lsTool.read('selectedCompanyOrg');
let dictionaryList = lsTool.read('dictionaryList');
let dicCodeList = JSON.parse(dictionaryList);
let companyName = this.getSelectCityByOrgCode(selectedCompanyOrg, dicCodeList);
let map = null;
if(companyName && companyName.indexOf("清算中心") !== -1){
if (companyName && companyName.indexOf("清算中心") !== -1) {
let orgCode = this.getSelectOrgCode(city, dicCodeList);
if (city === 'xian' || city === 'xianyang' || city === 'xidajie'){
map = { 'is3DPage': true, 'city': city, 'orgCode': orgCode ,'flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype};
}else{
map = { 'is3DPage': true, 'city': '', 'orgCode': '','flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype };
if (city === 'xian' || city === 'xianyang' || city === 'xidajie') {
map = { 'is3DPage': true, 'city': city, 'orgCode': orgCode, 'flag': flag, 'pid': id, 'pointName': pointName, 'pointAttrs': pointAttrs, 'floor': floor, 'pointtype': pointtype };
} else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '', 'flag': flag, 'pid': id, 'pointName': pointName, 'pointAttrs': pointAttrs, 'floor': floor, 'pointtype': pointtype };
}
} else if (companyName && companyName.indexOf("科技处") !== -1){
// map = { 'is3DPage': true, 'city': '', 'orgCode': selectedCompanyOrg };
} else if (companyName && companyName.indexOf("科技处") !== -1) {
// map = { 'is3DPage': true, 'city': '', 'orgCode': selectedCompanyOrg };
let newOrgCode = null;
if(city === 'xian'){
if (city === 'xian') {
newOrgCode = this.getSelectOrgCode('科技处西安', dicCodeList);
} ;
}
if(city === 'xianyang') {
if (city === 'xianyang') {
newOrgCode = this.getSelectOrgCode('科技处咸阳', dicCodeList);
};
}
if (city === 'xian' || city === 'xianyang' || city === 'xidajie'){
map = { 'is3DPage': true, 'city': city, 'orgCode': newOrgCode ,'flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype};
}else{
map = { 'is3DPage': true, 'city': '', 'orgCode': '','flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype };
if (city === 'xian' || city === 'xianyang' || city === 'xidajie') {
map = { 'is3DPage': true, 'city': city, 'orgCode': newOrgCode, 'flag': flag, 'pid': id, 'pointName': pointName, 'pointAttrs': pointAttrs, 'floor': floor, 'pointtype': pointtype };
} else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '', 'flag': flag, 'pid': id, 'pointName': pointName, 'pointAttrs': pointAttrs, 'floor': floor, 'pointtype': pointtype };
}
}else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '','flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype };
} else {
map = { 'is3DPage': true, 'city': '', 'orgCode': '', 'flag': flag, 'pid': id, 'pointName': pointName, 'pointAttrs': pointAttrs, 'floor': floor, 'pointtype': pointtype };
}
this.props.indexViewChange(map);
......@@ -760,17 +774,17 @@ class IndexMap extends Component {
let xianyangCode = this.getSelectOrgCode('xianyang', dicCodeList);
//登录的orgCode
let { orgCode } = this.state;
// let kejichuCode = this.getSelectOrgCode('科技处', dicCodeList);
// let qingsuanzhongxin = this.getSelectOrgCode('清算中心', dicCodeList);
// let kejichuCode = this.getSelectOrgCode('科技处', dicCodeList);
// let qingsuanzhongxin = this.getSelectOrgCode('清算中心', dicCodeList);
let kejichuxianCode = this.getSelectOrgCode('科技处西安', dicCodeList);
let kejichuxianyangCode = this.getSelectOrgCode('科技处咸阳', dicCodeList);
if ( orgCode !== '') {
if (orgCode !== '') {
getAlarms().then(data => {
//过滤该公司没有权限的设备（有则跑马灯显示，否则不显示）
let newData = [];
data.map(e =>{
if(( e.code.indexOf(orgCode) !==-1) || ( e.authOrg && e.authOrg.indexOf(orgCode) !==-1)){
data.map(e => {
if ((e.code.indexOf(orgCode) !== -1) || (e.authOrg && e.authOrg.indexOf(orgCode) !== -1)) {
newData.push(e);
}
})
......@@ -778,12 +792,12 @@ class IndexMap extends Component {
if (!utils.isEmpty(newData) && utils.isArray(newData)) {
const xianFlag = newData.some(e => {
// if (e.code === xianCode) {
if ( e.code.startsWith(xianCode) || (e.authOrg && e.authOrg.indexOf(xianCode) !== -1 || (e.authOrg && e.authOrg.indexOf(kejichuxianCode) !== -1))) {
if (e.code.startsWith(xianCode) || (e.authOrg && e.authOrg.indexOf(xianCode) !== -1 || (e.authOrg && e.authOrg.indexOf(kejichuxianCode) !== -1))) {
return true;
}
});
const xianyangFlag = newData.some(e => {
if (e.code.startsWith(xianyangCode) || (e.authOrg && e.authOrg.indexOf(xianyangCode) !== -1 || ( e.authOrg && e.authOrg.indexOf(kejichuxianyangCode) !== -1) )) {
if (e.code.startsWith(xianyangCode) || (e.authOrg && e.authOrg.indexOf(xianyangCode) !== -1 || (e.authOrg && e.authOrg.indexOf(kejichuxianyangCode) !== -1))) {
return true;
}
});
......@@ -838,13 +852,13 @@ class IndexMap extends Component {
if (!utils.isEmpty(data) && utils.isArray(data)) {
const xianFlag = data.some(e => {
//item.authOrg && item.authOrg.indexOf(xianCode)!==-1
if (e.code && e.code.indexOf(xianCode)!==-1) {
if (e.code && e.code.indexOf(xianCode) !== -1) {
return true;
}
});
const xianyangFlag = data.some(e => {
//xianyangCode
if (e.code && e.code.indexOf(xianyangCode)!==-1) {
if (e.code && e.code.indexOf(xianyangCode) !== -1) {
return true;
}
});
......@@ -1036,7 +1050,7 @@ class IndexMap extends Component {
</div> : 'none'
}*/}
{patrolView ? <PatrolDetail closePatrol={this.closePatrol} dataList={patrolDescData} markerOnClick1={this.markerOnClick1} /> : ''}
{patrolView ? <PatrolDetail closePatrol={this.closePatrol} dataList={patrolDescData} markerOnClick1={this.markerOnClick1} /> : ''}
{/*{patrolView && chartsViewFlag.length > 0 ? <PatrolDetail closePatrol={this.closePatrol} dataList={patrolDescData} /> : ''}
<IndexSidePane chartsView={this.chartsView} nowKey={chartsViewFlag} dotTipNum={dotTipNum} />*/}
......
src/view/bank/3dview/map/TwinkleDiv.js
View file @ 8584caa4
......@@ -13,7 +13,7 @@ class TwinkleDiv extends Component {
}
render() {
const { eName, aName, status, isCenter } = this.props.info;
const { eName, aName, status, isCenter, sourceIdStr } = this.props.info;
const { markerOnClick, styleCss } = this.props;
let color;
let visable = false;
......@@ -27,13 +27,12 @@ class TwinkleDiv extends Component {
backgroundColor: color
};
return (
<div className={eName} style={style} >
<span onClick={() => markerOnClick(eName)}>{aName}</span>
<span onClick={() => markerOnClick(eName, sourceIdStr)}>{aName}</span>
<div className={`${eName}-line`} style={style} />
{ visable && (eName === 'xian' || eName === 'xianyang') && <div className={`${eName} pulse-spread-circular`} /> }
{ visable && <div className={`${eName} pulse-spread-div`} onClick={() => markerOnClick(eName)} /> }
{ visable && <div className={`${eName} pulse-spread-div`} onClick={() => markerOnClick(eName, sourceIdStr)} /> }
</div>
);
}
......
src/view/bank/situation/warn/Warnings.js
View file @ 8584caa4
......@@ -109,7 +109,6 @@ class Warnings extends Component {
pageSize: 10,
total: 1
},
pageItem1: [
{
// name: 'alarmLevel',
......@@ -118,7 +117,6 @@ class Warnings extends Component {
value: ''
}
],
//搜索框查询参数
queryParams: {
searchValue: ''
......@@ -129,41 +127,17 @@ class Warnings extends Component {
}
componentDidMount() {
//this.getWarnings();
this.getWarningsByPage();
}
/**
* 获取告警信息列表
*/
getWarnings = () => {
getWarningsData().then((data) => {
if (data.dataList.content > 0) {
this.setState({
warnings: data.dataList.content
})
}
});
}
getQueryParams = () => {
let { queryParams, pageItem } = this.state;
let params = Object.assign({}, queryParams);
params.pageNumber = pageItem.current;
params.pageSize = pageItem.pageSize;
return params;
if (this.props.location.state) {
let sourceId = this.props.location.state.sourceId;
console.log(sourceId);
this.onIconClick(null, sourceId.toString());
} else {
this.getWarningsByPage();
}
}
getWarningsByPage = (arr) => {
// let { pageItem } = this.state;
// if (arr) {
// pageItem.current = arr;
// this.setState({ pageItem });
// }
// let params = this.getQueryParams();
let { queryParams, pageItem1, pageItem } = this.state;
let { pageItem1, pageItem } = this.state;
let current = pageItem.current;
if (arr) {
......@@ -179,11 +153,9 @@ class Warnings extends Component {
pageSize: data.size,
total: data.totalElements
}
})
let ddd = this.setState;
});
}
})
});
}
onSelectChange = (selectedRowKeys, selectionRows) => {
......@@ -206,11 +178,9 @@ class Warnings extends Component {
* 搜索
*/
onIconClick = (e, value) => {
let { queryParams, pageItem1 } = this.state;
let { pageItem1 } = this.state;
pageItem1[0].value = value;
// queryParams.searchValue = value;
this.setState({
// queryParams
pageItem1
}, () => {
this.getWarningsByPage(1);
......
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