Commit b7ed05093d314f3512cd66290da17c70a8ebaabf
1 parent
5e11a9f2
update...
Showing
3 changed files
with
51 additions
and
5 deletions
src/main/resources/static/real_control_v2/css/north.css
| @@ -335,3 +335,21 @@ | @@ -335,3 +335,21 @@ | ||
| 335 | margin: 0 5px; | 335 | margin: 0 5px; |
| 336 | width: 110px; | 336 | width: 110px; |
| 337 | } | 337 | } |
| 338 | + | ||
| 339 | + | ||
| 340 | +#navbar_user_detail_link:hover{ | ||
| 341 | + background-color: transparent; | ||
| 342 | + color: #444; | ||
| 343 | + outline: 0; | ||
| 344 | + position: relative; | ||
| 345 | + z-index: 1; | ||
| 346 | + border-left-color: rgba(0,0,0,.1); | ||
| 347 | + border-right-color: rgba(0,0,0,.1); | ||
| 348 | + border-top-color: rgba(0,0,0,.1); | ||
| 349 | + box-shadow: inset 0 2px 4px rgba(0,0,0,.1); | ||
| 350 | +} | ||
| 351 | + | ||
| 352 | +.user_detail_tip .qtip-content{ | ||
| 353 | + width: 300px; | ||
| 354 | + height: 220px; | ||
| 355 | +} | ||
| 338 | \ No newline at end of file | 356 | \ No newline at end of file |
src/main/resources/static/real_control_v2/js/north/toolbar.js
| @@ -46,10 +46,39 @@ var gb_northToolbar = (function () { | @@ -46,10 +46,39 @@ var gb_northToolbar = (function () { | ||
| 46 | window.location.href = '/pages/control/lineallot/allot.html'; | 46 | window.location.href = '/pages/control/lineallot/allot.html'; |
| 47 | }); | 47 | }); |
| 48 | 48 | ||
| 49 | - //点击用户名 | ||
| 50 | - $('#navbar_user_detail_link').on('click', function () { | ||
| 51 | - //alert('1111'); | ||
| 52 | - }); | 49 | + //鼠标悬停用户名 |
| 50 | +/* $(document).on('mouseenter', '#navbar_user_detail_link', function() { | ||
| 51 | + $(this).qtip({ | ||
| 52 | + show: { | ||
| 53 | + ready: true, | ||
| 54 | + delay: 300 | ||
| 55 | + }, | ||
| 56 | + content: { | ||
| 57 | + text: function() { | ||
| 58 | + | ||
| 59 | + return '';//temps['sch-table-task-tootip-temp']({tasks: array}); | ||
| 60 | + } | ||
| 61 | + }, | ||
| 62 | + position: { | ||
| 63 | + viewport: $(window), | ||
| 64 | + my: 'top center', | ||
| 65 | + at: 'bottom center' | ||
| 66 | + }, | ||
| 67 | + style: { | ||
| 68 | + classes: 'qtip-light qtip-shadow user_detail_tip' | ||
| 69 | + }, | ||
| 70 | + hide: { | ||
| 71 | + fixed: true, | ||
| 72 | + delay: 300 | ||
| 73 | + }, | ||
| 74 | + events: { | ||
| 75 | + hidden: function(event, api) { | ||
| 76 | + //destroy dom | ||
| 77 | + $(this).qtip('destroy', true); | ||
| 78 | + } | ||
| 79 | + } | ||
| 80 | + }); | ||
| 81 | + });*/ | ||
| 53 | }); | 82 | }); |
| 54 | 83 | ||
| 55 | $(document).on('click', '#north_toolbar_panel li.event a', function () { | 84 | $(document).on('click', '#north_toolbar_panel li.event a', function () { |
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
| @@ -104,7 +104,6 @@ var gb_sch_websocket = (function () { | @@ -104,7 +104,6 @@ var gb_sch_websocket = (function () { | ||
| 104 | * @param msg | 104 | * @param msg |
| 105 | */ | 105 | */ |
| 106 | var autoWdtz = function (msg) { | 106 | var autoWdtz = function (msg) { |
| 107 | - debugger | ||
| 108 | var schId = msg.id; | 107 | var schId = msg.id; |
| 109 | var minute = msg.minute; | 108 | var minute = msg.minute; |
| 110 | var lineCode = msg.lineCode; | 109 | var lineCode = msg.lineCode; |