Commit 44301ffb4b0c0a7d2e46625309cd0f3a3efe4f7e
1 parent
5cb3584e
线调更新
Showing
1 changed file
with
36 additions
and
9 deletions
src/main/resources/static/pages/permission/user/authorize.html
| @@ -309,6 +309,15 @@ | @@ -309,6 +309,15 @@ | ||
| 309 | <div class="ct_cont uk-grid-small uk-child-width-expand" uk-grid> | 309 | <div class="ct_cont uk-grid-small uk-child-width-expand" uk-grid> |
| 310 | <div class="role_list uk-width-1-4 "> | 310 | <div class="role_list uk-width-1-4 "> |
| 311 | <div class="uk-card uk-card-default"> | 311 | <div class="uk-card uk-card-default"> |
| 312 | + <form> | ||
| 313 | + <div class="uk-margin"> | ||
| 314 | + <div class="uk-inline" > | ||
| 315 | + <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>--> | ||
| 316 | + <!--<input class="uk-input role_search_input" type="text" placeholder="搜索角色">--> | ||
| 317 | + </div> | ||
| 318 | + </div> | ||
| 319 | + </form> | ||
| 320 | + | ||
| 312 | <div class="ct-card-body" > | 321 | <div class="ct-card-body" > |
| 313 | <ul class="uk-list uk-list-large uk-list-divider role-list"> | 322 | <ul class="uk-list uk-list-large uk-list-divider role-list"> |
| 314 | </ul> | 323 | </ul> |
| @@ -317,6 +326,15 @@ | @@ -317,6 +326,15 @@ | ||
| 317 | </div> | 326 | </div> |
| 318 | <div class="user_list uk-width-1-5 "> | 327 | <div class="user_list uk-width-1-5 "> |
| 319 | <div class="uk-card uk-card-default"> | 328 | <div class="uk-card uk-card-default"> |
| 329 | + <form> | ||
| 330 | + <div class="uk-margin"> | ||
| 331 | + <div class="uk-inline" > | ||
| 332 | + <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>--> | ||
| 333 | + <!--<input class="uk-input user_search_input" type="text" placeholder="搜索用户">--> | ||
| 334 | + </div> | ||
| 335 | + </div> | ||
| 336 | + </form> | ||
| 337 | + | ||
| 320 | <div class="ct-card-body"> | 338 | <div class="ct-card-body"> |
| 321 | <ul class="uk-list uk-list-large user-list"> | 339 | <ul class="uk-list uk-list-large user-list"> |
| 322 | </ul> | 340 | </ul> |
| @@ -325,6 +343,7 @@ | @@ -325,6 +343,7 @@ | ||
| 325 | </div> | 343 | </div> |
| 326 | <div class="auth_cont "> | 344 | <div class="auth_cont "> |
| 327 | <div class="uk-card uk-card-default authorize_right_cont"> | 345 | <div class="uk-card uk-card-default authorize_right_cont"> |
| 346 | + | ||
| 328 | </div> | 347 | </div> |
| 329 | </div> | 348 | </div> |
| 330 | </div> | 349 | </div> |
| @@ -332,11 +351,11 @@ | @@ -332,11 +351,11 @@ | ||
| 332 | 351 | ||
| 333 | <script id="authorize-role-list-temp" type="text/html"> | 352 | <script id="authorize-role-list-temp" type="text/html"> |
| 334 | {{each list as r i}} | 353 | {{each list as r i}} |
| 335 | - <li data-id="{{r.id}}" data-name="{{r.roleName}}" data-code="{{r.codeUp}}">{{r.roleName}} | ||
| 336 | - <span class="role-code">{{r.codeName}}</span> | ||
| 337 | - <div class="ct_li_desc">{{r.createDateStr}}</div> | ||
| 338 | - <span class="uk-badge">{{r.count}}</span> | ||
| 339 | - </li> | 354 | + <li data-id="{{r.id}}" data-name="{{r.roleName}}" data-code="{{r.codeUp}}">{{r.roleName}} |
| 355 | + <span class="role-code">{{r.codeName}}</span> | ||
| 356 | + <div class="ct_li_desc">{{r.createDateStr}}</div> | ||
| 357 | + <span class="uk-badge">{{r.count}}</span> | ||
| 358 | + </li> | ||
| 340 | {{/each}} | 359 | {{/each}} |
| 341 | </script> | 360 | </script> |
| 342 | <script id="authorize-user-list-temp" type="text/html"> | 361 | <script id="authorize-user-list-temp" type="text/html"> |
| @@ -462,9 +481,9 @@ | @@ -462,9 +481,9 @@ | ||
| 462 | var userA={}; | 481 | var userA={}; |
| 463 | for(var i=0,u;u=rs[i++];){ | 482 | for(var i=0,u;u=rs[i++];){ |
| 464 | if (u.id==userId){ | 483 | if (u.id==userId){ |
| 465 | - discard_field(u); | ||
| 466 | - u.userNameUp=u.userName.toUpperCase(); | ||
| 467 | - u.lastLoginDateStr=moment(u.lastLoginDate).format('YYYY-MM-DD HH:ss'); | 484 | + discard_field(u); |
| 485 | + u.userNameUp=u.userName.toUpperCase(); | ||
| 486 | + u.lastLoginDateStr=moment(u.lastLoginDate).format('YYYY-MM-DD HH:ss'); | ||
| 468 | userA[0]=u; | 487 | userA[0]=u; |
| 469 | } | 488 | } |
| 470 | } | 489 | } |
| @@ -507,6 +526,14 @@ | @@ -507,6 +526,14 @@ | ||
| 507 | up_scroll(); | 526 | up_scroll(); |
| 508 | } | 527 | } |
| 509 | 528 | ||
| 529 | + function reset_role_list(){ | ||
| 530 | + var actives = $('ul.role-list>li.active'); | ||
| 531 | + if(actives.length > 0){ | ||
| 532 | + $('ul.role-list>li.active').removeClass('active'); | ||
| 533 | + render_user_list(users); | ||
| 534 | + $('.authorize_right_cont').empty(); | ||
| 535 | + } | ||
| 536 | + } | ||
| 510 | 537 | ||
| 511 | function up_scroll() { | 538 | function up_scroll() { |
| 512 | $('.ct_page .uk-card .ct-card-body').perfectScrollbar('update'); | 539 | $('.ct_page .uk-card .ct-card-body').perfectScrollbar('update'); |
| @@ -577,7 +604,7 @@ | @@ -577,7 +604,7 @@ | ||
| 577 | 604 | ||
| 578 | var groupBy = function (list, field) { | 605 | var groupBy = function (list, field) { |
| 579 | var rs = {}, | 606 | var rs = {}, |
| 580 | - key; | 607 | + key; |
| 581 | $.each(list, function () { | 608 | $.each(list, function () { |
| 582 | key = this[field]; | 609 | key = this[field]; |
| 583 | if (!rs[key]) | 610 | if (!rs[key]) |