Commit dc5baaf5 authored by xinglei's avatar xinglei

格式化代码

parent 3a321c1a
This diff is collapsed.
...@@ -359,7 +359,7 @@ class IndexMap extends Component { ...@@ -359,7 +359,7 @@ class IndexMap extends Component {
/** /**
* 圆 * 圆
*/ */
circleEvents = { click: () => {} }; circleEvents = { click: () => { } };
/** /**
* 线 * 线
...@@ -821,22 +821,22 @@ class IndexMap extends Component { ...@@ -821,22 +821,22 @@ class IndexMap extends Component {
existData = (code, orgCode) => { existData = (code, orgCode) => {
let xianshi = false; let xianshi = false;
if ( code ){ if (code) {
if (code.indexOf('#') !== -1) { if (code.indexOf('#') !== -1) {
let split = code.split('#') || []; let split = code.split('#') || [];
split.map(item => { split.map(item => {
if (item.indexOf('-') !== -1) { if (item.indexOf('-') !== -1) {
let array = item.split('-') || []; let array = item.split('-') || [];
if (array.length > 0 && array[0] === orgCode) { if (array.length > 0 && array[0] === orgCode) {
xianshi = true; xianshi = true;
}
}else{
if ( item === orgCode){
xianshi = true;
}
} }
} else {
if (item === orgCode) {
xianshi = true;
}
}
}); });
} else { } else {
...@@ -872,8 +872,8 @@ class IndexMap extends Component { ...@@ -872,8 +872,8 @@ class IndexMap extends Component {
let newData = []; let newData = [];
data.map(e => { data.map(e => {
let xianshi = this.existData(e.code,orgCode); let xianshi = this.existData(e.code, orgCode);
let authOrgXianshi = this.existData(e.authOrg,orgCode); let authOrgXianshi = this.existData(e.authOrg, orgCode);
if (xianshi || authOrgXianshi) { if (xianshi || authOrgXianshi) {
newData.push(e); newData.push(e);
} }
...@@ -1167,8 +1167,8 @@ class IndexMap extends Component { ...@@ -1167,8 +1167,8 @@ class IndexMap extends Component {
</BaseMap> </BaseMap>
</div> </div>
) : ( ) : (
<TwoDimensionalMap twoDimensionalMapConfig={twoDimensionalMapConfig}></TwoDimensionalMap> <TwoDimensionalMap twoDimensionalMapConfig={twoDimensionalMapConfig}></TwoDimensionalMap>
)} )}
<div className="body-right"> <div className="body-right">
<RightCharts currentCode={orgCode} curCompanyId={sequenceNbr} patrolDetailView={this.patrolDetailView} chartsViewFlag={chartsViewFlag[0]} /> <RightCharts currentCode={orgCode} curCompanyId={sequenceNbr} patrolDetailView={this.patrolDetailView} chartsViewFlag={chartsViewFlag[0]} />
</div> </div>
......
...@@ -178,6 +178,7 @@ class Warnings extends Component { ...@@ -178,6 +178,7 @@ class Warnings extends Component {
* 搜索 * 搜索
*/ */
onIconClick = (e, value) => { onIconClick = (e, value) => {
if (value === undefined){ value = ''; }
let { pageItem1 } = this.state; let { pageItem1 } = this.state;
pageItem1[0].value = value; pageItem1[0].value = value;
this.setState({ this.setState({
......
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