更新 StatusPageController 中对多个 select 选项的处理

mgr/src/main/java/cn/reghao/devops/mgr/mgr/app/controller/page/StatusPageController.java

@@ -39,8 +39,7 @@ public class StatusPageController {
     @ApiOperation(value = "应用运行状态列表页面", notes = "N")
     @GetMapping
     public String statusPage1(@RequestParam(value = "env", required = false) String env,
-                              @RequestParam(value = "appType", required = false) String appType,
-                              @RequestParam(value = "status", required = false) Boolean status,
+                              @RequestParam(value = "type", required = false) String appType,
                               @RequestParam(value = "appName", required = false) String appName,
                               Model model) {
         if (env == null) {
@@ -51,10 +50,6 @@ public class StatusPageController {
             appType = DefaultSetting.getDefaultAppType();
         }
 
-        if (status == null) {
-            status = true;
-        }
-
         if (appName != null) {
             Page<AppRunning> page = new PageImpl<>(Collections.emptyList());
             PageList<AppRunning> pageList = PageList.empty();
@@ -70,7 +65,6 @@ public class StatusPageController {
 
         model.addAttribute("env", env);
         model.addAttribute("type", appType);
-        model.addAttribute("status", status);
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
         return "/devops/app/stat/index1";

mgr/src/main/resources/templates/devops/app/config/index.html

@@ -111,8 +111,6 @@
 <script type="text/javascript" th:src="@{/js/plugins/jquery-2.2.4.min.js}"></script>
 <script type="text/javascript">
     function getPageByCriteria() {
-        console.log('select 事件')
-
         var envSelectedOption = $("#getPageByEnv option:selected")
         var envParam = envSelectedOption.text()
 

mgr/src/main/resources/templates/devops/app/stat/index1.html

@@ -17,14 +17,14 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">环境</label>
                     <div class="layui-input-block timo-search-status">
-                        <select id="getPageByEnv" class="timo-search-select" name="env" onchange="getPageByEnv()"
+                        <select id="getPageByEnv" class="timo-search-select" name="env" onchange="getPageByCriteria()"
                                 mo:dict="ENVIRONMENT" mo-selected="${env}"></select>
                     </div>
                 </div>
                 <div class="layui-inline">
                     <label class="layui-form-label">类型</label>
                     <div class="layui-input-block timo-search-status">
-                        <select id="getPageByAppType" class="timo-search-select" name="type" onchange="getPageByAppType()"
+                        <select id="getPageByAppType" class="timo-search-select" name="type" onchange="getPageByCriteria()"
                                 mo:dict="APP_TYPE" mo-selected="${type}"></select>
                     </div>
                 </div>
@@ -78,6 +78,17 @@
 <script th:replace="/common/template :: script"></script>
 <script type="text/javascript" th:src="@{/js/plugins/jquery-2.2.4.min.js}"></script>
 <script type="text/javascript">
+    function getPageByCriteria() {
+        var envSelectedOption = $("#getPageByEnv option:selected")
+        var envParam = envSelectedOption.text()
+
+        var typeSelectedOption = $("#getPageByAppType option:selected")
+        var typeParam = typeSelectedOption.text()
+
+        url = '?env=' + envParam + '&type=' + typeParam
+        window.location.href = window.location.pathname + url;
+    }
+
     function getPageByEnv() {
         var selectedOption = $("#getPageByEnv option:selected")
         var param = selectedOption.text()