Commit 4b1cf8f0c4104c461bfe4fccaed95e948a512595

Authored by 潘钊
1 parent 43a47fb4

update...

src/main/resources/fatso/handle_real_ctl.js
@@ -25,7 +25,7 @@ var pName = 'bsth_control' @@ -25,7 +25,7 @@ var pName = 'bsth_control'
25 25
26 var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html'; 26 var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html';
27 var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html'; 27 var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html';
28 -var aloneHomeWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'home'+sp+'alone_wrap.html'; 28 +var aloneHomeWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'home'+sp+'home_wrap.html';
29 var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html'; 29 var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html';
30 var realCtl = { 30 var realCtl = {
31 /** 31 /**
src/main/resources/static/real_control_v2/alone_page/home/home_wrap.html
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 } 55 }
56 56
57 #main-tab-content>.home-panel>#home-main-content{ 57 #main-tab-content>.home-panel>#home-main-content{
58 - overflow: inherit; 58 + overflow: inherit !important;
59 } 59 }
60 </style> 60 </style>
61 </head> 61 </head>
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
@@ -92,15 +92,15 @@ @@ -92,15 +92,15 @@
92 <script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script> 92 <script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script>
93 <!-- jquery.serializejson JSON序列化插件 --> 93 <!-- jquery.serializejson JSON序列化插件 -->
94 <script src="/assets/plugins/jquery.serializejson.js" merge="uikit_js"></script> 94 <script src="/assets/plugins/jquery.serializejson.js" merge="uikit_js"></script>
  95 +
  96 +</body>
95 <script> 97 <script>
96 (function () { 98 (function () {
97 - gb_data_gps.fixedTimeRefresh();  
98 //嵌入地图页面 99 //嵌入地图页面
99 $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () { 100 $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
100 $('.map-system-msg.flex-left').remove(); 101 $('.map-system-msg.flex-left').remove();
  102 + gb_data_gps.fixedTimeRefresh();
101 }); 103 });
102 })(); 104 })();
103 </script> 105 </script>
104 -</body>  
105 -  
106 </html> 106 </html>