周伟鹏 / cnlive_shenhe · Commits

Commit 0ed749308ed3bdc5d88a5df8c495c67ce3351b33

Authored by 王言钊
2 parents 776c2274 1add0887

Merge branch 'dev'

Inline Side-by-side
Showing 25 changed files with 215 additions and 181 deletions
src/main/java/com/cnlive/shenhe/controller/AudioController.java
  View file @0ed7493
@@ -140,6 +140,11 @@ public class AudioController extends BaseController { @@ -140,6 +140,11 @@ public class AudioController extends BaseController {
140 model.addAttribute("receive1", receive1); 140 model.addAttribute("receive1", receive1);
141 model.addAttribute("pageSize", audioDTO.getPageSize()); 141 model.addAttribute("pageSize", audioDTO.getPageSize());
142 model.addAttribute("audioPage", audioPage); 142 model.addAttribute("audioPage", audioPage);
  143 + model.addAttribute("AudioTitle", audioDTO.getVideo_title());
  144 + model.addAttribute("Sp_desc", audioDTO.getSp_desc());
  145 + model.addAttribute("Sp_id", audioDTO.getSp_Id());
  146 + model.addAttribute("Start_date", audioDTO.getStart_date());
  147 + model.addAttribute("End_date", audioDTO.getEnd_date());
143 return "page/audio.html"; 148 return "page/audio.html";
144 } 149 }
145 150
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
  View file @0ed7493
@@ -129,6 +129,10 @@ public class ChannelController extends BaseController { @@ -129,6 +129,10 @@ public class ChannelController extends BaseController {
129 model.addAttribute("state1", state1); 129 model.addAttribute("state1", state1);
130 model.addAttribute("pageSize", channelDTO.getPageSize()); 130 model.addAttribute("pageSize", channelDTO.getPageSize());
131 model.addAttribute("channelPage", channelPage); 131 model.addAttribute("channelPage", channelPage);
  132 + model.addAttribute("Channel_id", channelDTO.getChannel_id());
  133 + model.addAttribute("Channel_name", channelDTO.getChannel_name());
  134 + model.addAttribute("Start_date", channelDTO.getStart_date());
  135 + model.addAttribute("End_date", channelDTO.getEnd_date());
132 return "page/channel.html"; 136 return "page/channel.html";
133 } 137 }
134 138
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @0ed7493
@@ -143,6 +143,12 @@ public class CommentsController extends BaseController { @@ -143,6 +143,12 @@ public class CommentsController extends BaseController {
143 model.addAttribute("state1", state1); 143 model.addAttribute("state1", state1);
144 model.addAttribute("pageSize", commentsDTO.getPageSize()); 144 model.addAttribute("pageSize", commentsDTO.getPageSize());
145 model.addAttribute("commentPage", commentPage); 145 model.addAttribute("commentPage", commentPage);
  146 + model.addAttribute("Type", commentsDTO.getType());
  147 + model.addAttribute("Activity_id", commentsDTO.getActivity_id());
  148 + model.addAttribute("Comment_user_id", commentsDTO.getComment_user_id());
  149 + model.addAttribute("Content", commentsDTO.getContent());
  150 + model.addAttribute("Start_date", commentsDTO.getStart_date());
  151 + model.addAttribute("End_date", commentsDTO.getEnd_date());
146 return "page/comment.html"; 152 return "page/comment.html";
147 } 153 }
148 154
src/main/java/com/cnlive/shenhe/controller/ContentController.java
  View file @0ed7493
@@ -109,6 +109,14 @@ public class ContentController extends BaseController { @@ -109,6 +109,14 @@ public class ContentController extends BaseController {
109 } 109 }
110 model.addAttribute("contentPage", contentPage); 110 model.addAttribute("contentPage", contentPage);
111 model.addAttribute("pageSize", contentDTO.getPageSize()); 111 model.addAttribute("pageSize", contentDTO.getPageSize());
  112 + model.addAttribute("ContentTag", contentDTO.getContent_tag());
  113 + model.addAttribute("Title", contentDTO.getTitle());
  114 + model.addAttribute("Author", contentDTO.getAuthor());
  115 + model.addAttribute("Source", contentDTO.getSource());
  116 + model.addAttribute("Start_date", contentDTO.getStart_date());
  117 + model.addAttribute("End_date", contentDTO.getEnd_date());
  118 + model.addAttribute("Sp_desc", contentDTO.getSp_desc());
  119 + model.addAttribute("ContentId", contentDTO.getContentId());
112 return "page/content.html"; 120 return "page/content.html";
113 } 121 }
114 122
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
  View file @0ed7493
@@ -147,9 +147,6 @@ public class LiveApplyController extends BaseController { @@ -147,9 +147,6 @@ public class LiveApplyController extends BaseController {
147 for (ShyLiveapply liveApply : list) { 147 for (ShyLiveapply liveApply : list) {
148 if (!liveApply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) { 148 if (!liveApply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) {
149 String updater = CommonUtils.isEmpty(liveApply.getUpdater()) || "null".equals(liveApply.getUpdater()) ? "白名单" : liveApply.getUpdater(); 149 String updater = CommonUtils.isEmpty(liveApply.getUpdater()) || "null".equals(liveApply.getUpdater()) ? "白名单" : liveApply.getUpdater();
150 -  
151 -  
152 -  
153 String auditorId = liveApply.getAuditor(); 150 String auditorId = liveApply.getAuditor();
154 if (CommonUtils.isNotEmpty(auditorId)) { 151 if (CommonUtils.isNotEmpty(auditorId)) {
155 ShyUsers user = new ShyUsers(); 152 ShyUsers user = new ShyUsers();
@@ -172,6 +169,11 @@ public class LiveApplyController extends BaseController { @@ -172,6 +169,11 @@ public class LiveApplyController extends BaseController {
172 } 169 }
173 model.addAttribute("liveApplyPage", liveApplyPage); 170 model.addAttribute("liveApplyPage", liveApplyPage);
174 model.addAttribute("pageSize", liveApplyDTO.getPageSize()); 171 model.addAttribute("pageSize", liveApplyDTO.getPageSize());
  172 + model.addAttribute("Theme", liveApplyDTO.getTheme());
  173 + model.addAttribute("Organization", liveApplyDTO.getOrganization());
  174 + model.addAttribute("Sp_desc", liveApplyDTO.getSp_desc());
  175 + model.addAttribute("Start_date", liveApplyDTO.getStart_date());
  176 + model.addAttribute("End_date", liveApplyDTO.getEnd_date());
175 return "page/liveApply.html"; 177 return "page/liveApply.html";
176 } 178 }
177 179
src/main/java/com/cnlive/shenhe/controller/LiveController.java
  View file @0ed7493
@@ -177,6 +177,13 @@ public class LiveController extends BaseController { @@ -177,6 +177,13 @@ public class LiveController extends BaseController {
177 } 177 }
178 model.addAttribute("livePage", livePage); 178 model.addAttribute("livePage", livePage);
179 model.addAttribute("pageSize", liveDTO.getPageSize()); 179 model.addAttribute("pageSize", liveDTO.getPageSize());
  180 + model.addAttribute("ActivityStatus", liveDTO.getActivity_status());
  181 + model.addAttribute("Activity_name",liveDTO.getActivity_name());
  182 + model.addAttribute("Activity_id",liveDTO.getActivity_id());
  183 + model.addAttribute("Sp_desc", liveDTO.getSp_desc());
  184 + model.addAttribute("Start_date", liveDTO.getStart_date());
  185 + model.addAttribute("End_date", liveDTO.getEnd_date());
  186 + model.addAttribute("ContentId", liveDTO.getContentId());
180 return "page/live.html"; 187 return "page/live.html";
181 } 188 }
182 189
src/main/java/com/cnlive/shenhe/controller/NotSpeakController.java
  View file @0ed7493
@@ -85,6 +85,8 @@ public class NotSpeakController extends BaseController { @@ -85,6 +85,8 @@ public class NotSpeakController extends BaseController {
85 } 85 }
86 model.addAttribute("pageSize", notSpeakDTO.getPageSize()); 86 model.addAttribute("pageSize", notSpeakDTO.getPageSize());
87 model.addAttribute("notspeakPage", shyNotspeakPage); 87 model.addAttribute("notspeakPage", shyNotspeakPage);
  88 + model.addAttribute("User_id", notSpeakDTO.getUser_id());
  89 + model.addAttribute("User_name", notSpeakDTO.getUser_name());
88 return "page/notspeak.html"; 90 return "page/notspeak.html";
89 } 91 }
90 92
src/main/java/com/cnlive/shenhe/controller/TopicController.java
  View file @0ed7493
@@ -111,6 +111,11 @@ public class TopicController extends BaseController { @@ -111,6 +111,11 @@ public class TopicController extends BaseController {
111 } 111 }
112 model.addAttribute("topicPage", topicPage); 112 model.addAttribute("topicPage", topicPage);
113 model.addAttribute("pageSize", topicDTO.getPageSize()); 113 model.addAttribute("pageSize", topicDTO.getPageSize());
  114 + model.addAttribute("Topic_id", topicDTO.getTopic_id());
  115 + model.addAttribute("Topic_name", topicDTO.getTopic_name());
  116 + model.addAttribute("Sp_desc", topicDTO.getSp_desc());
  117 + model.addAttribute("Start_date", topicDTO.getStart_date());
  118 + model.addAttribute("End_date", topicDTO.getEnd_date());
114 return "page/topic.html"; 119 return "page/topic.html";
115 } 120 }
116 121
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @0ed7493
@@ -158,6 +158,9 @@ public class UsersController extends BaseController { @@ -158,6 +158,9 @@ public class UsersController extends BaseController {
158 model.addAttribute("usersPage", usersPage); 158 model.addAttribute("usersPage", usersPage);
159 model.addAttribute("pageSize", usersDTO.getPageSize()); 159 model.addAttribute("pageSize", usersDTO.getPageSize());
160 model.addAttribute("notice", notice); 160 model.addAttribute("notice", notice);
  161 + model.addAttribute("Sp_id", usersDTO.getSp_id());
  162 + model.addAttribute("Username", usersDTO.getUsername());
  163 + model.addAttribute("Mobile", usersDTO.getMobile());
161 return "page/users.html"; 164 return "page/users.html";
162 } 165 }
163 166
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @0ed7493
@@ -233,6 +233,14 @@ public class VideosController extends BaseController { @@ -233,6 +233,14 @@ public class VideosController extends BaseController {
233 model.addAttribute("sp_Id", videosDTO.getSp_Id()); 233 model.addAttribute("sp_Id", videosDTO.getSp_Id());
234 model.addAttribute("source", videosDTO.getSource()); 234 model.addAttribute("source", videosDTO.getSource());
235 model.addAttribute("activityList", activityList); 235 model.addAttribute("activityList", activityList);
  236 + model.addAttribute("VideoTitle", videosDTO.getVideo_title());
  237 + model.addAttribute("VideoId", videosDTO.getVideo_id());
  238 + model.addAttribute("sp_desc", videosDTO.getSp_desc());
  239 + model.addAttribute("Start_date", videosDTO.getStart_date());
  240 + model.addAttribute("End_date", videosDTO.getEnd_date());
  241 + model.addAttribute("ContentId", videosDTO.getContentId());
  242 + model.addAttribute("Video_user_id", videosDTO.getVideo_user_id());
  243 + model.addAttribute("Shen_auditor_id", videosDTO.getShen_auditor_id());
236 return "page/video.html"; 244 return "page/video.html";
237 } 245 }
238 246
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
  View file @0ed7493
