Commit 130483ab935047c9cfee260f372a7e3404ddfd11
1 parent
2a1a1e5b
优化点播、直播、评论、图文模块条件输入框的数据回填显示及样式
Showing
9 changed files
with
64 additions
and
45 deletions
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
| ... | ... | @@ -144,6 +144,11 @@ public class CommentsController extends BaseController { |
| 144 | 144 | model.addAttribute("pageSize", commentsDTO.getPageSize()); |
| 145 | 145 | model.addAttribute("commentPage", commentPage); |
| 146 | 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()); | |
| 147 | 152 | return "page/comment.html"; |
| 148 | 153 | } |
| 149 | 154 | ... | ... |
src/main/java/com/cnlive/shenhe/controller/ContentController.java
| ... | ... | @@ -110,6 +110,13 @@ public class ContentController extends BaseController { |
| 110 | 110 | model.addAttribute("contentPage", contentPage); |
| 111 | 111 | model.addAttribute("pageSize", contentDTO.getPageSize()); |
| 112 | 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()); | |
| 113 | 120 | return "page/content.html"; |
| 114 | 121 | } |
| 115 | 122 | ... | ... |
src/main/java/com/cnlive/shenhe/controller/LiveController.java
| ... | ... | @@ -178,6 +178,12 @@ public class LiveController extends BaseController { |
| 178 | 178 | model.addAttribute("livePage", livePage); |
| 179 | 179 | model.addAttribute("pageSize", liveDTO.getPageSize()); |
| 180 | 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()); | |
| 181 | 187 | return "page/live.html"; |
| 182 | 188 | } |
| 183 | 189 | ... | ... |
src/main/java/com/cnlive/shenhe/controller/VideosController.java
| ... | ... | @@ -238,6 +238,9 @@ public class VideosController extends BaseController { |
| 238 | 238 | model.addAttribute("sp_desc", videosDTO.getSp_desc()); |
| 239 | 239 | model.addAttribute("Start_date", videosDTO.getStart_date()); |
| 240 | 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()); | |
| 241 | 244 | return "page/video.html"; |
| 242 | 245 | } |
| 243 | 246 | ... | ... |
src/main/resources/templates/page/comment.html
| ... | ... | @@ -94,25 +94,24 @@ |
| 94 | 94 | <div class="col-md-3" style="padding: 0"> |
| 95 | 95 | <label for="activity_id" class="control-label cb-toolbar">活动id:</label> |
| 96 | 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 | 98 | id="activity_id"> |
| 99 | 99 | </div> |
| 100 | 100 | </div> |
| 101 | 101 | <div class="col-md-2" style="padding: 0"> |
| 102 | 102 | <label for="comment_user_id" class="control-label cb-toolbar">sid:</label> |
| 103 | 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 | 105 | id="comment_user_id"> |
| 106 | 106 | </div> |
| 107 | 107 | </div> |
| 108 | - | |
| 109 | - <div class="col-md-5" style="padding: 0"> | |
| 108 | + <div class="col-md-3" style="padding: 0"> | |
| 110 | 109 | <label for="content" class="control-label cb-toolbar">内容:</label> |
| 111 | 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 | 112 | </div> |
| 114 | 113 | </div> |
| 115 | - <div class="col-md-2" style="padding: 0"> | |
| 114 | + <div class="col-md-3" style="padding: 0"> | |
| 116 | 115 | <label for="state" class="control-label cb-toolbar">状态:</label> |
| 117 | 116 | <div class="col-sm-8" style="padding: 0;"> |
| 118 | 117 | <select class="form-control col-sm-2" id="state" name="state"> |
| ... | ... | @@ -124,7 +123,6 @@ |
| 124 | 123 | </div> |
| 125 | 124 | </div> |
| 126 | 125 | </div> |
| 127 | - | |
| 128 | 126 | <div class="btn-group margin-bottom col-md-6 pull-right" style="padding: 0"> |
| 129 | 127 | <div class="col-md-3" style="padding: 0"> |
| 130 | 128 | <label for="state" class="control-label cb-toolbar">类型:</label> |
| ... | ... | @@ -136,24 +134,24 @@ |
| 136 | 134 | </select> |
| 137 | 135 | </div> |
| 138 | 136 | </div> |
| 139 | - <div class="col-md-5" style="padding: 0;"> | |
| 137 | + <div class="col-md-4" style="padding: 0;"> | |
| 140 | 138 | <label for="start_date" class="control-label cb-toolbar">时间:</label> |
| 141 | 139 | <div class="input-group col-md-9 date"> |
| 142 | 140 | <input class="form-control date" name="start_date" type="text" |
| 143 | - id="start_date"> | |
| 141 | + id="start_date" th:value="${Start_date}"> | |
| 144 | 142 | <span class="input-group-addon"> |
| 145 | 143 | <span class="glyphicon glyphicon-calendar"></span> |
| 146 | - </span> | |
| 144 | + </span> | |
| 147 | 145 | </div> |
| 148 | 146 | </div> |
| 149 | 147 | <div class="col-md-4" style="padding: 0;"> |
| 150 | 148 | <label for="start_date" class="control-label cb-toolbar">至</label> |
| 151 | 149 | <div class="input-group col-md-9 date"> |
| 152 | 150 | <input class="form-control date" name="end_date" type="text" |
| 153 | - id="end_date"> | |
| 151 | + id="end_date" th:value="${End_date}"> | |
| 154 | 152 | <span class="input-group-addon"> |
| 155 | 153 | <span class="glyphicon glyphicon-calendar"></span> |
| 156 | - </span> | |
| 154 | + </span> | |
| 157 | 155 | </div> |
| 158 | 156 | </div> |
| 159 | 157 | </div> | ... | ... |
src/main/resources/templates/page/content.html
| ... | ... | @@ -81,7 +81,7 @@ |
| 81 | 81 | <div class="col-md-5" style="padding: 0;width: 100%;"> |
| 82 | 82 | <label for="video_titleID" class="control-label cb-toolbar">标题:</label> |
| 83 | 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 | 85 | </div> |
| 86 | 86 | </div> |
| 87 | 87 | </div> |
| ... | ... | @@ -89,9 +89,9 @@ |
| 89 | 89 | <div class="btn-group margin-bottom col-md-6" |
| 90 | 90 | style="padding: 0;width: 23%;float: left;"> |
| 91 | 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 | 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 | 95 | </div> |
| 96 | 96 | </div> |
| 97 | 97 | </div> |
| ... | ... | @@ -99,9 +99,9 @@ |
| 99 | 99 | <div class="btn-group margin-bottom col-md-6" |
| 100 | 100 | style="padding: 0;width: 23%;float: left;"> |
| 101 | 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 | 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 | 105 | </div> |
| 106 | 106 | </div> |
| 107 | 107 | </div> |
| ... | ... | @@ -130,7 +130,7 @@ |
| 130 | 130 | <label for="start_date" class="control-label cb-toolbar">时间:</label> |
| 131 | 131 | <div class="input-group col-md-9 date"> |
| 132 | 132 | <input class="form-control date" name="start_date" type="text" |
| 133 | - id="start_date"> | |
| 133 | + id="start_date" th:value="${Start_date}"> | |
| 134 | 134 | <span class="input-group-addon"> |
| 135 | 135 | <span class="glyphicon glyphicon-calendar"></span> |
| 136 | 136 | </span> |
| ... | ... | @@ -140,7 +140,7 @@ |
| 140 | 140 | <label for="start_date" class="control-label cb-toolbar">至</label> |
| 141 | 141 | <div class="input-group col-md-9 date"> |
| 142 | 142 | <input class="form-control date" name="end_date" type="text" |
| 143 | - id="end_date"> | |
| 143 | + id="end_date" th:value="${End_date}"> | |
| 144 | 144 | <span class="input-group-addon"> |
| 145 | 145 | <span class="glyphicon glyphicon-calendar"></span> |
| 146 | 146 | </span> |
| ... | ... | @@ -151,23 +151,23 @@ |
| 151 | 151 | th:if="${session.sessionUser.spid==0}"> |
| 152 | 152 | <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> |
| 153 | 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 | 155 | </div> |
| 156 | 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 | 166 | <div class="col-md-6" style="padding: 0;width: 20%;" |
| 167 | 167 | th:if="${session.sessionUser.spid==0}"> |
| 168 | 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 | 171 | </div> |
| 172 | 172 | </div> |
| 173 | 173 | </div> | ... | ... |
src/main/resources/templates/page/contentDetail.html
| ... | ... | @@ -144,14 +144,14 @@ |
| 144 | 144 | |
| 145 | 145 | <div class="form-group"> |
| 146 | 146 | <label for="comment_user_ip" |
| 147 | - class="control-label col-sm-2">来源（昵称）:</label> | |
| 147 | + class="control-label col-sm-2">来源昵称:</label> | |
| 148 | 148 | <div class="col-sm-10"> |
| 149 | 149 | <h5 th:text="${content.source}">114.242.177.100</h5> |
| 150 | 150 | </div> |
| 151 | 151 | </div> |
| 152 | 152 | |
| 153 | 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 | 155 | <div class="col-sm-10"> |
| 156 | 156 | <h5 th:text="${content.author}">769_jetj7bq525</h5> |
| 157 | 157 | </div> | ... | ... |
src/main/resources/templates/page/live.html
| ... | ... | @@ -86,14 +86,14 @@ |
| 86 | 86 | <label for="activity_name" class="control-label cb-toolbar">直播名称:</label> |
| 87 | 87 | <div class="col-sm-7" style="padding: 0;"> |
| 88 | 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 | 90 | </div> |
| 91 | 91 | </div> |
| 92 | 92 | <div class="col-md-3" style="padding: 0"> |
| 93 | 93 | <label for="activity_id" class="control-label cb-toolbar">直播id:</label> |
| 94 | 94 | <div class="col-sm-7" style="padding: 0;"> |
| 95 | 95 | <input class="form-control" name="activity_id" type="text" |
| 96 | - id="activity_id"> | |
| 96 | + id="activity_id" th:value="${Activity_id}"> | |
| 97 | 97 | </div> |
| 98 | 98 | </div> |
| 99 | 99 | |
| ... | ... | @@ -101,7 +101,7 @@ |
| 101 | 101 | <label for="contentId" class="control-label cb-toolbar">内容id:</label> |
| 102 | 102 | <div class="col-sm-7" style="padding: 0;"> |
| 103 | 103 | <input class="form-control" name="contentId" type="text" |
| 104 | - id="contentId"> | |
| 104 | + id="contentId" th:value="${ContentId}"> | |
| 105 | 105 | </div> |
| 106 | 106 | </div> |
| 107 | 107 | |
| ... | ... | @@ -119,13 +119,13 @@ |
| 119 | 119 | th:if="${session.sessionUser.spid==0}"> |
| 120 | 120 | <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> |
| 121 | 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 | 123 | </div> |
| 124 | 124 | </div> |
| 125 | 125 | <div class="col-md-3" style="padding: 0"> |
| 126 | 126 | <label for="activity_status" |
| 127 | 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 | 129 | <select class="form-control col-sm-2" id="activity_status" |
| 130 | 130 | name="activity_status"> |
| 131 | 131 | <option value="">全部</option> |
| ... | ... | @@ -147,7 +147,7 @@ |
| 147 | 147 | <label for="start_date" class="control-label cb-toolbar">时间:</label> |
| 148 | 148 | <div class='input-group col-md-9 date'> |
| 149 | 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 | 151 | class="input-group-addon"> <span |
| 152 | 152 | class="glyphicon glyphicon-calendar"></span> |
| 153 | 153 | </span> |
| ... | ... | @@ -157,7 +157,7 @@ |
| 157 | 157 | <label for="start_date" class="control-label cb-toolbar">至</label> |
| 158 | 158 | <div class='input-group col-md-9 date'> |
| 159 | 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 | 161 | <span class="glyphicon glyphicon-calendar"></span> |
| 162 | 162 | </span> |
| 163 | 163 | </div> | ... | ... |
src/main/resources/templates/page/video.html
| ... | ... | @@ -105,7 +105,7 @@ |
| 105 | 105 | |
| 106 | 106 | <div class="btn-group margin-bottom col-md-6 pull-right" |
| 107 | 107 | style="position: relative;width: 75%;float: left !important;"> |
| 108 | - <div class="col-md-18" style="width: 100%;padding: 0;"> | |
| 108 | + <div class="col-md-10" style="width: 100%;padding: 0;"> | |
| 109 | 109 | <div class="col-md-10" style="padding: 0;width: 25%;"> |
| 110 | 110 | <label for="start_date" class="control-label cb-toolbar">时间:</label> |
| 111 | 111 | <div class="input-group col-md-9 date"> |
| ... | ... | @@ -136,9 +136,9 @@ |
| 136 | 136 | </div> |
| 137 | 137 | |
| 138 | 138 | |
| 139 | - <div class="col-md-6" style="padding: 0;width: 25%;"> | |
| 139 | + <div class="col-md-5" style="padding: 0;width: 25%;"> | |
| 140 | 140 | <label for="state" class="control-label cb-toolbar">分类:</label> |
| 141 | - <div class="col-sm-10" style="padding: 0;"> | |
| 141 | + <div class="col-sm-8" style="padding: 0;"> | |
| 142 | 142 | <select class="form-control" id="source" name="source"> |
| 143 | 143 | <option value="">全部</option> |
| 144 | 144 | <option th:each="activitys : ${activityList}" |
| ... | ... | @@ -154,7 +154,7 @@ |
| 154 | 154 | |
| 155 | 155 | <div class="col-md-6" style="padding: 0;width: 18%;" |
| 156 | 156 | th:if="${session.sessionUser.spid==0}"> |
| 157 | - <label for="video_id" class="control-label cb-toolbar">video_id</label> | |
| 157 | + <label for="video_id" class="control-label cb-toolbar">videoId</label> | |
| 158 | 158 | <div class="col-sm-9" style="padding: 0;"> |
| 159 | 159 | <input class="form-control" type="text" th:value="${VideoId}" value="" id="video_id"> |
| 160 | 160 | </div> |
| ... | ... | @@ -164,7 +164,7 @@ |
| 164 | 164 | th:if="${session.sessionUser.spid==0}"> |
| 165 | 165 | <label for="video_user_id" class="control-label cb-toolbar">sid</label> |
| 166 | 166 | <div class="col-sm-9" style="padding: 0;"> |
| 167 | - <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"> | |
| 168 | 168 | </div> |
| 169 | 169 | </div> |
| 170 | 170 | |
| ... | ... | @@ -172,7 +172,7 @@ |
| 172 | 172 | th:if="${session.sessionUser.spid==0}"> |
| 173 | 173 | <label for="contentId" class="control-label cb-toolbar">内容id:</label> |
| 174 | 174 | <div class="col-sm-9" style="padding: 0;"> |
| 175 | - <input class="form-control" type="text" value="" id="contentId"> | |
| 175 | + <input class="form-control" type="text" th:value="${ContentId}" value="" id="contentId"> | |
| 176 | 176 | </div> |
| 177 | 177 | </div> |
| 178 | 178 | |
| ... | ... | @@ -189,7 +189,7 @@ |
| 189 | 189 | th:if="${session.sessionUser.spid==0}"> |
| 190 | 190 | <label for="shen_auditor_id" class="control-label cb-toolbar">审核员</label> |
| 191 | 191 | <div class="col-sm-9" style="padding: 0;"> |
| 192 | - <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"> | |
| 193 | 193 | </div> |
| 194 | 194 | </div> |
| 195 | 195 | </div> | ... | ... |