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

d8bc10d6 · zhengjiangtao · b230dc91 · 05e6152c · d8bc10d6 · d8bc10d6
Commit d8bc10d6 authored Jul 15, 2020 by zhengjiangtao
Expand all Show whitespace changes
Inline Side-by-side

Showing with 76 additions and 92 deletions

amos.config.js amos.config.js +2 -2

leftCharts.js src/view/bank/3dview/indexCharts/leftCharts.js +74 -90

No files found.
--- a/amos.config.js
+++ b/amos.config.js
@@ -61,10 +61,10 @@
      isAutoOpenBussiness: true,
      //内外部地图加载，outMap是true 使用离线地图， false使用在线地图
      outMap: true,
-	  evaluateModelId: 11
+      evaluateModelId: 11 //配置评价方法ID
    },
    //添加关联设备弹出框标识  'bank'代表银行   'fireAutoSys'代表换流站
-     equipmentIdentification:'bank',
+    equipmentIdentification: 'bank',

    // 屏保配置信息
    screenSaverConf: {

--- a/src/view/bank/3dview/indexCharts/leftCharts.js
+++ b/src/view/bank/3dview/indexCharts/leftCharts.js