@@ -121,8 +121,8 @@ public class LiveApplyServiceImpl { @@ -121,8 +121,8 @@ public class LiveApplyServiceImpl {
121 criteria.andLike("theme", "%" + liveApplyDTO.getTheme() + "%"); 121 criteria.andLike("theme", "%" + liveApplyDTO.getTheme() + "%");
122 } 122 }
123 123
124 - if (CommonUtils.isNotNull(liveApplyDTO.getBusiness_model())) {  
125 - criteria.andLike("organization", "%" + liveApplyDTO.getBusiness_model() + "%"); 124 + if (CommonUtils.isNotEmpty(liveApplyDTO.getOrganization())) {
  125 + criteria.andLike("organization", "%" + liveApplyDTO.getOrganization() + "%");
126 } 126 }
127 if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) { 127 if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
128 criteria.andEqualTo("sp_id", liveApplyDTO.getSpid()); 128 criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
src/main/resources/templates/common/frame.html
  View file @0ed7493
@@ -74,7 +74,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" @@ -74,7 +74,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
74 <ul class="sidebar-menu"> 74 <ul class="sidebar-menu">
75 <li class="header">菜单导航</li> 75 <li class="header">菜单导航</li>
76 <li class="treeview active"> 76 <li class="treeview active">
77 - <a href="#" id="s"> 77 + <a href="#">
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">
@@ -89,7 +89,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; @@ -89,7 +89,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
89 </ul> 89 </ul>
90 </li> 90 </li>
91 <li class="treeview" th:if="${session.sessionUser.spid==0 || session.sessionUser.spid==60}"> 91 <li class="treeview" th:if="${session.sessionUser.spid==0 || session.sessionUser.spid==60}">
92 - <a href="#" id="x"> 92 + <a href="#">
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">
src/main/resources/templates/page/audio.html
  View file @0ed7493
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 <div class="col-md-5" style="padding: 0;width: 100%;"> 81 <div class="col-md-5" style="padding: 0;width: 100%;">
82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label> 82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
83 <div class="col-sm-9" style="padding: 0;"> 83 <div class="col-sm-9" style="padding: 0;">
84 - <input class="form-control" type="text" value="" id="video_titleID"> 84 + <input class="form-control" type="text" th:value="${AudioTitle}" value="" id="video_titleID">
85 </div> 85 </div>
86 </div> 86 </div>
87 </div> 87 </div>
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 <div class="col-md-10" style="padding: 0;width: 25%;"> 108 <div class="col-md-10" style="padding: 0;width: 25%;">
109 <label for="start_date" class="control-label cb-toolbar">时间:</label> 109 <label for="start_date" class="control-label cb-toolbar">时间:</label>
110 <div class="input-group col-md-9 date"> 110 <div class="input-group col-md-9 date">
111 - <input class="form-control date" name="start_date" type="text" 111 + <input class="form-control date" name="start_date" type="text" th:value="${Start_date}"
112 id="start_date"> 112 id="start_date">
113 <span class="input-group-addon"> 113 <span class="input-group-addon">
114 <span class="glyphicon glyphicon-calendar"></span> 114 <span class="glyphicon glyphicon-calendar"></span>
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 <div class="col-md-10" style="padding: 0;width: 25%;"> 118 <div class="col-md-10" style="padding: 0;width: 25%;">
119 <label for="start_date" class="control-label cb-toolbar">至</label> 119 <label for="start_date" class="control-label cb-toolbar">至</label>
120 <div class="input-group col-md-9 date"> 120 <div class="input-group col-md-9 date">
121 - <input class="form-control date" name="end_date" type="text" 121 + <input class="form-control date" name="end_date" type="text" th:value="${End_date}"
122 id="end_date"> 122 id="end_date">
123 <span class="input-group-addon"> 123 <span class="input-group-addon">
124 <span class="glyphicon glyphicon-calendar"></span> 124 <span class="glyphicon glyphicon-calendar"></span>
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 th:if="${session.sessionUser.spid==0}"> 130 th:if="${session.sessionUser.spid==0}">
131 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 131 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
132 <div class="col-sm-9" style="padding: 0;"> 132 <div class="col-sm-9" style="padding: 0;">
133 - <input class="form-control" type="text" value="" id="sp_desc"> 133 + <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
134 </div> 134 </div>
135 </div> 135 </div>
136 136
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 th:if="${session.sessionUser.spid==0}"> 138 th:if="${session.sessionUser.spid==0}">
139 <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label> 139 <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
140 <div class="col-sm-9" style="padding: 0;"> 140 <div class="col-sm-9" style="padding: 0;">
141 - <input class="form-control" type="text" value="" id="sp_Id"> 141 + <input class="form-control" type="text" th:value="${Sp_id}" value="" id="sp_Id">
142 </div> 142 </div>
143 </div> 143 </div>
144 <!-- <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}"> --> 144 <!-- <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}"> -->
@@ -338,18 +338,17 @@ @@ -338,18 +338,17 @@
338 </section> 338 </section>
339 </div> 339 </div>
340 <script th:inline="javascript"> 340 <script th:inline="javascript">
  341 + // 获取路径参数
341 function GetQueryString(name) { 342 function GetQueryString(name) {
342 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 343 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
343 var r = window.location.search.substr(1).match(reg); 344 var r = window.location.search.substr(1).match(reg);
344 if (r != null) return unescape(r[2]); 345 if (r != null) return unescape(r[2]);
345 return null; 346 return null;
346 } 347 }
347 - 348 + // 状态==2是展开状态 触发展开
348 $(function () { 349 $(function () {
349 - if (GetQueryString("up_d") == "2") { 350 + if (GetQueryString("expand_list_state") == "2") {
350 $("#query").click(); 351 $("#query").click();
351 - } else {  
352 -  
353 } 352 }
354 //按钮颜色设置 353 //按钮颜色设置
355 var state = [[${param.state}]] ? [[${param.state}]][0] : null; 354 var state = [[${param.state}]] ? [[${param.state}]][0] : null;
@@ -448,8 +447,8 @@ @@ -448,8 +447,8 @@
448 //全部 447 //全部
449 function quanbu() { 448 function quanbu() {
450 updateValue(); 449 updateValue();
451 - var up_d = $("#forms").attr("up_d");  
452 - window.location.href = "/audio/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 + "&up_d=" + up_d; 450 + var expand_list_state = $("#forms").attr("expand_list_state");
  451 + window.location.href = "/audio/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 + "&expand_list_state=" + expand_list_state;
453 } 452 }
454 453
455 //全部待领 454 //全部待领
@@ -636,12 +635,12 @@ @@ -636,12 +635,12 @@
636 $(id_name).slideUp(350); 635 $(id_name).slideUp(350);
637 $('#a_up').show(); 636 $('#a_up').show();
638 $('#a_down').hide(); 637 $('#a_down').hide();
639 - $("#forms").attr("up_d", "1"); 638 + $("#forms").attr("expand_list_state", "1");
640 } else { 639 } else {
641 $(id_name).slideDown(350); 640 $(id_name).slideDown(350);
642 $('#a_up').hide(); 641 $('#a_up').hide();
643 $('#a_down').show(); 642 $('#a_down').show();
644 - $("#forms").attr("up_d", "2"); 643 + $("#forms").attr("expand_list_state", "2");
645 } 644 }
646 } 645 }
647 646
src/main/resources/templates/page/channel.html
  View file @0ed7493
@@ -92,15 +92,14 @@ @@ -92,15 +92,14 @@
92 <label for="channel_id" class="control-label cb-toolbar">频道id:</label> 92 <label for="channel_id" class="control-label cb-toolbar">频道id:</label>
93 <div class="col-sm-8" style="padding: 0;"> 93 <div class="col-sm-8" style="padding: 0;">
94 <input class="form-control" name="channel_id" type="text" 94 <input class="form-control" name="channel_id" type="text"
95 - id="channel_id"> 95 + id="channel_id" th:value="${Channel_id}">
96 </div> 96 </div>
97 </div> 97 </div>
98 <div class="col-md-4" style="padding: 0"> 98 <div class="col-md-4" style="padding: 0">
99 <label for="channel_name" class="control-label cb-toolbar">频道名称:</label> 99 <label for="channel_name" class="control-label cb-toolbar">频道名称:</label>
100 <div class="col-sm-8" style="padding: 0;"> 100 <div class="col-sm-8" style="padding: 0;">
101 <input class="form-control" name="channel_name" type="text" 101 <input class="form-control" name="channel_name" type="text"
102 - id="channel_name"  
103 - > 102 + id="channel_name" th:value="${Channel_name}">
104 </div> 103 </div>
105 </div> 104 </div>
106 <div class="col-md-3" style="padding: 0"> 105 <div class="col-md-3" style="padding: 0">
@@ -123,7 +122,7 @@ @@ -123,7 +122,7 @@
123 <label for="start_date" class="control-label cb-toolbar">时间:</label> 122 <label for="start_date" class="control-label cb-toolbar">时间:</label>
124 <div class="input-group col-md-9 date"> 123 <div class="input-group col-md-9 date">
125 <input class="form-control date" name="start_date" type="text" 124 <input class="form-control date" name="start_date" type="text"
126 - id="start_date"> 125 + id="start_date" th:value="${Start_date}">
127 <span class="input-group-addon"> 126 <span class="input-group-addon">
128 <span class="glyphicon glyphicon-calendar"></span> 127 <span class="glyphicon glyphicon-calendar"></span>
129 </span> 128 </span>
@@ -133,7 +132,7 @@ @@ -133,7 +132,7 @@
133 <label for="start_date" class="control-label cb-toolbar">至</label> 132 <label for="start_date" class="control-label cb-toolbar">至</label>
134 <div class="input-group col-md-9 date"> 133 <div class="input-group col-md-9 date">
135 <input class="form-control date" name="end_date" type="text" 134 <input class="form-control date" name="end_date" type="text"
136 - id="end_date"> 135 + id="end_date" th:value="${End_date}">
137 <span class="input-group-addon"> 136 <span class="input-group-addon">
138 <span class="glyphicon glyphicon-calendar"></span> 137 <span class="glyphicon glyphicon-calendar"></span>
139 </span> 138 </span>
@@ -400,18 +399,17 @@ @@ -400,18 +399,17 @@
400 </div> 399 </div>
401 <!-- /.modal --> 400 <!-- /.modal -->
402 <script th:inline="javascript"> 401 <script th:inline="javascript">
  402 + // 获取路径参数
