Commit 5c6ff814c127d28fcad4bbb09ff1774a03bc5843

Authored by 潘钊
1 parent 02132d33

update...

src/main/resources/static/real_control_v2/alone_page/map/alone_data_basic.js
@@ -12,7 +12,8 @@ var gb_data_basic = (function () { @@ -12,7 +12,8 @@ var gb_data_basic = (function () {
12 device2nbbmMap = gb_common.inverse(nbbm2deviceMap); 12 device2nbbmMap = gb_common.inverse(nbbm2deviceMap);
13 allPersonnel = all_personnel; 13 allPersonnel = all_personnel;
14 svgAttrs = svgAttrMap; 14 svgAttrs = svgAttrMap;
15 - //gb_main_ep.emitLater('data-basic'); 15 +
  16 + res_load_ep.emitLater('data-basic');
16 }); 17 });
17 18
18 var storage = window.localStorage; 19 var storage = window.localStorage;
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
46 46
47 <body> 47 <body>
48 <div class="main-container" style="height: 100%;"> 48 <div class="main-container" style="height: 100%;">
  49 + <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
49 </div> 50 </div>
50 51
51 <!-- 地图相关 --> 52 <!-- 地图相关 -->
@@ -102,9 +103,12 @@ @@ -102,9 +103,12 @@
102 </body> 103 </body>
103 <script> 104 <script>
104 gb_data_gps.fixedTimeRefresh(); 105 gb_data_gps.fixedTimeRefresh();
105 - //嵌入地图页面  
106 - $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {  
107 - $('.map-system-msg.flex-left').remove(); 106 + var res_load_ep = EventProxy.create('data-basic', function () {
  107 +
  108 + //嵌入地图页面
  109 + $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
  110 + $('.map-system-msg.flex-left').remove();
  111 + });
108 }); 112 });
109 113
110 var isArray = function (obj) { 114 var isArray = function (obj) {