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

src/routes/asyncView.js

@@ -178,9 +178,9 @@ const Routes = {
   donghuan: AsyncDynamicRing,
   deviceMonitor: AsyncEquipMonitor,
   eqpAndMovingRing: AsyncEqpAndMovingRing,
-  selfSupport:AsyncSelfSupport,
-  financialCityLan:AsyncVirtualCloudPlatformSupport,
-  virtualCloudPlatform:AsyncFinancialCityLanSupport
+  selfSupport: AsyncSelfSupport,
+  financialCityLan: AsyncFinancialCityLanSupport,
+  virtualCloudPlatform: AsyncVirtualCloudPlatformSupport
 
 };
 

src/routes/view.js

@@ -174,10 +174,10 @@ const Routes = {
   eqpAndMovingRing: EqpAndMovingRing,
   //自建系统
   selfSupport: SelfSupport,
-  //虚拟云平台监控	
-  virtualCloudPlatform : VirtualCloudPlatform,
-  //金融城域网	
-  financialCityLan : FinancialCityLan
+  //虚拟云平台监控
+  virtualCloudPlatform: VirtualCloudPlatform,
+  //金融城域网
+  financialCityLan: FinancialCityLan
 };
 
 const pageCompontent = key => {

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

@@ -83,7 +83,7 @@ export const bizControls = [
     { key: 'level_1', label: '合格' },
     { key: 'level_0', label: '未计划' }
   ] },
-  { key: 'impEquipment-point', icon: 'zhongdianshebeixiangqing', type: 'impEquipment', label: '设备中心', subs: [
+  { key: 'impEquipment-point', icon: 'zhongdianshebeixiangqing', type: 'impEquipment', label: '设备点', subs: [
     { key: 'impEqu_01', label: '网络设备' },
     { key: 'impEqu_02', label: '服务器' },
     { key: 'impEqu_03', label: '虚拟设备' },

src/view/bank/3dview/indexCharts/leftCharts.js

@@ -193,7 +193,7 @@ class LeftCharts extends Component {
         dangerNumData: data,
         dangerAllNum: this.state.dangerAllNum
       });
-      if (data.result === 'FAILURE') { AmosAlert.error('警告', data.message);}
+      if (data.result === 'FAILURE' && data.message) { AmosAlert.error('警告', data.message);}
     });
 
     let  dates = {