周伟鹏 / cnlive_shenhe · Commits

Commit 2f7f3c8635bc2309f445196b17147811b43835ad

Authored by 王言钊
2 parents 27112ea6 6669776d

Merge branch 'test' into dev

Inline Side-by-side
Showing 12 changed files with 39 additions and 39 deletions
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @2f7f3c8
@@ -111,7 +111,7 @@ public class UsersController extends BaseController { @@ -111,7 +111,7 @@ public class UsersController extends BaseController {
111 shyLog.setOperationType("登录"); 111 shyLog.setOperationType("登录");
112 shyLog.setRemark(user.getUsername() + "--" + "登录"); 112 shyLog.setRemark(user.getUsername() + "--" + "登录");
113 shyLogService.addShyLog(shyLog); 113 shyLogService.addShyLog(shyLog);
114 - return "redirect:" + redirect_url + "/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority="; 114 + return "redirect:" + redirect_url + "/videos/page?state=0&receive=0&page=1&pageSize=10";
115 } 115 }
116 } 116 }
117 117
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
  View file @2f7f3c8
@@ -33,7 +33,7 @@ public class ContentDTO extends ShyContent implements Serializable { @@ -33,7 +33,7 @@ public class ContentDTO extends ShyContent implements Serializable {
33 } 33 }
34 34
35 public Integer getPage() { 35 public Integer getPage() {
36 - return page == null ? 1 : page; 36 + return page;
37 } 37 }
38 38
39 public void setPage(Integer page) { 39 public void setPage(Integer page) {
@@ -41,7 +41,7 @@ public class ContentDTO extends ShyContent implements Serializable { @@ -41,7 +41,7 @@ public class ContentDTO extends ShyContent implements Serializable {
41 } 41 }
42 42
43 public Integer getPageSize() { 43 public Integer getPageSize() {
44 - return pageSize == null ? 10 : pageSize; 44 + return pageSize;
45 } 45 }
46 46
47 public void setPageSize(Integer pageSize) { 47 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java
  View file @2f7f3c8
@@ -25,7 +25,7 @@ public class EmailDTO extends ShyEmail implements Serializable { @@ -25,7 +25,7 @@ public class EmailDTO extends ShyEmail implements Serializable {
25 } 25 }
26 26
27 public Integer getPage() { 27 public Integer getPage() {
28 - return page == null ? 1 : page; 28 + return page;
29 } 29 }
30 30
31 public void setPage(Integer page) { 31 public void setPage(Integer page) {
@@ -33,7 +33,7 @@ public class EmailDTO extends ShyEmail implements Serializable { @@ -33,7 +33,7 @@ public class EmailDTO extends ShyEmail implements Serializable {
33 } 33 }
34 34
35 public Integer getPageSize() { 35 public Integer getPageSize() {
36 - return pageSize == null ? 10 : pageSize; 36 + return pageSize;
37 } 37 }
38 38
39 public void setPageSize(Integer pageSize) { 39 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
  View file @2f7f3c8
@@ -37,7 +37,7 @@ public class LiveDTO extends ShyLive implements Serializable { @@ -37,7 +37,7 @@ public class LiveDTO extends ShyLive implements Serializable {
37 } 37 }
38 38
39 public Integer getPage() { 39 public Integer getPage() {
40 - return page == null ? 1 : page; 40 + return page;
41 } 41 }
42 42
43 public void setPage(Integer page) { 43 public void setPage(Integer page) {
@@ -45,7 +45,7 @@ public class LiveDTO extends ShyLive implements Serializable { @@ -45,7 +45,7 @@ public class LiveDTO extends ShyLive implements Serializable {
45 } 45 }
46 46
47 public Integer getPageSize() { 47 public Integer getPageSize() {
48 - return pageSize == null ? 20 : pageSize; 48 + return pageSize;
49 } 49 }
50 50
51 public void setPageSize(Integer pageSize) { 51 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java
  View file @2f7f3c8
@@ -25,7 +25,7 @@ public class UsersDTO extends ShyUsers implements Serializable { @@ -25,7 +25,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
25 } 25 }
26 26
27 public Integer getPage() { 27 public Integer getPage() {
28 - return page == null ? 1 : page; 28 + return page;
29 } 29 }
30 30
31 public void setPage(Integer page) { 31 public void setPage(Integer page) {
@@ -33,7 +33,7 @@ public class UsersDTO extends ShyUsers implements Serializable { @@ -33,7 +33,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
33 } 33 }
34 34
35 public Integer getPageSize() { 35 public Integer getPageSize() {
36 - return pageSize == null ? 10 : pageSize; 36 + return pageSize;
37 } 37 }
38 38
39 public void setPageSize(Integer pageSize) { 39 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/VideosDTO.java
  View file @2f7f3c8
@@ -56,7 +56,7 @@ public class VideosDTO extends ShyVideos implements Serializable { @@ -56,7 +56,7 @@ public class VideosDTO extends ShyVideos implements Serializable {
56 56
57 57
58 public Integer getPage() { 58 public Integer getPage() {
59 - return page == null ? 1 : page; 59 + return page;
60 } 60 }
61 61
62 public void setPage(Integer page) { 62 public void setPage(Integer page) {
@@ -64,7 +64,7 @@ public class VideosDTO extends ShyVideos implements Serializable { @@ -64,7 +64,7 @@ public class VideosDTO extends ShyVideos implements Serializable {
64 } 64 }
65 65
66 public Integer getPageSize() { 66 public Integer getPageSize() {
67 - return pageSize == null ? 10 : pageSize; 67 + return pageSize;
68 } 68 }
69 69
70 public void setPageSize(Integer pageSize) { 70 public void setPageSize(Integer pageSize) {
src/main/resources/templates/common/frame.html
  View file @2f7f3c8
@@ -78,11 +78,11 @@ line-height: 2em; margin: 0 auto;font-size: 2em" @@ -78,11 +78,11 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
78 <span class="menu-item-top">审核云</span> 78 <span class="menu-item-top">审核云</span>
79 </a> 79 </a>
80 <ul class="treeview-menu"> 80 <ul class="treeview-menu">
81 - <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li> 81 + <li class="active"><a href="/videos/page?state=0&receive=0&page=1&pageSize=10" id="/videos/page">点播审核</a></li>
82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li> 82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
83 - <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li> 83 + <li><a href="/live/page?shenhe_state=0&page=1&pageSize=20" id="/live/page"> 直播审核</a></li>
84 <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li> 84 <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
85 - <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li> 85 + <li><a href="/content/page?receive_status=0&page=1&pageSize=10" id="/content/page"> 图文审核</a></li>
86 <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li> 86 <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li>
87 <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li> 87 <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
88 <li><a href="/liveApply/page?shenhe_state=0&receive=0&page=1&pageSize=10" id="/liveApply/page">直播申请审核</a></li> 88 <li><a href="/liveApply/page?shenhe_state=0&receive=0&page=1&pageSize=10" id="/liveApply/page">直播申请审核</a></li>
@@ -93,9 +93,9 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; @@ -93,9 +93,9 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
93 <span class="menu-item-top">系统管理</span> 93 <span class="menu-item-top">系统管理</span>
94 </a> 94 </a>
95 <ul class="treeview-menu"> 95 <ul class="treeview-menu">
96 - <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li> 96 + <li><a href="/users/page?page=1&pageSize=10" id="/users/page"> 审核云用户管理</a></li>
97 <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li> 97 <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98 - <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li> 98 + <li><a href="/email/page?page=1&pageSize=10" id="/email/page"> 邮件消息管理</a></li>
99 <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li> 99 <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
100 <li><a href="/notSpeak/page?page=1&pageSize=10" id="/notSpeak/page"> 网++禁言管理</a></li> 100 <li><a href="/notSpeak/page?page=1&pageSize=10" id="/notSpeak/page"> 网++禁言管理</a></li>
101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li> 101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
src/main/resources/templates/page/content.html
  View file @2f7f3c8
@@ -451,7 +451,7 @@ @@ -451,7 +451,7 @@
451 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i]; 451 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
452 } 452 }
453 h = h.substring(1, h.length); 453 h = h.substring(1, h.length);
454 - window.location.href = "/content/page?" + h + "&pageSize=" + pageSize; 454 + window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
455 } else { 455 } else {
456 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 456 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
457 var split = se.split("&"); 457 var split = se.split("&");
@@ -461,7 +461,7 @@ @@ -461,7 +461,7 @@
461 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 461 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
462 } 462 }
463 h = h.substring(1, h.length); 463 h = h.substring(1, h.length);
464 - window.location.href = "/content/page?" + h + "&pageSize=" + pageSize; 464 + window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
465 } 465 }
466 } 466 }
467 467
@@ -501,32 +501,32 @@ @@ -501,32 +501,32 @@
501 function quanbu() { 501 function quanbu() {
502 updateValue(); 502 updateValue();
503 var expand_list_state = $("#forms").attr("expand_list_state"); 503 var expand_list_state = $("#forms").attr("expand_list_state");
504 - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state; 504 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
505 } 505 }
506 506
507 //全部待领 507 //全部待领
508 $('#daishen').click(function () { 508 $('#daishen').click(function () {
509 updateValue(); 509 updateValue();
510 var receive_status = 0; 510 var receive_status = 0;
511 - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag; 511 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
512 }); 512 });
513 //我的待审核 513 //我的待审核
514 $('#Mydaishen').click(function () { 514 $('#Mydaishen').click(function () {
515 updateValue(); 515 updateValue();
516 var receive_status = 1; 516 var receive_status = 1;
517 - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag; 517 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
518 }); 518 });
519 //我的已审核 519 //我的已审核
520 $('#yishen').click(function () { 520 $('#yishen').click(function () {
521 updateValue(); 521 updateValue();
522 var receive_status = 2; 522 var receive_status = 2;
523 - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag; 523 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
524 }); 524 });
525 525
526 526
527 //查询 527 //查询
528 $('#videos_query').click(function () { 528 $('#videos_query').click(function () {
529 - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag; 529 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
530 }); 530 });
531 /*全选的操作*/ 531 /*全选的操作*/
532 $('#select_all').click(function () { 532 $('#select_all').click(function () {
src/main/resources/templates/page/email.html
  View file @2f7f3c8
@@ -396,7 +396,7 @@ input:checked + .slider:before { @@ -396,7 +396,7 @@ input:checked + .slider:before {
396 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i]; 396 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
397 } 397 }
398 h = h.substring(1, h.length); 398 h = h.substring(1, h.length);
399 - window.location.href = "/email/page?" + h + "&pageSize=" + pageSize; 399 + window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
400 } else { 400 } else {
401 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 401 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
402 var split = se.split("&"); 402 var split = se.split("&");
@@ -406,7 +406,7 @@ input:checked + .slider:before { @@ -406,7 +406,7 @@ input:checked + .slider:before {
406 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 406 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
407 } 407 }
408 h = h.substring(1, h.length); 408 h = h.substring(1, h.length);
409 - window.location.href = "/email/page?" + h + "&pageSize=" + pageSize; 409 + window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
410 } 410 }
411 } 411 }
412 412
@@ -415,7 +415,7 @@ input:checked + .slider:before { @@ -415,7 +415,7 @@ input:checked + .slider:before {
415 var email = $("#email_query").val(); 415 var email = $("#email_query").val();
416 var remark = $("#remark_query").val(); 416 var remark = $("#remark_query").val();
417 var pageSize = $("#pageSize").val(); 417 var pageSize = $("#pageSize").val();
418 - window.location.href = "/email/page?email=" + email + "&remark=" + remark+ "&pageSize=" + pageSize; 418 + window.location.href = "/email/page?email=" + email + "&remark=" + remark + "&page="+ 1 + "&pageSize=" + pageSize;
419 }); 419 });
420 420
421 //鼠标回车事件 421 //鼠标回车事件
src/main/resources/templates/page/live.html
  View file @2f7f3c8
@@ -490,7 +490,7 @@ @@ -490,7 +490,7 @@
490 contentId = $("#contentId").val(); 490 contentId = $("#contentId").val();
491 } 491 }
492 var expand_list_state = $("#forms").attr("expand_list_state"); 492 var expand_list_state = $("#forms").attr("expand_list_state");
493 - window.location.href = "/live/page?activity_status=" + activity_status + "&activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&activity_name=" + activity_name + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&shenhe_state=" + shenhe_state + "&contentId=" + contentId + "&expand_list_state=" + expand_list_state; 493 + window.location.href = "/live/page?activity_status=" + activity_status + "&activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&activity_name=" + activity_name + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&shenhe_state=" + shenhe_state + "&contentId=" + contentId + "&expand_list_state=" + expand_list_state;
494 } 494 }
495 495
496 //全部 496 //全部
@@ -770,7 +770,7 @@ @@ -770,7 +770,7 @@
770 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i]; 770 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
771 } 771 }
772 h = h.substring(1, h.length); 772 h = h.substring(1, h.length);
773 - window.location.href = "/live/page?" + h + "&pageSize=" + pageSize; 773 + window.location.href = "/live/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
774 } else { 774 } else {
775 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 775 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
776 var split = se.split("&"); 776 var split = se.split("&");
@@ -780,7 +780,7 @@ @@ -780,7 +780,7 @@
780 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 780 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
781 } 781 }
782 h = h.substring(1, h.length); 782 h = h.substring(1, h.length);
783 - window.location.href = "/live/page?" + h + "&pageSize=" + pageSize; 783 + window.location.href = "/live/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
784 } 784 }
785 } 785 }
786 786
src/main/resources/templates/page/users.html
  View file @2f7f3c8