403 function GetQueryString(name) { 403 function GetQueryString(name) {
404 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 404 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
405 var r = window.location.search.substr(1).match(reg); 405 var r = window.location.search.substr(1).match(reg);
406 if (r != null) return unescape(r[2]); 406 if (r != null) return unescape(r[2]);
407 return null; 407 return null;
408 } 408 }
409 - 409 + // 状态==2是展开状态 触发展开
410 $(function () { 410 $(function () {
411 - if (GetQueryString("up_d") == "2") { 411 + if (GetQueryString("expand_list_state") == "2") {
412 $("#query").click(); 412 $("#query").click();
413 - } else {  
414 -  
415 } 413 }
416 //按钮颜色设置 414 //按钮颜色设置
417 var state = [[${param.shenhe_status}]] ? [[${param.shenhe_status}]][0] : null; 415 var state = [[${param.shenhe_status}]] ? [[${param.shenhe_status}]][0] : null;
@@ -488,8 +486,8 @@ @@ -488,8 +486,8 @@
488 start_date = $("#start_date").val(); 486 start_date = $("#start_date").val();
489 end_date = $("#end_date").val(); 487 end_date = $("#end_date").val();
490 count = $("#pageSize").val(); 488 count = $("#pageSize").val();
491 - var up_d = $("#forms").attr("up_d");  
492 - window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&up_d=" + up_d; 489 + var expand_list_state = $("#forms").attr("expand_list_state");
  490 + window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&expand_list_state=" + expand_list_state;
493 } 491 }
494 492
495 //全部 493 //全部
@@ -560,12 +558,12 @@ @@ -560,12 +558,12 @@
560 $(id_name).slideUp(350); 558 $(id_name).slideUp(350);
561 $('#a_up').show(); 559 $('#a_up').show();
562 $('#a_down').hide(); 560 $('#a_down').hide();
563 - $("#forms").attr("up_d", "1"); 561 + $("#forms").attr("expand_list_state", "1");
564 } else { 562 } else {
565 $(id_name).slideDown(350); 563 $(id_name).slideDown(350);
566 $('#a_up').hide(); 564 $('#a_up').hide();
567 $('#a_down').show(); 565 $('#a_down').show();
568 - $("#forms").attr("up_d", "2"); 566 + $("#forms").attr("expand_list_state", "2");
569 } 567 }
570 } 568 }
571 569
src/main/resources/templates/page/comment.html
  View file @0ed7493
@@ -94,25 +94,24 @@ @@ -94,25 +94,24 @@
94 <div class="col-md-3" style="padding: 0"> 94 <div class="col-md-3" style="padding: 0">
95 <label for="activity_id" class="control-label cb-toolbar">活动id:</label> 95 <label for="activity_id" class="control-label cb-toolbar">活动id:</label>
96 <div class="col-sm-8" style="padding: 0;"> 96 <div class="col-sm-8" style="padding: 0;">
97 - <input class="form-control" name="activity_id" type="text" 97 + <input class="form-control" name="activity_id" type="text" th:value="${Activity_id}"
98 id="activity_id"> 98 id="activity_id">
99 </div> 99 </div>
100 </div> 100 </div>
101 <div class="col-md-2" style="padding: 0"> 101 <div class="col-md-2" style="padding: 0">
102 <label for="comment_user_id" class="control-label cb-toolbar">sid:</label> 102 <label for="comment_user_id" class="control-label cb-toolbar">sid:</label>
103 <div class="col-sm-8" style="padding: 0;"> 103 <div class="col-sm-8" style="padding: 0;">
104 - <input class="form-control" name="comment_user_id" type="text" 104 + <input class="form-control" name="comment_user_id" type="text" th:value="${Comment_user_id}"
105 id="comment_user_id"> 105 id="comment_user_id">
106 </div> 106 </div>
107 </div> 107 </div>
108 -  
109 - <div class="col-md-5" style="padding: 0"> 108 + <div class="col-md-3" style="padding: 0">
110 <label for="content" class="control-label cb-toolbar">内容:</label> 109 <label for="content" class="control-label cb-toolbar">内容:</label>
111 <div class="col-sm-9" style="padding: 0;"> 110 <div class="col-sm-9" style="padding: 0;">
112 - <input class="form-control" name="content" type="text" id="content"> 111 + <input class="form-control" name="content" th:value="${Content}" type="text" id="content">
113 </div> 112 </div>
114 </div> 113 </div>
115 - <div class="col-md-2" style="padding: 0"> 114 + <div class="col-md-3" style="padding: 0">
116 <label for="state" class="control-label cb-toolbar">状态:</label> 115 <label for="state" class="control-label cb-toolbar">状态:</label>
117 <div class="col-sm-8" style="padding: 0;"> 116 <div class="col-sm-8" style="padding: 0;">
118 <select class="form-control col-sm-2" id="state" name="state"> 117 <select class="form-control col-sm-2" id="state" name="state">
@@ -124,36 +123,35 @@ @@ -124,36 +123,35 @@
124 </div> 123 </div>
125 </div> 124 </div>
126 </div> 125 </div>
127 -  
128 <div class="btn-group margin-bottom col-md-6 pull-right" style="padding: 0"> 126 <div class="btn-group margin-bottom col-md-6 pull-right" style="padding: 0">
129 <div class="col-md-3" style="padding: 0"> 127 <div class="col-md-3" style="padding: 0">
130 <label for="state" class="control-label cb-toolbar">类型:</label> 128 <label for="state" class="control-label cb-toolbar">类型:</label>
131 <div class="col-sm-8" style="padding: 0;"> 129 <div class="col-sm-8" style="padding: 0;">
132 <select class="form-control col-sm-2" id="topic" name="topic"> 130 <select class="form-control col-sm-2" id="topic" name="topic">
133 <option value="">全部</option> 131 <option value="">全部</option>
134 - <option value="0">话题</option>  
135 - <option value="1">其他</option> 132 + <option value="0" th:selected="${Type eq '0'}">话题</option>
  133 + <option value="1" th:selected="${Type eq '1'}">其他</option>
136 </select> 134 </select>
137 </div> 135 </div>
138 </div> 136 </div>
139 - <div class="col-md-5" style="padding: 0;"> 137 + <div class="col-md-4" style="padding: 0;">
140 <label for="start_date" class="control-label cb-toolbar">时间:</label> 138 <label for="start_date" class="control-label cb-toolbar">时间:</label>
141 <div class="input-group col-md-9 date"> 139 <div class="input-group col-md-9 date">
142 <input class="form-control date" name="start_date" type="text" 140 <input class="form-control date" name="start_date" type="text"
143 - id="start_date"> 141 + id="start_date" th:value="${Start_date}">
144 <span class="input-group-addon"> 142 <span class="input-group-addon">
145 <span class="glyphicon glyphicon-calendar"></span> 143 <span class="glyphicon glyphicon-calendar"></span>
146 - </span> 144 + </span>
147 </div> 145 </div>
148 </div> 146 </div>
149 <div class="col-md-4" style="padding: 0;"> 147 <div class="col-md-4" style="padding: 0;">
150 <label for="start_date" class="control-label cb-toolbar">至</label> 148 <label for="start_date" class="control-label cb-toolbar">至</label>
151 <div class="input-group col-md-9 date"> 149 <div class="input-group col-md-9 date">
152 <input class="form-control date" name="end_date" type="text" 150 <input class="form-control date" name="end_date" type="text"
153 - id="end_date"> 151 + id="end_date" th:value="${End_date}">
154 <span class="input-group-addon"> 152 <span class="input-group-addon">
155 <span class="glyphicon glyphicon-calendar"></span> 153 <span class="glyphicon glyphicon-calendar"></span>
156 - </span> 154 + </span>
157 </div> 155 </div>
158 </div> 156 </div>
159 </div> 157 </div>
@@ -527,6 +525,7 @@ @@ -527,6 +525,7 @@
527 </div> 525 </div>
528 <!-- /.modal --> 526 <!-- /.modal -->
529 <script th:inline="javascript"> 527 <script th:inline="javascript">
  528 + // 获取路径参数
