部分错误和展示细节调整

hhyo · Aug 12, 2019 · 5344f70 · 5344f70
1 parent 465463c
commit 5344f70
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/sql/db_diagnostic.py b/sql/db_diagnostic.py
@@ -35,10 +35,12 @@ def process(request):
         else:
             sql = "{} where command= '{}';".format(base_sql, command_type)
         query_engine = get_engine(instance=instance)
-        processlist = query_engine.query('information_schema', sql).to_dict()
-
-        result = {'status': 0, 'msg': 'ok', 'rows': processlist}
-
+        query_result = query_engine.query('information_schema', sql)
+        if not query_result.error:
+            processlist = query_result.to_dict()
+            result = {'status': 0, 'msg': 'ok', 'rows': processlist}
+        else:
+            result = {'status': 1, 'msg': query_result.error}
     # 返回查询结果
     return HttpResponse(json.dumps(result, cls=ExtendJSONEncoder, bigint_as_string=True),
                         content_type='application/json')

diff --git a/sql/templates/dbdiagnostic.html b/sql/templates/dbdiagnostic.html
@@ -101,8 +101,8 @@ <h4 class="modal-title text-danger">确定要终止所选会话吗？</h4>
                     sortName: 'time',                   //排序字段
                     sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
                     pageNumber: 1,                      //初始化加载第一页，默认第一页,并记录
-                    pageSize: 30,                     //每页的记录行数（*）
-                    pageList: [20, 30, 50, 100],       //可供选择的每页的行数（*）
+                    pageSize: 100,                     //每页的记录行数（*）
+                    pageList: [20, 30, 50, 100, 1000],       //可供选择的每页的行数（*）
                     search: true,                      //是否显示表格搜索
                     strictSearch: false,                //是否全匹配搜索
                     showColumns: true,                  //是否显示所有的列（选择显示的列）

diff --git a/sql/templates/queryapplylist.html b/sql/templates/queryapplylist.html
@@ -4,9 +4,11 @@
     <!-- 自定义操作按钮-->
     <div id="toolbar" class="btn-group">
         <a type="button" class="btn btn-default" href="/queryuserprivileges/">
+            <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
             <span aria-hidden="true"></span>权限管理</a>
         <button id="btn_add" type="button" class="btn btn-default"
                 data-toggle="modal" data-target="#apply">
+            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
             <span aria-hidden="true"></span>权限申请
         </button>
     </div>