首页点击三维公司orgcode获取调整

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

@@ -662,41 +662,47 @@ class IndexMap extends Component {
    * 点击名称切换三维
    */
   markerOnClick = (city) => {
-    // let { orgCode } = this.getOrgCode(city, this.state.companys);
-    if (city === 'xian' || city === 'xianyang' || city === 'xidajie'){
     this.state.isOnClickCity=true;
+    let selectedCompanyOrg = lsTool.read('selectedCompanyOrg');
     let dictionaryList = lsTool.read('dictionaryList');
     let dicCodeList = JSON.parse(dictionaryList);
-      let orgCode = this.getSelectOrgCode(city, dicCodeList);
-      let selectedCompanyOrg = lsTool.read('selectedCompanyOrg');
     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 };
+      }else{
+         map = { 'is3DPage': true, 'city': '', 'orgCode': '' };
+      }
     } else {
-        //如果不是西安CCPC，orgCode为空
-        map = { 'is3DPage': true, 'city': city, 'orgCode': '' };
+      map = { 'is3DPage': true, 'city': '', 'orgCode': selectedCompanyOrg };
     }
 
     this.props.indexViewChange(map);
-    }
+
   }
 
   markerOnClick1 = (city,flag,id,  pointName,pointAttrs,floor,pointtype) => {
-   // let { orgCode } = this.getOrgCode(city, this.state.companys);
+
+    let selectedCompanyOrg = lsTool.read('selectedCompanyOrg');
     let dictionaryList = lsTool.read('dictionaryList');
     let dicCodeList = JSON.parse(dictionaryList);
-    let orgCode = this.getSelectOrgCode(city,dicCodeList);
-   // let selectedCompany = lsTool.read('selectedCompany');
-    let selectedCompanyOrg = lsTool.read('selectedCompanyOrg');
     let companyName = this.getSelectCityByOrgCode(selectedCompanyOrg, dicCodeList);
     let map = null;
-    if (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 };
         map = { 'is3DPage': true, 'city': city, 'orgCode': orgCode ,'flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype};
-       } else {
-      //如果不是西安CCPC，orgCode为空
+      }else{
         map = { 'is3DPage': true, 'city': city, 'orgCode': '','flag':flag ,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype};
       }
+    } else {
+      map = { 'is3DPage': true, 'city': city, 'orgCode': selectedCompanyOrg ,'flag':flag,'pid':id,'pointName':pointName,'pointAttrs':pointAttrs,'floor':floor,'pointtype':pointtype};
+    }
 
     this.props.indexViewChange(map);
   }