530 function GetQueryString(name) { 529 function GetQueryString(name) {
531 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 530 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
532 var r = window.location.search.substr(1).match(reg); 531 var r = window.location.search.substr(1).match(reg);
@@ -534,12 +533,10 @@ @@ -534,12 +533,10 @@
534 return null; 533 return null;
535 } 534 }
536 535
537 - 536 + // 状态==2是展开状态 触发展开
538 $(function () { 537 $(function () {
539 - if (GetQueryString("up_d") == "2") { 538 + if (GetQueryString("expand_list_state") == "2") {
540 $("#query").click(); 539 $("#query").click();
541 - } else {  
542 -  
543 } 540 }
544 //按钮颜色设置 541 //按钮颜色设置
545 var state = [[${param.state}]] ? [[${param.state}]][0] : null; 542 var state = [[${param.state}]] ? [[${param.state}]][0] : null;
@@ -622,8 +619,8 @@ @@ -622,8 +619,8 @@
622 count = $("#pageSize").val(); 619 count = $("#pageSize").val();
623 type = $("#topic").val(); 620 type = $("#topic").val();
624 comment_user_id = $("#comment_user_id").val(); 621 comment_user_id = $("#comment_user_id").val();
625 - var up_d = $("#forms").attr("up_d");  
626 - window.location.href = "/comments/page?activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&content=" + content + "&pageSize=" + count + "&state=" + state + "&receive=" + receive + "&type=" + type + "&comment_user_id=" + comment_user_id + "&up_d=" + up_d; 622 + var expand_list_state = $("#forms").attr("expand_list_state");
  623 + window.location.href = "/comments/page?activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&content=" + content + "&pageSize=" + count + "&state=" + state + "&receive=" + receive + "&type=" + type + "&comment_user_id=" + comment_user_id + "&expand_list_state=" + expand_list_state;
627 } 624 }
628 625
629 //全部 626 //全部
@@ -736,12 +733,12 @@ @@ -736,12 +733,12 @@
736 $(id_name).slideUp(350); 733 $(id_name).slideUp(350);
737 $('#a_up').show(); 734 $('#a_up').show();
738 $('#a_down').hide(); 735 $('#a_down').hide();
739 - $("#forms").attr("up_d", "1"); 736 + $("#forms").attr("expand_list_state", "1");
740 } else { 737 } else {
741 $(id_name).slideDown(350); 738 $(id_name).slideDown(350);
742 $('#a_up').hide(); 739 $('#a_up').hide();
743 $('#a_down').show(); 740 $('#a_down').show();
744 - $("#forms").attr("up_d", "2"); 741 + $("#forms").attr("expand_list_state", "2");
745 } 742 }
746 } 743 }
747 744
src/main/resources/templates/page/commentDetail.html
  View file @0ed7493
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@
185 <script th:inline="javascript"> 185 <script th:inline="javascript">
186 186
187 $(function () { 187 $(function () {
188 - var url = "/content/page"; 188 + var url = "/comments/page";
189 $('ul.treeview-menu>li').removeClass("active"); 189 $('ul.treeview-menu>li').removeClass("active");
190 $('.sidebar-menu>li').removeClass("active"); 190 $('.sidebar-menu>li').removeClass("active");
191 $('ul.treeview-menu>li').find('a[id="' + url + '"]').closest('li').addClass('active'); //二级链接高亮 191 $('ul.treeview-menu>li').find('a[id="' + url + '"]').closest('li').addClass('active'); //二级链接高亮
src/main/resources/templates/page/content.html
  View file @0ed7493
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 <div class="col-md-5" style="padding: 0;width: 100%;"> 81 <div class="col-md-5" style="padding: 0;width: 100%;">
82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label> 82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
83 <div class="col-sm-9" style="padding: 0;"> 83 <div class="col-sm-9" style="padding: 0;">
84 - <input class="form-control" type="text" value="" id="video_titleID"> 84 + <input class="form-control" type="text" th:value="${Title}" value="" id="video_titleID">
85 </div> 85 </div>
86 </div> 86 </div>
87 </div> 87 </div>
@@ -89,9 +89,9 @@ @@ -89,9 +89,9 @@
89 <div class="btn-group margin-bottom col-md-6" 89 <div class="btn-group margin-bottom col-md-6"
90 style="padding: 0;width: 23%;float: left;"> 90 style="padding: 0;width: 23%;float: left;">
91 <div class="col-md-5" style="padding: 0;width: 100%;"> 91 <div class="col-md-5" style="padding: 0;width: 100%;">
92 - <label for="source" class="control-label cb-toolbar">来源（昵称）:</label> 92 + <label for="source" class="control-label cb-toolbar">来源昵称:</label>
93 <div class="col-sm-9" style="padding: 0;"> 93 <div class="col-sm-9" style="padding: 0;">
94 - <input class="form-control" type="text" value="" id="source"> 94 + <input class="form-control" type="text" th:value="${Source}" value="" id="source">
95 </div> 95 </div>
96 </div> 96 </div>
97 </div> 97 </div>
@@ -99,9 +99,9 @@ @@ -99,9 +99,9 @@
99 <div class="btn-group margin-bottom col-md-6" 99 <div class="btn-group margin-bottom col-md-6"
100 style="padding: 0;width: 23%;float: left;"> 100 style="padding: 0;width: 23%;float: left;">
101 <div class="col-md-5" style="padding: 0;width: 100%;"> 101 <div class="col-md-5" style="padding: 0;width: 100%;">
102 - <label for="author" class="control-label cb-toolbar">作者（sid）:</label> 102 + <label for="author" class="control-label cb-toolbar">作者sid:</label>
103 <div class="col-sm-9" style="padding: 0;"> 103 <div class="col-sm-9" style="padding: 0;">
104 - <input class="form-control" type="text" value="" id="author"> 104 + <input class="form-control" type="text" th:value="${Author}" value="" id="author">
105 </div> 105 </div>
106 </div> 106 </div>
107 </div> 107 </div>
@@ -113,10 +113,10 @@ @@ -113,10 +113,10 @@
113 <div class="col-sm-8" style="padding: 0;"> 113 <div class="col-sm-8" style="padding: 0;">
114 <select class="form-control" id="content_tag" name="content_tag"> 114 <select class="form-control" id="content_tag" name="content_tag">
115 <option value="">全部</option> 115 <option value="">全部</option>
116 - <option value="content">图文发布</option>  
117 - <option value="moment">朋友圈</option>  
118 - <option value="cms_photoalbum">家庭相册</option>  
119 - <option value="edu_works">作业作品</option> 116 + <option value="content" th:selected="${ContentTag eq 'content'}">图文发布</option>
  117 + <option value="moment" th:selected="${ContentTag eq 'moment'}">朋友圈</option>
  118 + <option value="cms_photoalbum" th:selected="${ContentTag eq 'cms_photoalbum'}">家庭相册</option>
  119 + <option value="edu_works" th:selected="${ContentTag eq 'edu_works'}">作业作品</option>
120 </select> 120 </select>
121 <!-- <input class="form-control" name="content_tag" type="text" id="content_tag"> --> 121 <!-- <input class="form-control" name="content_tag" type="text" id="content_tag"> -->
122 </div> 122 </div>
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 <label for="start_date" class="control-label cb-toolbar">时间:</label> 130 <label for="start_date" class="control-label cb-toolbar">时间:</label>
131 <div class="input-group col-md-9 date"> 131 <div class="input-group col-md-9 date">
132 <input class="form-control date" name="start_date" type="text" 132 <input class="form-control date" name="start_date" type="text"
133 - id="start_date"> 133 + id="start_date" th:value="${Start_date}">
134 <span class="input-group-addon"> 134 <span class="input-group-addon">
135 <span class="glyphicon glyphicon-calendar"></span> 135 <span class="glyphicon glyphicon-calendar"></span>
136 </span> 136 </span>
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 <label for="start_date" class="control-label cb-toolbar">至</label> 140 <label for="start_date" class="control-label cb-toolbar">至</label>
141 <div class="input-group col-md-9 date"> 141 <div class="input-group col-md-9 date">
142 <input class="form-control date" name="end_date" type="text" 142 <input class="form-control date" name="end_date" type="text"
143 - id="end_date"> 143 + id="end_date" th:value="${End_date}">
144 <span class="input-group-addon"> 144 <span class="input-group-addon">
145 <span class="glyphicon glyphicon-calendar"></span> 145 <span class="glyphicon glyphicon-calendar"></span>
146 </span> 146 </span>
@@ -151,23 +151,23 @@ @@ -151,23 +151,23 @@
151 th:if="${session.sessionUser.spid==0}"> 151 th:if="${session.sessionUser.spid==0}">
152 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 152 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
153 <div class="col-sm-7" style="padding: 0;"> 153 <div class="col-sm-7" style="padding: 0;">
154 - <input class="form-control" type="text" value="" id="sp_desc"> 154 + <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
155 </div> 155 </div>
156 </div> 156 </div>
157 157
158 - <div class="col-md-6" style="padding: 0;width: 15%;"  
159 - th:if="${session.sessionUser.spid==0}">  
160 - <label for="count" class="control-label cb-toolbar">每页条数:</label>  
161 - <div class="col-sm-5" style="padding: 0;">  
162 - <input class="form-control" type="text" value="" id="count">  
163 - </div>  
164 - </div> 158 +<!-- <div class="col-md-6" style="padding: 0;width: 15%;"-->
  159 +<!-- th:if="${session.sessionUser.spid==0}">-->
  160 +<!-- <label for="count" class="control-label cb-toolbar">每页条数:</label>-->
  161 +<!-- <div class="col-sm-5" style="padding: 0;">-->
  162 +<!-- <input class="form-control" type="text" value="" id="count">-->
  163 +<!-- </div>-->
  164 +<!-- </div>-->
165 165
166 <div class="col-md-6" style="padding: 0;width: 20%;" 166 <div class="col-md-6" style="padding: 0;width: 20%;"
167 th:if="${session.sessionUser.spid==0}"> 167 th:if="${session.sessionUser.spid==0}">
168 <label for="contentId" class="control-label cb-toolbar">图文发布id:</label> 168 <label for="contentId" class="control-label cb-toolbar">图文发布id:</label>
169 - <div class="col-sm-5" style="padding: 0;">  
170 - <input class="form-control" type="text" value="" id="contentId"> 169 + <div class="col-sm-6" style="padding: 0;">
  170 + <input class="form-control" type="text" th:value="${ContentId}" value="" id="contentId">
171 </div> 171 </div>
172 </div> 172 </div>
173 </div> 173 </div>
@@ -377,7 +377,7 @@ @@ -377,7 +377,7 @@
377 </section> 377 </section>
378 </div> 378 </div>
379 <script th:inline="javascript"> 379 <script th:inline="javascript">
380 - 380 + // 获取路径参数
381 function GetQueryString(name) { 381 function GetQueryString(name) {
382 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 382 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
383 var r = window.location.search.substr(1).match(reg); 383 var r = window.location.search.substr(1).match(reg);
@@ -385,12 +385,10 @@ @@ -385,12 +385,10 @@
385 return null; 385 return null;
386 } 386 }
387 387
388 - 388 + // 状态==2是展开状态 触发展开
389 $(function () { 389 $(function () {
390 - if (GetQueryString("up_d") == "2") { 390 + if (GetQueryString("expand_list_state") == "2") {
391 $("#query").click(); 391 $("#query").click();
392 - } else {  
393 -  
394 } 392 }
395 //按钮颜色设置 393 //按钮颜色设置
396 var receive_status = [[${param.receive_status}]] ? [[${param.receive_status}]][0] : null; 394 var receive_status = [[${param.receive_status}]] ? [[${param.receive_status}]][0] : null;
@@ -490,8 +488,8 @@ @@ -490,8 +488,8 @@
490 //全部 488 //全部
491 function quanbu() { 489 function quanbu() {
492 updateValue(); 490 updateValue();
493 - var up_d = $("#forms").attr("up_d");  
494 - 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 + "&up_d=" + up_d; 491 + var expand_list_state = $("#forms").attr("expand_list_state");
  492 + 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;
495 } 493 }
496 494
497 //全部待领 495 //全部待领
@@ -682,12 +680,12 @@ @@ -682,12 +680,12 @@
682 $(id_name).slideUp(350); 680 $(id_name).slideUp(350);
683 $('#a_up').show(); 681 $('#a_up').show();
684 $('#a_down').hide(); 682 $('#a_down').hide();
685 - $("#forms").attr("up_d", "1"); 683 + $("#forms").attr("expand_list_state", "1");
686 } else { 684 } else {
687 $(id_name).slideDown(350); 685 $(id_name).slideDown(350);
688 $('#a_up').hide(); 686 $('#a_up').hide();
689 $('#a_down').show(); 687 $('#a_down').show();
690 - $("#forms").attr("up_d", "2"); 688 + $("#forms").attr("expand_list_state", "2");
691 } 689 }
692 } 690 }
693 691
src/main/resources/templates/page/contentDetail.html
  View file @0ed7493
@@ -144,14 +144,14 @@ @@ -144,14 +144,14 @@
144 144
145 <div class="form-group"> 145 <div class="form-group">
146 <label for="comment_user_ip" 146 <label for="comment_user_ip"
147 - class="control-label col-sm-2">来源（昵称）:</label> 147 + class="control-label col-sm-2">来源昵称:</label>
148 <div class="col-sm-10"> 148 <div class="col-sm-10">
149 <h5 th:text="${content.source}">114.242.177.100</h5> 149 <h5 th:text="${content.source}">114.242.177.100</h5>
150 </div> 150 </div>
151 </div> 151 </div>
152 152
153 <div class="form-group"> 153 <div class="form-group">
154 - <label for="app_id" class="control-label col-sm-2">作者（sid）:</label> 154 + <label for="app_id" class="control-label col-sm-2">作者sid:</label>
155 <div class="col-sm-10"> 155 <div class="col-sm-10">
156 <h5 th:text="${content.author}">769_jetj7bq525</h5> 156 <h5 th:text="${content.author}">769_jetj7bq525</h5>
157 </div> 157 </div>
src/main/resources/templates/page/live.html
  View file @0ed7493
@@ -86,14 +86,14 @@ @@ -86,14 +86,14 @@
86 <label for="activity_name" class="control-label cb-toolbar">直播名称:</label> 86 <label for="activity_name" class="control-label cb-toolbar">直播名称:</label>
87 <div class="col-sm-7" style="padding: 0;"> 87 <div class="col-sm-7" style="padding: 0;">
88 <input class="form-control col-sm-2" name="activity_name" 88 <input class="form-control col-sm-2" name="activity_name"
89 - type="text" id="activity_name"> 89 + type="text" id="activity_name" th:value="${Activity_name}">
90 </div> 90 </div>
91 </div> 91 </div>
92 <div class="col-md-3" style="padding: 0"> 92 <div class="col-md-3" style="padding: 0">
93 <label for="activity_id" class="control-label cb-toolbar">直播id:</label> 93 <label for="activity_id" class="control-label cb-toolbar">直播id:</label>
94 <div class="col-sm-7" style="padding: 0;"> 94 <div class="col-sm-7" style="padding: 0;">
95 <input class="form-control" name="activity_id" type="text" 95 <input class="form-control" name="activity_id" type="text"
96 - id="activity_id"> 96 + id="activity_id" th:value="${Activity_id}">
97 </div> 97 </div>
98 </div> 98 </div>
99 99
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <label for="contentId" class="control-label cb-toolbar">内容id:</label> 101 <label for="contentId" class="control-label cb-toolbar">内容id:</label>
102 <div class="col-sm-7" style="padding: 0;"> 102 <div class="col-sm-7" style="padding: 0;">
103 <input class="form-control" name="contentId" type="text" 103 <input class="form-control" name="contentId" type="text"
104 - id="contentId"> 104 + id="contentId" th:value="${ContentId}">
105 </div> 105 </div>
106 </div> 106 </div>
107 107
@@ -119,21 +119,21 @@ @@ -119,21 +119,21 @@
119 th:if="${session.sessionUser.spid==0}"> 119 th:if="${session.sessionUser.spid==0}">
120 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 120 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
121 <div class="col-sm-8" style="padding: 0;"> 121 <div class="col-sm-8" style="padding: 0;">
122 - <input class="form-control" type="text" value="" id="sp_desc"> 122 + <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
123 </div> 123 </div>
124 </div> 124 </div>
125 <div class="col-md-3" style="padding: 0"> 125 <div class="col-md-3" style="padding: 0">
126 <label for="activity_status" 126 <label for="activity_status"
127 class="control-label cb-toolbar">直播状态:</label> 127 class="control-label cb-toolbar">直播状态:</label>
128 - <div class="col-sm-6" style="padding: 0;"> 128 + <div class="col-sm-7" style="padding: 0;">
129 <select class="form-control col-sm-2" id="activity_status" 129 <select class="form-control col-sm-2" id="activity_status"
130 name="activity_status"> 130 name="activity_status">
131 <option value="">全部</option> 131 <option value="">全部</option>
132 - <option value="3">等待直播</option>  
133 - <option value="1">正在直播</option>  
134 - <option value="2">直播结束</option>  
135 - <option value="0">直播撤销</option>  
136 - <option value="4">直播下线</option> 132 + <option value="3" th:selected="${ActivityStatus==3}">等待直播</option>
  133 + <option value="1" th:selected="${ActivityStatus==1}">正在直播</option>
  134 + <option value="2" th:selected="${ActivityStatus==2}">直播结束</option>
  135 + <option value="0" th:selected="${ActivityStatus==0}">直播撤销</option>
  136 + <option value="4" th:selected="${ActivityStatus==4}">直播下线</option>
137 </select> 137 </select>
138 </div> 138 </div>
139 </div> 139 </div>
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 <label for="start_date" class="control-label cb-toolbar">时间:</label> 147 <label for="start_date" class="control-label cb-toolbar">时间:</label>
148 <div class='input-group col-md-9 date'> 148 <div class='input-group col-md-9 date'>
149 <input class="form-control date" name="start_date" 149 <input class="form-control date" name="start_date"
150 - type="text" id="start_date"> <span 150 + type="text" id="start_date" th:value="${Start_date}"> <span
151 class="input-group-addon"> <span 151 class="input-group-addon"> <span
152 class="glyphicon glyphicon-calendar"></span> 152 class="glyphicon glyphicon-calendar"></span>
153 </span> 153 </span>
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 <label for="start_date" class="control-label cb-toolbar">至</label> 157 <label for="start_date" class="control-label cb-toolbar">至</label>
158 <div class='input-group col-md-9 date'> 158 <div class='input-group col-md-9 date'>
159 <input class="form-control date" name="end_date" 159 <input class="form-control date" name="end_date"
160 - type="text" id="end_date"> <span class="input-group-addon"> 160 + type="text" id="end_date" th:value="${End_date}"> <span class="input-group-addon">
161 <span class="glyphicon glyphicon-calendar"></span> 161 <span class="glyphicon glyphicon-calendar"></span>
162 </span> 162 </span>
163 </div> 163 </div>
@@ -458,7 +458,7 @@ @@ -458,7 +458,7 @@
458 458
459 459
460 <script th:inline="javascript"> 460 <script th:inline="javascript">
461 - 461 + // 获取路径参数
462 function GetQueryString(name) { 462 function GetQueryString(name) {
463 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 463 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
464 var r = window.location.search.substr(1).match(reg); 464 var r = window.location.search.substr(1).match(reg);
@@ -489,8 +489,8 @@ @@ -489,8 +489,8 @@
489 sp_desc = $("#sp_desc").val(); 489 sp_desc = $("#sp_desc").val();
490 contentId = $("#contentId").val(); 490 contentId = $("#contentId").val();
491 } 491 }
492 - var up_d = $("#forms").attr("up_d");  
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 + "&up_d=" + up_d; 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;
494 } 494 }
495 495
496 //全部 496 //全部
@@ -709,21 +709,19 @@ @@ -709,21 +709,19 @@
709 $(id_name).slideUp(350); 709 $(id_name).slideUp(350);
710 $('#a_up').show(); 710 $('#a_up').show();
711 $('#a_down').hide(); 711 $('#a_down').hide();
712 - $("#forms").attr("up_d", "1"); 712 + $("#forms").attr("expand_list_state", "1");
713 } else { 713 } else {
714 $(id_name).slideDown(350); 714 $(id_name).slideDown(350);
715 $('#a_up').hide(); 715 $('#a_up').hide();
716 $('#a_down').show(); 716 $('#a_down').show();
717 - $("#forms").attr("up_d", "2"); 717 + $("#forms").attr("expand_list_state", "2");
718 } 718 }
719 } 719 }
720 720
721 - 721 + // 状态==2是展开状态 触发展开
722 $(function () { 722 $(function () {
723 - if (GetQueryString("up_d") == "2") { 723 + if (GetQueryString("expand_list_state") == "2") {
724 $("#query").click(); 724 $("#query").click();
725 - } else {  
726 -  
727 } 725 }
728 //按钮颜色设置 726 //按钮颜色设置
729 var shenhe_state = [[${param.shenhe_state}]] ? [[${param.shenhe_state}]][0] : null; 727 var shenhe_state = [[${param.shenhe_state}]] ? [[${param.shenhe_state}]][0] : null;
src/main/resources/templates/page/liveApply.html
  View file @0ed7493
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 <div class="col-md-6" style="padding: 0;width: 100%;"> 80 <div class="col-md-6" style="padding: 0;width: 100%;">
81 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label> 81 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label>
82 <div class="col-sm-7" style="padding: 0;"> 82 <div class="col-sm-7" style="padding: 0;">
83 - <input class="form-control" type="text" value="" id="liveApply_theme"> 83 + <input class="form-control" type="text" th:value="${Theme}" value="" id="liveApply_theme">
84 </div> 84 </div>
85 </div> 85 </div>
86 </div> 86 </div>
@@ -114,10 +114,10 @@ @@ -114,10 +114,10 @@
114 <div class="btn-group margin-bottom col-md-6" 114 <div class="btn-group margin-bottom col-md-6"
115 style="padding-left: 0px;width: 15%;float: left;"> 115 style="padding-left: 0px;width: 15%;float: left;">
116 <div class="col-md-5" style="padding: 0;width: 100%;"> 116 <div class="col-md-5" style="padding: 0;width: 100%;">
117 - <label for="business_model" class="control-label cb-toolbar">发起单位:</label> 117 + <label for="organization" class="control-label cb-toolbar">发起单位:</label>
118 <div class="col-sm-7" style="padding: 0;"> 118 <div class="col-sm-7" style="padding: 0;">
119 - <input class="form-control" type="text" value="" id="business_model"  
120 - name="business_model"> 119 + <input class="form-control" type="text" th:value="${Organization}" value="" id="organization"
  120 + name="organization">
121 </div> 121 </div>
122 </div> 122 </div>
123 </div> 123 </div>
@@ -127,7 +127,7 @@ @@ -127,7 +127,7 @@
127 th:if="${session.sessionUser.spid==0}"> 127 th:if="${session.sessionUser.spid==0}">
128 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 128 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
129 <div class="col-sm-7" style="padding: 0;"> 129 <div class="col-sm-7" style="padding: 0;">
130 - <input class="form-control" type="text" value="" id="sp_desc"> 130 + <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
131 </div> 131 </div>
132 </div> 132 </div>
133 </div> 133 </div>
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 <label for="start_date" class="control-label cb-toolbar">预计时间:</label> 137 <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
138 <div class="input-group col-md-8 date"> 138 <div class="input-group col-md-8 date">
139 <input class="form-control date" name="start_date" type="text" 139 <input class="form-control date" name="start_date" type="text"
140 - id="start_date"> 140 + id="start_date" th:value="${Start_date}">
141 <span class="input-group-addon"> 141 <span class="input-group-addon">
142 <span class="glyphicon glyphicon-calendar"></span> 142 <span class="glyphicon glyphicon-calendar"></span>
143 </span> 143 </span>
@@ -150,7 +150,7 @@ @@ -150,7 +150,7 @@
150 <label for="start_date" class="control-label cb-toolbar">至</label> 150 <label for="start_date" class="control-label cb-toolbar">至</label>
151 <div class="input-group col-md-8 date"> 151 <div class="input-group col-md-8 date">
152 <input class="form-control date" name="end_date" type="text" 152 <input class="form-control date" name="end_date" type="text"
153 - id="end_date"> 153 + id="end_date" th:value="${End_date}">
154 <span class="input-group-addon"> 154 <span class="input-group-addon">
155 <span class="glyphicon glyphicon-calendar"></span> 155 <span class="glyphicon glyphicon-calendar"></span>
156 </span> 156 </span>
@@ -400,18 +400,17 @@ @@ -400,18 +400,17 @@
400 </section> 400 </section>
401 </div> 401 </div>
402 <script th:inline="javascript"> 402 <script th:inline="javascript">
  403 + // 获取路径参数
403 function GetQueryString(name) { 404 function GetQueryString(name) {
404 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 405 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
405 var r = window.location.search.substr(1).match(reg); 406 var r = window.location.search.substr(1).match(reg);
406 if (r != null) return unescape(r[2]); 407 if (r != null) return unescape(r[2]);
407 return null; 408 return null;
408 } 409 }
409 - 410 + // 状态==2是展开状态 触发展开
410 $(function () { 411 $(function () {
411 - if (GetQueryString("up_d") == "2") { 412 + if (GetQueryString("expand_list_state") == "2") {
412 $("#query").click(); 413 $("#query").click();
413 - } else {  
414 -  
415 } 414 }
416 //按钮颜色设置 415 //按钮颜色设置
417 var state = [[${param.shenhe_state}]] ? [[${param.shenhe_state}]][0] : null; 416 var state = [[${param.shenhe_state}]] ? [[${param.shenhe_state}]][0] : null;
@@ -486,7 +485,7 @@ @@ -486,7 +485,7 @@
486 var start_date = ""; 485 var start_date = "";
487 var end_date = ""; 486 var end_date = "";
488 var sp_desc = ""; 487 var sp_desc = "";
489 - var business_model = ""; 488 + var organization = "";
490 var shenhe_state = ""; 489 var shenhe_state = "";
491 var count = ""; 490 var count = "";
492 491
@@ -495,7 +494,7 @@ @@ -495,7 +494,7 @@
495 start_date = $("#start_date").val(); 494 start_date = $("#start_date").val();
496 end_date = $("#end_date").val(); 495 end_date = $("#end_date").val();
497 shenhe_state = $("#shenhe_state").val(); 496 shenhe_state = $("#shenhe_state").val();
498 - business_model = $("#business_model").val(); 497 + organization = $("#organization").val();
499 count = $("#pageSize").val(); 498 count = $("#pageSize").val();
500 var spId = [[${session.sessionUser.spid}]]; 499 var spId = [[${session.sessionUser.spid}]];
501 if (spId == 0) { 500 if (spId == 0) {
@@ -508,8 +507,8 @@ @@ -508,8 +507,8 @@
508 function quanbu() { 507 function quanbu() {
509 updateValue(); 508 updateValue();
510 var receive = ""; 509 var receive = "";
511 - var up_d = $("#forms").attr("up_d");  
512 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&up_d=" + up_d; 510 + var expand_list_state = $("#forms").attr("expand_list_state");
  511 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
513 } 512 }
514 513
515 //全部待领 514 //全部待领
@@ -517,27 +516,27 @@ @@ -517,27 +516,27 @@
517 updateValue(); 516 updateValue();
518 if ($.trim(shenhe_state) == '') shenhe_state = 0; 517 if ($.trim(shenhe_state) == '') shenhe_state = 0;
519 var receive = 0; 518 var receive = 0;
520 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count; 519 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
521 }); 520 });
522 //我的待审核 521 //我的待审核
523 $('#Mydaishen').click(function () { 522 $('#Mydaishen').click(function () {
524 updateValue(); 523 updateValue();
525 var receive = 1; 524 var receive = 1;
526 if ($.trim(shenhe_state) == '') shenhe_state = 0; 525 if ($.trim(shenhe_state) == '') shenhe_state = 0;
527 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count; 526 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
528 }); 527 });
529 //我的已审核 528 //我的已审核
530 $('#yishen').click(function () { 529 $('#yishen').click(function () {
531 updateValue(); 530 updateValue();
532 var receive = 1; 531 var receive = 1;
533 if ($.trim(shenhe_state) == '') shenhe_state = 3;//审核状态，3代表通过和拒绝都查询 532 if ($.trim(shenhe_state) == '') shenhe_state = 3;//审核状态，3代表通过和拒绝都查询
534 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count; 533 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
535 }); 534 });
536 535
537 536
538 //查询 537 //查询
539 $('#videos_query').click(function () { 538 $('#videos_query').click(function () {
540 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count; 539 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
541 }); 540 });
542 /*全选的操作*/ 541 /*全选的操作*/
543 $('#select_all').click(function () { 542 $('#select_all').click(function () {
@@ -726,12 +725,12 @@ @@ -726,12 +725,12 @@
726 $(id_name).slideUp(350); 725 $(id_name).slideUp(350);
727 $('#a_up').show(); 726 $('#a_up').show();
728 $('#a_down').hide(); 727 $('#a_down').hide();
729 - $("#forms").attr("up_d", "1"); 728 + $("#forms").attr("expand_list_state", "1");
730 } else { 729 } else {
731 $(id_name).slideDown(350); 730 $(id_name).slideDown(350);
732 $('#a_up').hide(); 731 $('#a_up').hide();
733 $('#a_down').show(); 732 $('#a_down').show();
734 - $("#forms").attr("up_d", "2"); 733 + $("#forms").attr("expand_list_state", "2");
735 } 734 }
736 } 735 }
737 736
src/main/resources/templates/page/log.html
  View file @0ed7493
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </div> 36 </div>
37 </div> 37 </div>
38 <div class="columns columns-right btn-group pull-right"> 38 <div class="columns columns-right btn-group pull-right">
39 - <button class="btn btn-default" type="button" name="refresh" title="搜索" id="site_query">搜索</button> 39 + <button class="btn btn-default" type="button" name="refresh" title="搜索" id="site_query">刷新</button>
40 <ul class="dropdown-menu" role="menu"> 40 <ul class="dropdown-menu" role="menu">
41 <li><label><input type="checkbox" data-field="sp_id" value="0" 41 <li><label><input type="checkbox" data-field="sp_id" value="0"
42 checked="checked"> 视频ID</label></li> 42 checked="checked"> 视频ID</label></li>
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 </div> 55 </div>
56 <div class="pull-right search"> 56 <div class="pull-right search">
57 <form id="searchForm"> 57 <form id="searchForm">
58 - <input class="form-control" type="text" placeholder="搜索" id="keyword" name="keyword" th:value="${param.keyword}"> 58 + <input class="form-control" type="text" placeholder="刷新" id="keyword" name="keyword" th:value="${param.keyword}">
59 </form> 59 </form>
60 </div> 60 </div>
61 </div> 61 </div>
src/main/resources/templates/page/notspeak.html
  View file @0ed7493
@@ -128,13 +128,13 @@ @@ -128,13 +128,13 @@
128 <label for="user_id" class="control-label cb-toolbar">用户id:</label> 128 <label for="user_id" class="control-label cb-toolbar">用户id:</label>
129 <div class="col-sm-8" style="padding: 0;"> 129 <div class="col-sm-8" style="padding: 0;">
130 <input class="form-control" name="user_id" type="text" 130 <input class="form-control" name="user_id" type="text"
131 - id="user_id"> 131 + id="user_id" th:value="${User_id}">
132 </div> 132 </div>
133 </div> 133 </div>
134 <div class="col-md-5" style="padding: 0"> 134 <div class="col-md-5" style="padding: 0">
135 <label for="user_name" class="control-label cb-toolbar">用户昵称:</label> 135 <label for="user_name" class="control-label cb-toolbar">用户昵称:</label>
136 <div class="col-sm-8" style="padding: 0;"> 136 <div class="col-sm-8" style="padding: 0;">
137 - <input class="form-control" name="user_name" type="text" id="user_name"> 137 + <input class="form-control" name="user_name" th:value="${User_name}" type="text" id="user_name">
138 </div> 138 </div>
139 </div> 139 </div>
140 <!-- <div class="col-md-3" style="padding: 0"> --> 140 <!-- <div class="col-md-3" style="padding: 0"> -->
@@ -444,19 +444,17 @@ @@ -444,19 +444,17 @@
444 </div> 444 </div>
445 <!-- /.modal --> 445 <!-- /.modal -->
446 <script th:inline="javascript"> 446 <script th:inline="javascript">
447 - 447 + // 获取路径参数
448 function GetQueryString(name) { 448 function GetQueryString(name) {
449 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 449 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
450 var r = window.location.search.substr(1).match(reg); 450 var r = window.location.search.substr(1).match(reg);
451 if (r != null) return unescape(r[2]); 451 if (r != null) return unescape(r[2]);
452 return null; 452 return null;
453 } 453 }
454 - 454 + // 状态==2是展开状态 触发展开
455 $(function () { 455 $(function () {
456 - if (GetQueryString("up_d") == "2") { 456 + if (GetQueryString("expand_list_state") == "2") {
457 $("#query").click(); 457 $("#query").click();
458 - } else {  
459 -  
460 } 458 }
461 //按钮颜色设置 459 //按钮颜色设置
462 var state = [[${param.state}]] ? [[${param.state}]][0] : null; 460 var state = [[${param.state}]] ? [[${param.state}]][0] : null;
@@ -484,8 +482,8 @@ @@ -484,8 +482,8 @@
484 user_id = $("#user_id").val(); 482 user_id = $("#user_id").val();
485 user_name = $("#user_name").val(); 483 user_name = $("#user_name").val();
486 count = $("#pageSize").val(); 484 count = $("#pageSize").val();
487 - var up_d = $("#forms").attr("up_d");  
488 - window.location.href = "/notSpeak/page?user_id=" + user_id + "&user_name=" + user_name + "&state=" + state + "&pageSize=" + count + "&up_d=" + up_d; 485 + var expand_list_state = $("#forms").attr("expand_list_state");
  486 + window.location.href = "/notSpeak/page?user_id=" + user_id + "&user_name=" + user_name + "&state=" + state + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
489 } 487 }
490 488
491 //全部 489 //全部
@@ -660,12 +658,12 @@ @@ -660,12 +658,12 @@
660 $(id_name).slideUp(350); 658 $(id_name).slideUp(350);
661 $('#a_up').show(); 659 $('#a_up').show();
662 $('#a_down').hide(); 660 $('#a_down').hide();
663 - $("#forms").attr("up_d", "1"); 661 + $("#forms").attr("expand_list_state", "1");
664 } else { 662 } else {
665 $(id_name).slideDown(350); 663 $(id_name).slideDown(350);
666 $('#a_up').hide(); 664 $('#a_up').hide();
667 $('#a_down').show(); 665 $('#a_down').show();
668 - $("#forms").attr("up_d", "2"); 666 + $("#forms").attr("expand_list_state", "2");
669 } 667 }
670 } 668 }
671 </script> 669 </script>
src/main/resources/templates/page/topic.html
  View file @0ed7493
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 <div class="col-md-6" style="padding: 0;width: 100%;"> 89 <div class="col-md-6" style="padding: 0;width: 100%;">
90 <label for="topicId" class="control-label cb-toolbar">话题id:</label> 90 <label for="topicId" class="control-label cb-toolbar">话题id:</label>
91 <div class="col-sm-7" style="padding: 0;"> 91 <div class="col-sm-7" style="padding: 0;">
92 - <input class="form-control" type="text" value="" id="topicId" 92 + <input class="form-control" type="text" th:value="${Topic_id}" value="" id="topicId"
93 name="topicId"> 93 name="topicId">
94 </div> 94 </div>
95 </div> 95 </div>
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 <div class="col-md-5" style="padding: 0;width: 100%;"> 114 <div class="col-md-5" style="padding: 0;width: 100%;">
115 <label for="topic_name" class="control-label cb-toolbar">话题标题:</label> 115 <label for="topic_name" class="control-label cb-toolbar">话题标题:</label>
116 <div class="col-sm-7" style="padding: 0;"> 116 <div class="col-sm-7" style="padding: 0;">
117 - <input class="form-control" type="text" value="" id="topic_name" 117 + <input class="form-control" type="text" th:value="${Topic_name}" value="" id="topic_name"
118 name="topic_name"> 118 name="topic_name">
119 </div> 119 </div>
120 </div> 120 </div>
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 th:if="${session.sessionUser.spid==0}"> 125 th:if="${session.sessionUser.spid==0}">
126 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 126 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
127 <div class="col-sm-7" style="padding: 0;"> 127 <div class="col-sm-7" style="padding: 0;">
128 - <input class="form-control" type="text" value="" id="sp_desc"> 128 + <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
129 </div> 129 </div>
130 </div> 130 </div>
131 </div> 131 </div>
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 <label for="start_date" class="control-label cb-toolbar">预计时间:</label> 135 <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
136 <div class="input-group col-md-8 date"> 136 <div class="input-group col-md-8 date">
137 <input class="form-control date" name="start_date" type="text" 137 <input class="form-control date" name="start_date" type="text"
138 - id="start_date"> 138 + id="start_date" th:value="${Start_date}">
139 <span class="input-group-addon"> 139 <span class="input-group-addon">
140 <span class="glyphicon glyphicon-calendar"></span> 140 <span class="glyphicon glyphicon-calendar"></span>
141 </span> 141 </span>
@@ -148,7 +148,7 @@ @@ -148,7 +148,7 @@
148 <label for="start_date" class="control-label cb-toolbar">至</label> 148 <label for="start_date" class="control-label cb-toolbar">至</label>
149 <div class="input-group col-md-8 date"> 149 <div class="input-group col-md-8 date">
150 <input class="form-control date" name="end_date" type="text" 150 <input class="form-control date" name="end_date" type="text"
151 - id="end_date"> 151 + id="end_date" th:value="${End_date}">
152 <span class="input-group-addon"> 152 <span class="input-group-addon">
153 <span class="glyphicon glyphicon-calendar"></span> 153 <span class="glyphicon glyphicon-calendar"></span>
154 </span> 154 </span>
@@ -418,6 +418,7 @@ @@ -418,6 +418,7 @@
418 </div> 418 </div>
419 <!-- /.modal --> 419 <!-- /.modal -->
420 <script th:inline="javascript"> 420 <script th:inline="javascript">
  421 + // 获取路径参数
421 function GetQueryString(name) { 422 function GetQueryString(name) {
422 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 423 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
423 var r = window.location.search.substr(1).match(reg); 424 var r = window.location.search.substr(1).match(reg);
@@ -426,10 +427,8 @@ @@ -426,10 +427,8 @@
426 } 427 }
427 428
428 $(function () { 429 $(function () {
429 - if (GetQueryString("up_d") == "2") { 430 + if (GetQueryString("expand_list_state") == "2") {
430 $("#query").click(); 431 $("#query").click();
431 - } else {  
432 -  
433 } 432 }
434 //按钮颜色设置 433 //按钮颜色设置
435 var state = [[${param.shenhe_status}]] ? [[${param.shenhe_status}]][0] : null; 434 var state = [[${param.shenhe_status}]] ? [[${param.shenhe_status}]][0] : null;
@@ -508,8 +507,8 @@ @@ -508,8 +507,8 @@
508 end_date = $("#end_date").val(); 507 end_date = $("#end_date").val();
509 count = $("#pageSize").val(); 508 count = $("#pageSize").val();
510 sp_desc = $("#sp_desc").val(); 509 sp_desc = $("#sp_desc").val();
511 - var up_d = $("#forms").attr("up_d");  
512 - window.location.href = "/topic/page?topic_id=" + topic_id + "&start_date=" + start_date + "&end_date=" + end_date + "&topic_name=" + topic_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&sp_desc=" + sp_desc + "&up_d=" + up_d; 510 + var expand_list_state = $("#forms").attr("expand_list_state");
  511 + window.location.href = "/topic/page?topic_id=" + topic_id + "&start_date=" + start_date + "&end_date=" + end_date + "&topic_name=" + topic_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&sp_desc=" + sp_desc + "&expand_list_state=" + expand_list_state;
513 } 512 }
514 513
515 //全部 514 //全部
@@ -584,12 +583,12 @@ @@ -584,12 +583,12 @@
584 $(id_name).slideUp(350); 583 $(id_name).slideUp(350);
585 $('#a_up').show(); 584 $('#a_up').show();
586 $('#a_down').hide(); 585 $('#a_down').hide();
587 - $("#forms").attr("up_d", "1"); 586 + $("#forms").attr("expand_list_state", "1");
588 } else { 587 } else {
589 $(id_name).slideDown(350); 588 $(id_name).slideDown(350);
590 $('#a_up').hide(); 589 $('#a_up').hide();
591 $('#a_down').show(); 590 $('#a_down').show();
592 - $("#forms").attr("up_d", "2"); 591 + $("#forms").attr("expand_list_state", "2");
593 } 592 }
594 } 593 }
595 594
src/main/resources/templates/page/users.html
  View file @0ed7493
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <div class="col-md-5" style="padding: 0;width: 20%;"> 34 <div class="col-md-5" style="padding: 0;width: 20%;">
35 <label for="sp_id" class="control-label cb-toolbar" style="font-size:15px;top:8px;font-weight:100;">spId:</label> 35 <label for="sp_id" class="control-label cb-toolbar" style="font-size:15px;top:8px;font-weight:100;">spId:</label>
36 <div class="col-sm-9" style="padding: 0;"> 36 <div class="col-sm-9" style="padding: 0;">
37 - <input class="form-control" type="text" value="" id="sp_id"> 37 + <input class="form-control" th:value="${Sp_id}" type="text" value="" id="sp_id">
38 </div> 38 </div>
39 </div> 39 </div>
40 <div class="col-md-6" style="padding: 0;width: 25%;" > 40 <div class="col-md-6" style="padding: 0;width: 25%;" >
@@ -46,13 +46,13 @@ @@ -46,13 +46,13 @@
46 <div class="col-md-6" style="padding: 0;width: 20%;" > 46 <div class="col-md-6" style="padding: 0;width: 20%;" >
47 <label for="username" class="control-label cb-toolbar" style="font-size:15px;top:8px;font-weight:100;">用户名:</label> 47 <label for="username" class="control-label cb-toolbar" style="font-size:15px;top:8px;font-weight:100;">用户名:</label>
48 <div class="col-sm-8" style="padding: 0;"> 48 <div class="col-sm-8" style="padding: 0;">
49 - <input class="form-control" type="text" value="" id="username"> 49 + <input class="form-control" type="text" th:value="${Username}" value="" id="username">
50 </div> 50 </div>
51 </div> 51 </div>
52 <div class="col-md-6" style="padding: 0;width: 20%;" > 52 <div class="col-md-6" style="padding: 0;width: 20%;" >
53 <label for="mobile" class="control-label cb-toolbar" style="font-size:15px;top:8px;font-weight:100;">手机号:</label> 53 <label for="mobile" class="control-label cb-toolbar" style="font-size:15px;top:8px;font-weight:100;">手机号:</label>
54 <div class="col-sm-7" style="padding: 0;"> 54 <div class="col-sm-7" style="padding: 0;">
55 - <input class="form-control" type="text" value="" id="mobile"> 55 + <input class="form-control" type="text" th:value="${Mobile}" value="" id="mobile">
56 </div> 56 </div>
57 </div> 57 </div>
58 <div class="col-md-6" style="padding: 0;width: 15%;"> 58 <div class="col-md-6" style="padding: 0;width: 15%;">
src/main/resources/templates/page/video.html
  View file @0ed7493
@@ -75,14 +75,13 @@ @@ -75,14 +75,13 @@
75 <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span> 75 <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
76 </button> 76 </button>
77 </div> 77 </div>
78 - <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;"  
79 - up_d="1"> 78 + <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
80 <div class="btn-group margin-bottom col-md-6" 79 <div class="btn-group margin-bottom col-md-6"
81 style="padding: 0;width: 15%;float: left;"> 80 style="padding: 0;width: 15%;float: left;">
82 <div class="col-md-5" style="padding: 0;width: 100%;"> 81 <div class="col-md-5" style="padding: 0;width: 100%;">
83 <label for="video_titleID" class="control-label cb-toolbar">标题:</label> 82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
84 <div class="col-sm-9" style="padding: 0;"> 83 <div class="col-sm-9" style="padding: 0;">
85 - <input class="form-control" type="text" value="" id="video_titleID"> 84 + <input class="form-control" type="text" th:value="${VideoTitle}" value="" id="video_titleID">
86 </div> 85 </div>
87 </div> 86 </div>
88 </div> 87 </div>
@@ -106,11 +105,11 @@ @@ -106,11 +105,11 @@
106 105
107 <div class="btn-group margin-bottom col-md-6 pull-right" 106 <div class="btn-group margin-bottom col-md-6 pull-right"
108 style="position: relative;width: 75%;float: left !important;"> 107 style="position: relative;width: 75%;float: left !important;">
109 - <div class="col-md-18" style="width: 100%;padding: 0;"> 108 + <div class="col-md-10" style="width: 100%;padding: 0;">
110 <div class="col-md-10" style="padding: 0;width: 25%;"> 109 <div class="col-md-10" style="padding: 0;width: 25%;">
111 <label for="start_date" class="control-label cb-toolbar">时间:</label> 110 <label for="start_date" class="control-label cb-toolbar">时间:</label>
112 <div class="input-group col-md-9 date"> 111 <div class="input-group col-md-9 date">
113 - <input class="form-control date" name="start_date" type="text" 112 + <input class="form-control date" name="start_date" type="text" th:value="${Start_date}"
114 id="start_date"> 113 id="start_date">
115 <span class="input-group-addon"> 114 <span class="input-group-addon">
116 <span class="glyphicon glyphicon-calendar"></span> 115 <span class="glyphicon glyphicon-calendar"></span>
@@ -120,7 +119,7 @@ @@ -120,7 +119,7 @@
120 <div class="col-md-10" style="padding: 0;width: 25%;"> 119 <div class="col-md-10" style="padding: 0;width: 25%;">
121 <label for="start_date" class="control-label cb-toolbar">至</label> 120 <label for="start_date" class="control-label cb-toolbar">至</label>
122 <div class="input-group col-md-9 date"> 121 <div class="input-group col-md-9 date">
123 - <input class="form-control date" name="end_date" type="text" 122 + <input class="form-control date" name="end_date" type="text"th:value="${End_date}"
124 id="end_date"> 123 id="end_date">
125 <span class="input-group-addon"> 124 <span class="input-group-addon">
126 <span class="glyphicon glyphicon-calendar"></span> 125 <span class="glyphicon glyphicon-calendar"></span>
@@ -132,14 +131,14 @@ @@ -132,14 +131,14 @@
132 th:if="${session.sessionUser.spid==0}"> 131 th:if="${session.sessionUser.spid==0}">
133 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 132 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
134 <div class="col-sm-9" style="padding: 0;"> 133 <div class="col-sm-9" style="padding: 0;">
135 - <input class="form-control" type="text" value="" id="sp_desc"> 134 + <input class="form-control" type="text" th:value="${sp_desc}" value="" id="sp_desc">
136 </div> 135 </div>
137 </div> 136 </div>
138 137
139 138
140 - <div class="col-md-6" style="padding: 0;width: 25%;"> 139 + <div class="col-md-5" style="padding: 0;width: 25%;">
141 <label for="state" class="control-label cb-toolbar">分类:</label> 140 <label for="state" class="control-label cb-toolbar">分类:</label>
142 - <div class="col-sm-10" style="padding: 0;"> 141 + <div class="col-sm-8" style="padding: 0;">
143 <select class="form-control" id="source" name="source"> 142 <select class="form-control" id="source" name="source">
144 <option value="">全部</option> 143 <option value="">全部</option>
145 <option th:each="activitys : ${activityList}" 144 <option th:each="activitys : ${activityList}"
@@ -155,9 +154,9 @@ @@ -155,9 +154,9 @@
155 154
156 <div class="col-md-6" style="padding: 0;width: 18%;" 155 <div class="col-md-6" style="padding: 0;width: 18%;"
157 th:if="${session.sessionUser.spid==0}"> 156 th:if="${session.sessionUser.spid==0}">
158 - <label for="video_id" class="control-label cb-toolbar">video_id</label> 157 + <label for="video_id" class="control-label cb-toolbar">videoId</label>
159 <div class="col-sm-9" style="padding: 0;"> 158 <div class="col-sm-9" style="padding: 0;">
160 - <input class="form-control" type="text" value="" id="video_id"> 159 + <input class="form-control" type="text" th:value="${VideoId}" value="" id="video_id">
161 </div> 160 </div>
162 </div> 161 </div>
163 162
@@ -165,7 +164,7 @@ @@ -165,7 +164,7 @@
165 th:if="${session.sessionUser.spid==0}"> 164 th:if="${session.sessionUser.spid==0}">
166 <label for="video_user_id" class="control-label cb-toolbar">sid</label> 165 <label for="video_user_id" class="control-label cb-toolbar">sid</label>
167 <div class="col-sm-9" style="padding: 0;"> 166 <div class="col-sm-9" style="padding: 0;">
168 - <input class="form-control" type="text" value="" id="video_user_id"> 167 + <input class="form-control" type="text" th:value="${Video_user_id}" value="" id="video_user_id">
169 </div> 168 </div>
170 </div> 169 </div>
171 170
@@ -173,7 +172,7 @@ @@ -173,7 +172,7 @@
173 th:if="${session.sessionUser.spid==0}"> 172 th:if="${session.sessionUser.spid==0}">
174 <label for="contentId" class="control-label cb-toolbar">内容id:</label> 173 <label for="contentId" class="control-label cb-toolbar">内容id:</label>
175 <div class="col-sm-9" style="padding: 0;"> 174 <div class="col-sm-9" style="padding: 0;">
176 - <input class="form-control" type="text" value="" id="contentId"> 175 + <input class="form-control" type="text" th:value="${ContentId}" value="" id="contentId">
177 </div> 176 </div>
178 </div> 177 </div>
179 178
@@ -182,7 +181,7 @@ @@ -182,7 +181,7 @@
182 th:if="${session.sessionUser.spid==0}"> 181 th:if="${session.sessionUser.spid==0}">
183 <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label> 182 <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
184 <div class="col-sm-9" style="padding: 0;"> 183 <div class="col-sm-9" style="padding: 0;">
185 - <input class="form-control" type="text" value="" id="sp_Id"> 184 + <input class="form-control" type="text" th:value="${sp_Id}" value="" id="sp_Id">
186 </div> 185 </div>
187 </div> 186 </div>
188 187
@@ -190,7 +189,7 @@ @@ -190,7 +189,7 @@
190 th:if="${session.sessionUser.spid==0}"> 189 th:if="${session.sessionUser.spid==0}">
191 <label for="shen_auditor_id" class="control-label cb-toolbar">审核员</label> 190 <label for="shen_auditor_id" class="control-label cb-toolbar">审核员</label>
192 <div class="col-sm-9" style="padding: 0;"> 191 <div class="col-sm-9" style="padding: 0;">
193 - <input class="form-control" type="text" value="" id="shen_auditor_id"> 192 + <input class="form-control" type="text" th:value="${Shen_auditor_id}" value="" id="shen_auditor_id">
194 </div> 193 </div>
195 </div> 194 </div>
196 </div> 195 </div>
@@ -384,6 +383,7 @@ @@ -384,6 +383,7 @@
384 </section> 383 </section>
385 </div> 384 </div>
386 <script th:inline="javascript"> 385 <script th:inline="javascript">
  386 + // 获取路径参数
387 function GetQueryString(name) { 387 function GetQueryString(name) {
388 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); 388 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
389 var r = window.location.search.substr(1).match(reg); 389 var r = window.location.search.substr(1).match(reg);
@@ -391,12 +391,10 @@ @@ -391,12 +391,10 @@
391 return null; 391 return null;
392 } 392 }
393 393
  394 + // 状态==2是展开状态 触发展开
394 $(function () { 395 $(function () {
395 - //alert(GetQueryString("up_d"));  
396 - if (GetQueryString("up_d") == "2") { 396 + if (GetQueryString("expand_list_state") == "2") {
397 $("#query").click(); 397 $("#query").click();
398 - } else {  
399 -  
400 } 398 }
401 //按钮颜色设置 399 //按钮颜色设置
402 var state = [[${param.state}]] ? [[${param.state}]][0] : null; 400 var state = [[${param.state}]] ? [[${param.state}]][0] : null;
@@ -504,8 +502,8 @@ @@ -504,8 +502,8 @@
504 //全部 502 //全部
505 function quanbu() { 503 function quanbu() {
506 updateValue(); 504 updateValue();
507 - var up_d = $("#forms").attr("up_d");  
508 - 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 + "&up_d=" + up_d; 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;
509 507
510 } 508 }
511 509
@@ -693,12 +691,12 @@ @@ -693,12 +691,12 @@
693 $(id_name).slideUp(350); 691 $(id_name).slideUp(350);
694 $('#a_up').show(); 692 $('#a_up').show();
695 $('#a_down').hide(); 693 $('#a_down').hide();
696 - $("#forms").attr("up_d", "1"); 694 + $("#forms").attr("expand_list_state", "1");
697 } else { 695 } else {
698 $(id_name).slideDown(350); 696 $(id_name).slideDown(350);
699 $('#a_up').hide(); 697 $('#a_up').hide();
700 $('#a_down').show(); 698 $('#a_down').show();
701 - $("#forms").attr("up_d", "2"); 699 + $("#forms").attr("expand_list_state", "2");
702 } 700 }
703 } 701 }
704 702