Commit 05ed3a493c017a63b7b0b36eab20527c6ccf9c56

Authored by 潘钊
1 parent 69382307

解决 ang点击 消失问题

src/main/resources/static/index.html
@@ -101,6 +101,10 @@ tr.row-active td { @@ -101,6 +101,10 @@ tr.row-active td {
101 #route-container{ 101 #route-container{
102 display: none; 102 display: none;
103 } 103 }
  104 +
  105 +.page-content.active{
  106 + display: block !important;
  107 +}
104 </style> 108 </style>
105 109
106 <!-- ocLazyLoading载入文件的位置 --> 110 <!-- ocLazyLoading载入文件的位置 -->
@@ -226,17 +230,13 @@ tr.row-active td { @@ -226,17 +230,13 @@ tr.row-active td {
226 {{/each}} 230 {{/each}}
227 231
228 </script> 232 </script>
229 - <!--[if lt IE 9]>  
230 -<script src="/assets/plugins/respond.min.js"></script>  
231 -<script src="/assets/plugins/excanvas.min.js"></script>  
232 -<![endif]-->  
233 <!-- jQuery --> 233 <!-- jQuery -->
234 -<script src="/metronic_v4.5.4/plugins/jquery.min.js" ></script> 234 +<script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
235 <!-- bootstrap --> 235 <!-- bootstrap -->
236 -<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js" ></script> 236 +<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js" data-exclude=1></script>
237 <!-- MTRONIC JS --> 237 <!-- MTRONIC JS -->
238 -<script src="/metronic_v4.5.4/scripts/app.min.js" ></script>  
239 -<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js" ></script> 238 +<script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
  239 +<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js" data-exclude=1></script>
240 <!-- 虚拟滚动条 --> 240 <!-- 虚拟滚动条 -->
241 <script src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js" ></script> 241 <script src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js" ></script>
242 <!-- jsTree 树插件 --> 242 <!-- jsTree 树插件 -->
@@ -257,7 +257,7 @@ tr.row-active td { @@ -257,7 +257,7 @@ tr.row-active td {
257 <!-- PJAX --> 257 <!-- PJAX -->
258 <script src="/assets/plugins/jquery.pjax.js"></script> 258 <script src="/assets/plugins/jquery.pjax.js"></script>
259 <!-- layer 弹层 --> 259 <!-- layer 弹层 -->
260 -<script src="/assets/plugins/layer-v2.2/layer/layer.js"></script> 260 +<script src="/assets/plugins/layer-v2.2/layer/layer.js" data-exclude=1></script>
261 <!-- jquery.purl URL解析 --> 261 <!-- jquery.purl URL解析 -->
262 <script src="/assets/plugins/purl.js"></script> 262 <script src="/assets/plugins/purl.js"></script>
263 <!-- jquery.serializejson JSON序列化插件 --> 263 <!-- jquery.serializejson JSON序列化插件 -->
@@ -271,37 +271,37 @@ tr.row-active td { @@ -271,37 +271,37 @@ tr.row-active td {
271 271
272 <script src="/assets/plugins/pinyin.js"></script> 272 <script src="/assets/plugins/pinyin.js"></script>
273 <!-- 日期控件 --> 273 <!-- 日期控件 -->
274 -<script src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script> 274 +<script src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js" ></script>
275 <!-- 表格控件 --> 275 <!-- 表格控件 -->
276 -<script src="/metronic_v4.5.4/scripts/datatable.js" type="text/javascript"></script>  
277 -<script src="/metronic_v4.5.4/plugins/bootstrap-datatables/datatables.js" type="text/javascript"></script>  
278 -<script src="/metronic_v4.5.4/plugins/bootstrap-datatables/datatables.bootstrap.js" type="text/javascript"></script> 276 +<script src="/metronic_v4.5.4/scripts/datatable.js" ></script>
  277 +<script src="/metronic_v4.5.4/plugins/bootstrap-datatables/datatables.js" ></script>
  278 +<script src="/metronic_v4.5.4/plugins/bootstrap-datatables/datatables.bootstrap.js" ></script>
279 <!-- 地图相关 --> 279 <!-- 地图相关 -->
280 <!-- 百度 --> 280 <!-- 百度 -->
281 -<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" ></script>  
282 -<script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js" ></script> 281 +<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" data-exclude=1></script>
  282 +<script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js" data-exclude=1></script>
283 <!-- 高德 --> 283 <!-- 高德 -->
284 -<script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script> 284 +<script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda" data-exclude=1></script>
285 285
286 <script src="/assets/js/common.js"></script> 286 <script src="/assets/js/common.js"></script>
287 <!-- d3 --> 287 <!-- d3 -->
288 -<script src="http://apps.bdimg.com/libs/d3/3.4.8/d3.min.js"></script> 288 +<script src="http://apps.bdimg.com/libs/d3/3.4.8/d3.min.js" data-exclude=1></script>
289 289
290 <!-- TODO:angularJS相关库 --> 290 <!-- TODO:angularJS相关库 -->
291 291
292 <!-- angularJS相关库 --> 292 <!-- angularJS相关库 -->
293 <!-- 这个是基于angularjs 1.4.10修改的版本,主要是修改了history控制部分,用于兼容route和pjax的同时操作history的冲突 --> 293 <!-- 这个是基于angularjs 1.4.10修改的版本,主要是修改了history控制部分,用于兼容route和pjax的同时操作history的冲突 -->
294 -<script src="/assets/js/angular.js"></script>  
295 -<script src="/assets/bower_components/angular-resource/angular-resource.min.js"></script>  
296 -<script src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"></script>  
297 -<script src="/assets/bower_components/angular-touch/angular-touch.min.js"></script>  
298 -<script src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>  
299 -<script src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>  
300 -<script src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> 294 +<script src="/assets/js/angular.js" data-autocephaly=1></script>
  295 +<script src="/assets/bower_components/angular-resource/angular-resource.min.js" data-autocephaly=1></script>
  296 +<script src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js" data-autocephaly=1></script>
  297 +<script src="/assets/bower_components/angular-touch/angular-touch.min.js" data-autocephaly=1></script>
  298 +<script src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js" data-autocephaly=1></script>
  299 +<script src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js" data-autocephaly=1></script>
  300 +<script src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js" data-autocephaly=1></script>
301 <!-- schedule计划调度AngularJS模块主JS --> 301 <!-- schedule计划调度AngularJS模块主JS -->
302 -<script src="/pages/scheduleApp/module/main.js"></script> 302 +<script src="/pages/scheduleApp/module/main.js" data-autocephaly=1></script>
303 303
304 -<script type="text/javascript"> 304 +<script data-exclude=1>
305 //初始打开的片段地址 305 //初始打开的片段地址
306 var initFragment = "^_^initFragment^_^"; 306 var initFragment = "^_^initFragment^_^";
307 //静态文件目录 307 //静态文件目录
@@ -388,13 +388,13 @@ $(function(){ @@ -388,13 +388,13 @@ $(function(){
388 } 388 }
389 389
390 function showPjax(){ 390 function showPjax(){
391 - $(angJsContainer).removeClass('page-content').hide();  
392 - $(pjaxContainer).addClass('page-content').show(); 391 + $(angJsContainer).removeClass('page-content active').hide();
  392 + $(pjaxContainer).addClass('page-content active');
393 } 393 }
394 394
395 function showAngJs(){ 395 function showAngJs(){
396 - $(pjaxContainer).html('').removeClass('page-content').hide();  
397 - $(angJsContainer).addClass('page-content').show(); 396 + $(pjaxContainer).html('').removeClass('page-content active').hide();
  397 + $(angJsContainer).addClass('page-content active');
398 } 398 }
399 399
400 function activeLeftMenu(item){ 400 function activeLeftMenu(item){