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

src/view/bank/3dview/indexMap.js

@@ -359,7 +359,7 @@ class IndexMap extends Component {
   /**
    * 圆
    */
-  circleEvents = { click: () => {} };
+  circleEvents = { click: () => { } };
 
   /**
    * 线
@@ -821,22 +821,22 @@ class IndexMap extends Component {
 
   existData = (code, orgCode) => {
     let xianshi = false;
-    if ( code ){
+    if (code) {
       if (code.indexOf('#') !== -1) {
         let split = code.split('#') || [];
         split.map(item => {
 
-            if (item.indexOf('-') !== -1) {
-              let array = item.split('-') || [];
-              if (array.length > 0 && array[0] === orgCode) {
-                xianshi = true;
+          if (item.indexOf('-') !== -1) {
+            let array = item.split('-') || [];
+            if (array.length > 0 && array[0] === orgCode) {
+              xianshi = true;
 
-              }
-            }else{
-               if ( item === orgCode){
-                 xianshi = true;
-               }
             }
+          } else {
+            if (item === orgCode) {
+              xianshi = true;
+            }
+          }
 
         });
       } else {
@@ -872,8 +872,8 @@ class IndexMap extends Component {
         let newData = [];
 
         data.map(e => {
-          let xianshi = this.existData(e.code,orgCode);
-          let authOrgXianshi = this.existData(e.authOrg,orgCode);
+          let xianshi = this.existData(e.code, orgCode);
+          let authOrgXianshi = this.existData(e.authOrg, orgCode);
           if (xianshi || authOrgXianshi) {
             newData.push(e);
           }
@@ -1167,8 +1167,8 @@ class IndexMap extends Component {
             </BaseMap>
           </div>
         ) : (
-          <TwoDimensionalMap twoDimensionalMapConfig={twoDimensionalMapConfig}></TwoDimensionalMap>
-        )}
+            <TwoDimensionalMap twoDimensionalMapConfig={twoDimensionalMapConfig}></TwoDimensionalMap>
+          )}
         <div className="body-right">
           <RightCharts currentCode={orgCode} curCompanyId={sequenceNbr} patrolDetailView={this.patrolDetailView} chartsViewFlag={chartsViewFlag[0]} />
         </div>

src/view/bank/situation/warn/Warnings.js

@@ -178,6 +178,7 @@ class Warnings extends Component {
    * 搜索
    */
   onIconClick = (e, value) => {
+    if (value === undefined){ value = ''; }
     let { pageItem1 } = this.state;
     pageItem1[0].value = value;
     this.setState({