Jelajahi Sumber

更新 devops/machine/host/index.html 页面, 调整 deprecate 接口

reghao 6 bulan lalu
induk
melakukan
2b208d1cf4

+ 3 - 3
mgr/src/main/java/cn/reghao/devops/mgr/machine/controller/MachineHostController.java

@@ -54,9 +54,9 @@ public class MachineHostController {
 
     @ApiOperation(value = "设置机器为弃用状态", notes = "N")
     @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @PostMapping(value = "/deprecate", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String deleteAll(@RequestParam(value = "ids") List<String> machineIds) {
-        Result result = machineService.setMachinesDeprecate(machineIds);
+    @PostMapping(value = "/deprecate/{machineId}", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String deleteAll(@PathVariable("machineId") String machineId) {
+        Result result = machineService.setMachinesDeprecate(List.of(machineId));
         return WebResult.result(result);
     }
 }

+ 3 - 17
mgr/src/main/resources/templates/devops/machine/host/index.html

@@ -21,26 +21,12 @@
                         </div>
                     </div>
                 </div>
-                <div class="pull-right">
-                    <div class="btn-group-right">
-                        <div class="btn-group">
-                            <button class="layui-btn">设置弃用<span class="caret"></span></button>
-                            <dl class="layui-nav-child layui-anim layui-anim-upbit">
-                                <dd><a class="ajax-status" th:href="@{/api/machine/host/deprecate}">选择机器</a></dd>
-                            </dl>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
         <div class="timo-table-wrap">
             <table class="layui-table timo-table">
                 <thead>
                 <tr>
-                    <th class="timo-table-checkbox">
-                        <label class="timo-checkbox"><input type="checkbox">
-                            <i class="layui-icon layui-icon-ok"></i></label>
-                    </th>
                     <th data-field="machineIpv4">机器地址</th>
                     <th data-field="bootTime">启动时间</th>
                     <th data-field="status">当前状态</th>
@@ -55,8 +41,6 @@
                 </thead>
                 <tbody>
                 <tr th:each="item:${list}">
-                    <td><label class="timo-checkbox"><input type="checkbox" th:value="${item.machineId}">
-                        <i class="layui-icon layui-icon-ok"></i></label></td>
                     <td th:text="${item.machineIpv4}">机器地址</td>
                     <td th:text="${item.bootTime}">启动时间</td>
                     <td class="machine-status" th:text="${item.status}">当前状态</td>
@@ -74,7 +58,9 @@
                            th:attr="data-url=@{'/machine/host/env/'+${item.machineId}}" href="#">设置</a>
                     </td>
                     <td>
-                        <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.machineId} + ' 机器?'"
+                        <a class="ajax-post" th:attr="data-msg='确定要弃用 '+ ${item.machineIpv4} + ' 机器?'"
+                           th:href="@{'/api/machine/host/deprecate/' + ${item.machineId}}">弃用</a>
+                        <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.machineIpv4} + ' 机器?'"
                            th:href="@{'/api/machine/host/' + ${item.machineId}}">删除</a>
                     </td>
                 </tr>