潘钊 / bsth_control · Commits

Commit bbf95631654ca264a75bdb2350ada705e84c3554

Authored by 王通
2 parents 5b388536 ff00b350

Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 2 changed files with 146 additions and 145 deletions
src/main/resources/static/index.html
  View file @bbf9563
... ... @@ -287,7 +287,7 @@
287 287 </div>
288 288 <div class="page-content-wrapper">
289 289 <div id="pjax-container" class="page-content"></div>
290   -
  290 + <a name="xd_position"></a>
291 291 <div id="route-container">
292 292 <div ng-app="ScheduleApp">
293 293 <div ng-controller="ScheduleAppController">
... ... @@ -339,9 +339,9 @@
339 339  
340 340 </script>
341 341 <script>
342   - delete window.require;
343   - delete window.exports;
344   - delete window.module;
  342 + delete window.require;
  343 + delete window.exports;
  344 + delete window.module;
345 345 </script>
346 346 <!-- jQuery -->
347 347 <script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
... ... @@ -415,145 +415,145 @@
415 415 <!-- tipso JS -->
416 416 <script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
417 417 <script data-exclude=1>
418   - //初始打开的片段地址
419   - var initFragment = "^_^initFragment^_^";
420   - //静态文件目录
421   - var dir = '/pages/';
422   - //片段容器
423   - var pjaxContainer = '#pjax-container'
424   - , angJsContainer = '#route-container';
425   -
426   - $(document).ajaxError(function (event, jqxhr, settings, thrownError) {
427   - if(jqxhr.status == 403){
428   - layer.closeAll();
429   - layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
430   - }
431   - });
432   -
433   - $(function () {
434   - $.get('/user/currentUser', function (user) {
435   - $('#indexTopUName').text(user.userName);
436   - });
437   -
438   - //带 data-pjax 的链接由pjax加载
439   - $(document).pjax('a[data-pjax]', pjaxContainer);
440   -
441   - //pjax左菜单点击事件
442   - $(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
443   - setTitle(this);
444   -
445   - $('#leftMenuSidebar li.nav-item.active').removeClass('active');
446   - $(this).parent().addClass('active');
447   - showPjax();
448   - });
449   -
450   - //angularjs左菜单点击事件
451   - $(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
452   - setTitle(this);
453   -
454   - $('#leftMenuSidebar li.nav-item.active').removeClass('active');
455   - $(this).parent().addClass('active');
456   - showAngJs();
457   - });
458   -
459   - //加载左菜单栏
460   - $get('/module/findByCurrentUser', null,
461   - function (ms) {
462   - var treeArray = createTreeData(ms);
463   - treeArray.sort(function (a, b) {
464   - return a.createDate - b.createDate;
465   - });
466   - var menuHtml = template('menu_list_temp', {list: treeArray});
467   - $('#leftMenuSidebar').html(menuHtml);
468   -
469   - //----------- 检查URL ----------------
470   - var h = location.hash;
471   - if (initFragment && initFragment != '') {
472   - showPjax();
473   - //普通片段
474   - loadPage(initFragment);
475   - //选中菜单
476   - $.each($('#leftMenuSidebar a'), function (i, item) {
477   - if (urlPattern($(item).attr('href'), initFragment)) {
478   - activeLeftMenu(item);
479   - }
480   - });
481   - } else if (h) {
482   - //angularjs片段
483   - showAngJs();
484   - //选中菜单
485   - $.each($('#leftMenuSidebar a'), function (i, item) {
486   - if ($(item).attr('href') == h) {
487   - activeLeftMenu(item);
488   - }
489   - });
490   - }
491   - else {
492   - //加载主页
493   - loadPage('/pages/home.html');
494   - }
495   - });
496   -
497   - //修改密码
498   - $('#changePWD').on('click', function () {
499   - $.get('/pages/permission/user/changePWD.html', function (content) {
500   - layer.open({
501   - type: 1,
502   - area: ['600px', '360px'],
503   - content: content,
504   - title: '修改密码',
505   - shift: 5,
506   - scrollbar: false,
507   - success: function () {
508   - }
509   - });
510   - });
511   - });
512   - });
513   -
514   - //modal关闭时销毁dom
515   - $(document).on('hidden.bs.modal', '.modal', function () {
516   - $(this).remove();
517   - });
518   -
519   - //pjax加载完成事件
520   - $(document).on('pjax:success', function () {
521   - var dicts = $(pjaxContainer).find('.nt-dictionary');
522   - dictionaryUtils.transformDom(dicts);
523   - });
524   -
525   - function loadPage(url) {
526   - $.pjax({url: url, container: pjaxContainer})
527   - }
528   -
529   - function urlPattern(a, b) {
530   - var r;
531   - try {
532   - r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
533   - } catch (e) {
534   - r = false;
535   - }
536   - return r;
537   - }
538   -
539   - function showPjax() {
540   - $(angJsContainer).removeClass('page-content active').hide();
541   - $(pjaxContainer).addClass('page-content active');
542   - }
543   -
544   - function showAngJs() {
545   - $(pjaxContainer).html('').removeClass('page-content active').hide();
546   - $(angJsContainer).addClass('page-content active');
547   - }
548   -
549   - function activeLeftMenu(item) {
550   - $(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
551   - setTitle(item);
552   - }
553   -
554   - function setTitle(menuItem){
555   - document.title = $('span.title', menuItem).text();
556   - }
  418 + //初始打开的片段地址
  419 + var initFragment = "^_^initFragment^_^";
  420 + //静态文件目录
  421 + var dir = '/pages/';
  422 + //片段容器
  423 + var pjaxContainer = '#pjax-container'
  424 + , angJsContainer = '#route-container';
  425 +
  426 + $(document).ajaxError(function (event, jqxhr, settings, thrownError) {
  427 + if(jqxhr.status == 403){
  428 + layer.closeAll();
  429 + layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
  430 + }
  431 + });
  432 +
  433 + $(function () {
  434 + $.get('/user/currentUser', function (user) {
  435 + $('#indexTopUName').text(user.userName);
  436 + });
  437 +
  438 + //带 data-pjax 的链接由pjax加载
  439 + $(document).pjax('a[data-pjax]', pjaxContainer);
  440 +
  441 + //pjax左菜单点击事件
  442 + $(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
  443 + setTitle(this);
  444 +
  445 + $('#leftMenuSidebar li.nav-item.active').removeClass('active');
  446 + $(this).parent().addClass('active');
  447 + showPjax();
  448 + });
  449 +
  450 + //angularjs左菜单点击事件
  451 + $(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
  452 + setTitle(this);
  453 +
  454 + $('#leftMenuSidebar li.nav-item.active').removeClass('active');
  455 + $(this).parent().addClass('active');
  456 + showAngJs();
  457 + });
  458 +
  459 + //加载左菜单栏
  460 + $get('/module/findByCurrentUser', null,
  461 + function (ms) {
  462 + var treeArray = createTreeData(ms);
  463 + treeArray.sort(function (a, b) {
  464 + return a.createDate - b.createDate;
  465 + });
  466 + var menuHtml = template('menu_list_temp', {list: treeArray});
  467 + $('#leftMenuSidebar').html(menuHtml);
  468 +
  469 + //----------- 检查URL ----------------
  470 + var h = location.hash;
  471 + if (initFragment && initFragment != '') {
  472 + showPjax();
  473 + //普通片段
  474 + loadPage(initFragment);
  475 + //选中菜单
  476 + $.each($('#leftMenuSidebar a'), function (i, item) {
  477 + if (urlPattern($(item).attr('href'), initFragment)) {
  478 + activeLeftMenu(item);
  479 + }
  480 + });
  481 + } else if (h) {
  482 + //angularjs片段
  483 + showAngJs();
  484 + //选中菜单
  485 + $.each($('#leftMenuSidebar a'), function (i, item) {
  486 + if ($(item).attr('href') == h) {
  487 + activeLeftMenu(item);
  488 + }
  489 + });
  490 + }
  491 + else {
  492 + //加载主页
  493 + loadPage('/pages/home.html');
  494 + }
  495 + });
  496 +
  497 + //修改密码
  498 + $('#changePWD').on('click', function () {
  499 + $.get('/pages/permission/user/changePWD.html', function (content) {
  500 + layer.open({
  501 + type: 1,
  502 + area: ['600px', '360px'],
  503 + content: content,
  504 + title: '修改密码',
  505 + shift: 5,
  506 + scrollbar: false,
  507 + success: function () {
  508 + }
  509 + });
  510 + });
  511 + });
  512 + });
  513 +
  514 + //modal关闭时销毁dom
  515 + $(document).on('hidden.bs.modal', '.modal', function () {
  516 + $(this).remove();
  517 + });
  518 +
  519 + //pjax加载完成事件
  520 + $(document).on('pjax:success', function () {
  521 + var dicts = $(pjaxContainer).find('.nt-dictionary');
  522 + dictionaryUtils.transformDom(dicts);
  523 + });
  524 +
  525 + function loadPage(url) {
  526 + $.pjax({url: url, container: pjaxContainer})
  527 + }
  528 +
  529 + function urlPattern(a, b) {
  530 + var r;
  531 + try {
  532 + r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
  533 + } catch (e) {
  534 + r = false;
  535 + }
  536 + return r;
  537 + }
  538 +
  539 + function showPjax() {
  540 + $(angJsContainer).removeClass('page-content active').hide();
  541 + $(pjaxContainer).addClass('page-content active');
  542 + }
  543 +
  544 + function showAngJs() {
  545 + $(pjaxContainer).html('').removeClass('page-content active').hide();
  546 + $(angJsContainer).addClass('page-content active');
  547 + }
  548 +
  549 + function activeLeftMenu(item) {
  550 + $(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
  551 + setTitle(item);
  552 + }
  553 +
  554 + function setTitle(menuItem){
  555 + document.title = $('span.title', menuItem).text();
  556 + }
557 557  
558 558 </script>
559 559 <!-- d3 -->
... ... @@ -630,7 +630,8 @@
630 630 <script
631 631 src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
632 632 data-exclude=1></script>
633   -
  633 +<!-- echarts4 误删 -->
  634 +<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
634 635 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" merge="plugins"></script>
635 636  
636 637 </body>
... ...
src/main/resources/static/real_control_v2_mobile/main.html
  View file @bbf9563
... ... @@ -56,7 +56,7 @@
56 56 <div class="uk-width-4-10">
57 57 <div class="uk-panel">
58 58 <h2 class="north-logo">
59   - <!--<i class="uk-icon-life-ring"></i>--> 青浦公交线路调度
  59 + <!--<i class="uk-icon-life-ring"></i>--> 闵行公交线路调度
60 60 </h2>
61 61 </div>
62 62 </div>
... ...