@@ -297,7 +297,7 @@ @@ -297,7 +297,7 @@
297 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i]; 297 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
298 } 298 }
299 h = h.substring(1, h.length); 299 h = h.substring(1, h.length);
300 - window.location.href = "/users/page?" + h + "&pageSize=" + pageSize; 300 + window.location.href = "/users/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
301 } else { 301 } else {
302 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 302 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
303 var split = se.split("&"); 303 var split = se.split("&");
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 307 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
308 } 308 }
309 h = h.substring(1, h.length); 309 h = h.substring(1, h.length);
310 - window.location.href = "/users/page?" + h + "&pageSize=" + pageSize; 310 + window.location.href = "/users/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
311 } 311 }
312 } 312 }
313 313
@@ -318,7 +318,7 @@ @@ -318,7 +318,7 @@
318 var sp_id = $("#sp_id").val(); 318 var sp_id = $("#sp_id").val();
319 var mobile = $("#mobile").val(); 319 var mobile = $("#mobile").val();
320 var pageSize = $("#pageSize").val(); 320 var pageSize = $("#pageSize").val();
321 - window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile+ "&pageSize=" + pageSize; 321 + window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile + "&page=" + 1 + "&pageSize=" + pageSize;
322 }); 322 });
323 //鼠标回车事件 323 //鼠标回车事件
324 $(document).keyup(function(event){ 324 $(document).keyup(function(event){
src/main/resources/templates/page/video.html
  View file @2f7f3c8
@@ -445,7 +445,7 @@ @@ -445,7 +445,7 @@
445 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i]; 445 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
446 } 446 }
447 h = h.substring(1, h.length); 447 h = h.substring(1, h.length);
448 - window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize; 448 + window.location.href = "/videos/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
449 } else { 449 } else {
450 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 450 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
451 var split = se.split("&"); 451 var split = se.split("&");
@@ -455,7 +455,7 @@ @@ -455,7 +455,7 @@
455 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 455 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
456 } 456 }
457 h = h.substring(1, h.length); 457 h = h.substring(1, h.length);
458 - window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize; 458 + window.location.href = "/videos/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
459 } 459 }
460 } 460 }
461 461
@@ -503,7 +503,7 @@ @@ -503,7 +503,7 @@
503 function quanbu() { 503 function quanbu() {
504 updateValue(); 504 updateValue();
505 var expand_list_state = $("#forms").attr("expand_list_state"); 505 var expand_list_state = $("#forms").attr("expand_list_state");
506 - window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id + "&expand_list_state=" + expand_list_state; 506 + window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id + "&expand_list_state=" + expand_list_state;
507 507
508 } 508 }
509 509
@@ -512,27 +512,27 @@ @@ -512,27 +512,27 @@
512 updateValue(); 512 updateValue();
513 if ($.trim(state) == '') state = 0; 513 if ($.trim(state) == '') state = 0;
514 var receive = 0; 514 var receive = 0;
515 - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id; 515 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
516 }); 516 });
517 //我的待审核 517 //我的待审核
518 $('#Mydaishen').click(function () { 518 $('#Mydaishen').click(function () {
519 updateValue(); 519 updateValue();
520 var receive = 1; 520 var receive = 1;
521 if ($.trim(state) == '') state = 0; 521 if ($.trim(state) == '') state = 0;
522 - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id; 522 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
523 }); 523 });
524 //我的已审核 524 //我的已审核
525 $('#yishen').click(function () { 525 $('#yishen').click(function () {
526 updateValue(); 526 updateValue();
527 var receive = 1; 527 var receive = 1;
528 if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询 528 if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询
529 - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id; 529 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
530 }); 530 });
531 531
532 532
533 //查询 533 //查询
534 $('#videos_query').click(function () { 534 $('#videos_query').click(function () {
535 - window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id; 535 + window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
536 }); 536 });
537 /*全选的操作*/ 537 /*全选的操作*/
538 $('#select_all').click(function () { 538 $('#select_all').click(function () {