周伟鹏 / cnlive_shenhe · Commits

Commit 83a4a5ae0318424024192057d7788f86d97c9b3d

Authored by liwei2917
1 parent 7815a796

修改话题审核页面

Inline Side-by-side
Showing 2 changed files with 65 additions and 72 deletions
src/main/java/com/cnlive/shenhe/api/TopicControllerApi.java
  View file @83a4a5a
... ... @@ -128,7 +128,7 @@ public class TopicControllerApi {
128 128 @PostMapping("/callback")
129 129 @ResponseBody
130 130 public ResponseBean callback(@RequestBody String param) {
131   - logger.info("话题回调通知，param=====" + param);
  131 + logger.info("话题中转回调通知，param=====" + param);
132 132 JSONObject json = JSONObject.parseObject(param);
133 133 //获取中转服务器消息
134 134 String errorCode = json.getString("errorCode");
... ...
src/main/resources/templates/page/topic.html
  View file @83a4a5a
... ... @@ -83,70 +83,69 @@
83 83 </button>
84 84 </div>
85 85 </div>
  86 + <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
  87 + <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 15%;float: left;">
  88 + <div class="col-md-6" style="padding: 0;width: 100%;">
  89 + <label for="topicId" class="control-label cb-toolbar">话题id:</label>
  90 + <div class="col-sm-7" style="padding: 0;">
  91 + <input class="form-control" type="text" value="" id="topicId" name="topicId">
  92 + </div>
  93 + </div>
  94 + </div>
86 95  
87   -
88   - <div class="form-horizontal form-group-sm" id="forms" style="display: none;">
89   - <form id="topicForm">
90   - <div class="btn-group margin-bottom col-md-6" style="padding: 0;">
91   - <div class="col-md-5" style="padding: 0">
92   - <label for="topicId" class="control-label cb-toolbar">话题id:</label>
93   - <div class="col-sm-8" style="padding: 0;">
94   - <input class="form-control" name="topicId" type="text"
95   - id="topicId" >
96   - </div>
  96 + <div class="btn-group margin-bottom col-md-6" style="padding-left:0px;width: 13%;float: left;">
  97 + <div class="col-md-5" style="padding: 0;width: 100%;">
  98 + <label for="shenhe_status" class="control-label cb-toolbar">状态:</label>
  99 + <div class="col-sm-7" style="padding: 0;">
  100 + <select class="form-control" id="shenhe_status" name="shenhe_status">
  101 + <option value="">全部</option>
  102 + <option value="0">未审核</option>
  103 + <option value="1">已通过</option>
  104 + <option value="2">已拒绝</option>
  105 + </select>
97 106 </div>
98   - <div class="col-md-4" style="padding: 0">
  107 + </div>
  108 + </div>
  109 + <div class="btn-group margin-bottom col-md-6" style="padding-left: 0px;width: 15%;float: left;">
  110 + <div class="col-md-5" style="padding: 0;width: 100%;" >
99 111 <label for="topic_name" class="control-label cb-toolbar">话题标题:</label>
100   - <div class="col-sm-8" style="padding: 0;">
101   - <input class="form-control" name="topic_name" type="text" id="topic_name"
102   - >
103   - </div>
104   - </div>
105   - <div class="col-md-4" style="padding: 0">
106   - <label for="sp_desc" class="control-label cb-toolbar">sp名称:</label>
107   - <div class="col-sm-8" style="padding: 0;">
108   - <input class="form-control" name="sp_desc" type="text" id="sp_desc"
109   - >
  112 + <div class="col-sm-7" style="padding: 0;">
  113 + <input class="form-control" type="text" value="" id="topic_name" name="topic_name">
110 114 </div>
111   - </div>
112   - <div class="col-md-3" style="padding: 0">
113   - <label for="shenhe_status" class="control-label cb-toolbar">审核状态:</label>
114   - <div class="col-sm-6" style="padding: 0;">
115   - <select class="form-control col-sm-2" id="shenhe_status" name="shenhe_status">
116   - <option value="">全部</option>
117   - <option value="0" >未审核</option>
118   - <option value="1" >已通过</option>
119   - <option value="2" >已拒绝</option>
120   - </select>
  115 + </div>
  116 + </div>
  117 + <div class="btn-group margin-bottom col-md-6" style="padding-left: 0px;width: 15%;float: left;">
  118 + <div class="col-md-6" style="padding: 0;width: 100%;" th:if="${session.sessionUser.spid==0}">
  119 + <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
  120 + <div class="col-sm-7" style="padding: 0;">
  121 + <input class="form-control" type="text" value="" id="sp_desc">
121 122 </div>
122   - </div>
123   - </div>
124   -
125   - <div class="btn-group margin-bottom col-md-6 pull-right" style="padding: 0">
126   - <div class="col-md-11" style="width: 88%;padding: 0;">
127   - <div class="col-md-6" style="padding: 0;width: 45%;">
128   - <label for="start_date" class="control-label cb-toolbar">时间:</label>
129   - <div class="input-group col-md-9 date">
130   - <input class="form-control date" name="start_date" type="text" id="start_date" >
131   - <span class="input-group-addon">
132   - <span class="glyphicon glyphicon-calendar"></span>
133   - </span>
134   - </div>
  123 + </div>
  124 + </div>
  125 + <div class="btn-group margin-bottom col-md-6" style="padding-left: 0px;width: 20%;float: left;">
  126 + <div class="col-md-12" style="padding: 0;width: 100%;">
  127 + <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
  128 + <div class="input-group col-md-8 date">
  129 + <input class="form-control date" name="start_date" type="text"
  130 + id="start_date">
  131 + <span class="input-group-addon">
  132 + <span class="glyphicon glyphicon-calendar"></span>
  133 + </span>
135 134 </div>
136   - <div class="col-md-6" style="padding: 0;width: 45%;">
137   - <label for="start_date" class="control-label cb-toolbar">至</label>
138   - <div class="input-group col-md-9 date">
139   - <input class="form-control date" name="end_date" type="text"
140   - id="end_date" >
141   - <span class="input-group-addon">
142   - <span class="glyphicon glyphicon-calendar"></span>
143   - </span>
144   - </div>
  135 + </div>
  136 + </div>
  137 + <div class="btn-group margin-bottom col-md-6" style="padding-left: 0px;width: 18%;float: left;">
  138 + <div class="col-md-9" style="padding: 0;width: 100%;">
  139 + <label for="start_date" class="control-label cb-toolbar">至</label>
  140 + <div class="input-group col-md-8 date">
  141 + <input class="form-control date" name="end_date" type="text"
  142 + id="end_date">
  143 + <span class="input-group-addon">
  144 + <span class="glyphicon glyphicon-calendar"></span>
  145 + </span>
145 146 </div>
146   - </div>
147   - </div>
148   - </form>
149   -
  147 + </div>
  148 + </div>
150 149 </div>
151 150  
152 151 <div class="bootstrap-table">
... ... @@ -168,7 +167,7 @@
168 167 </div>
169 168 <div class="fht-cell"></div>
170 169 </th>
171   - <th style="text-align: center; width: 6%; "
  170 + <th style="text-align: center; width: 3%; "
172 171 data-field="topic_user_name" tabindex="0">
173 172 <div class="th-inner ">话题ID</div>
174 173 <div class="fht-cell"></div>
... ... @@ -189,7 +188,7 @@
189 188 </div>
190 189 <div class="fht-cell"></div>
191 190 </th>
192   - <th style="text-align: center; width: 6%; " data-field="topic_user_ip"
  191 + <th style="text-align: center; width: 10%; " data-field="topic_user_ip"
193 192 tabindex="0">
194 193 <div class="th-inner ">话题描述</div>
195 194 <div class="fht-cell"></div>
... ... @@ -205,7 +204,7 @@
205 204 <div class="th-inner ">审核状态</div>
206 205 <div class="fht-cell"></div>
207 206 </th>
208   - <th style="text-align: center; width: 4%; " data-field="topic_title"
  207 + <th style="text-align: center; width: 3%; " data-field="topic_title"
209 208 tabindex="0">
210 209 <div class="th-inner ">审核员
211 210 </div>
... ... @@ -217,12 +216,6 @@
217 216 <div class="th-inner ">审核消息</div>
218 217 <div class="fht-cell"></div>
219 218 </th>
220   -<!-- <th style="text-align: center; width: 5%; " -->
221   -<!-- data-field="state_name_short" tabindex="0"> -->
222   -<!-- <div class="th-inner ">是否下线 -->
223   -<!-- </div> -->
224   -<!-- <div class="fht-cell"></div> -->
225   -<!-- </th> -->
226 219 <th style="text-align: center ; width: 8%; " data-field="topic_time"
227 220 tabindex="0">
228 221 <div class="th-inner ">话题创建时间</div>
... ... @@ -233,7 +226,7 @@
233 226 <div class="th-inner ">话题送审时间</div>
234 227 <div class="fht-cell"></div>
235 228 </th>
236   - <th style="text-align: center; width: 12%; " data-field="action"
  229 + <th style="text-align: center; width: 16%; " data-field="action"
237 230 tabindex="0">
238 231 <div class="th-inner ">操作
239 232 </div>
... ... @@ -248,7 +241,7 @@
248 241 style="text-align: center; vertical-align:middle;width: 3%;">
249 242 <input data-index="0" name="btSelectItem" type="checkbox"
250 243 th:value="${topic.id}"></td>
251   - <td style="text-align: center; vertical-align:middle;width: 6%;"
  244 + <td style="text-align: center; vertical-align:middle;width: 3%;"
252 245 th:text="${topic.topic_id}">网加加
253 246 </td>
254 247 <td style="text-align: center; vertical-align:middle; width: 6%;"
... ... @@ -262,7 +255,7 @@
262 255 <td style="text-align: center; vertical-align:middle; width: 14%;"
263 256 th:text="${topic.title}">优秀传统文化与现代幼儿教育 教师研修班
264 257 </td>
265   - <td style="text-align: center; vertical-align:middle; width: 14%;"
  258 + <td style="text-align: center; vertical-align:middle; width: 10%;"
266 259 th:text="${topic.topic_text}">优秀传统文化与现代幼儿教育 教师研修班
267 260 </td>
268 261 <td style="text-align: center; vertical-align:middle; width: 3%;">
... ... @@ -278,7 +271,7 @@
278 271 <span class="btn btn-sm btn-danger"
279 272 th:if="${topic.shenhe_status==2}">已拒绝</span>
280 273 </td>
281   - <td style="text-align: center; vertical-align:middle; width: 4%;" th:text="${topic.updater}">
  274 + <td style="text-align: center; vertical-align:middle; width: 3%;" th:text="${topic.updater}">
282 275 openadmin9@cnlive.com
283 276 </td>
284 277 <td style="text-align: center; vertical-align:middle; width: 10%;"
... ... @@ -296,7 +289,7 @@
296 289 th:text="${#dates.format(topic.create_date, 'yyyy-MM-dd HH:mm:ss')}">
297 290 2018-11-28 16:08:00
298 291 </td>
299   - <td style="text-align: center; vertical-align:middle; width: 12%;">
  292 + <td style="text-align: center; vertical-align:middle; width: 16%;">
300 293 <span> &nbsp;</span>
301 294 <a class="pass_one" th:href="@{'javascript:topic('+${topic.id}+',1)'}">
302 295 <button class="btn btn-success btn-sm">通过</button>
... ...