monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ea51aac0ff5b4fe7300cc21026f00a54bb7bf39c 2 parents ce2e3af1 a921bc12

Merge branch 'master-mj-joke' into 'master-mj' 

chore:日志视图样式优化

chore:日志视图样式优化

See merge request !1190
Inline Side-by-side
Showing 2 changed files with 17 additions and 88 deletions
... ... @@ -335,6 +335,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
elem: '#logTable'
, url: domainName + '/api-web/log/detail/listPage'
, where: getParams()
, height: 'full-280'
, cellMinWidth: 80
, page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
... ...
... ... @@ -136,52 +136,38 @@
border-top: dashed 1px grey;
}
xm-select > .xm-body{
max-width: 240px;
}
#searchKeyWords{
width: 240px!important;
}
</style>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<form class="layui-form layui-card-header" lay-filter="form_log_condition" onsubmit="return false;">
<input type="hidden" id="searchDataRange">
<input type="hidden" id="searchDataType">
<!--<div class="display-flex log-header">
<div class="title">新搜索</div>
<div class="layui-inline layui-btn-group time-group tools" id="createTimeBtn" >
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm">新建</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm">打开</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm">保存</button>
</div>
</div>-->
<!---->
<div class="layui-row">
<div class="layui-col-md2">
<div style="width: 120px" id="resTypeList"></div>
<!--<select id="resTypeList" name="modules" lay-search="">
<option value="">直接选择或搜索选择</option>
<option value="HOST_X86SERVER">服务器</option>
<option value="DATABASE_">数据库</option>
<option value="MIDDLEWARE_WEBLOGIC">中间件</option>
<option value="NETSAFE_">安全设备</option>
<option value="NETHARDWARE_">网络设备</option>
</select>-->
<div class="layui-form-item newlog-form-item">
<div class="layui-inline">
<div style="width: 240px" id="resTypeList"></div>
</div>
<div class="layui-col-md9">
<div class="layui-row">
<div class="layui-col-md8">
<div class="layui-inline">
<input type="text" id="searchKeyWords" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-md4">
<div class="layui-btn layui-btn-primary" style="margin-bottom: 8px;border-left: 0px" id="time-select">
<div class="layui-inline">
<div class="layui-btn layui-btn-primary" id="time-select">
<span id="time-select-span">
</span>
</div>
</div>
</div>
</div>
<div class="layui-col-md1">
<button class="layui-btn layui-btn-normal" style="margin-bottom: 8px;margin-left: 10px" id="log-search">
<div class="layui-inline query-btn-inline">
<button class="layui-btn layui-btn-normal" id="log-search">
搜索
</button>
</div>
... ... @@ -205,73 +191,15 @@
</form>
</div>
<div class="layui-card" style="min-height: 200px">
<div class="layui-card-body">
<div style="display: flex;height: 200px" class="layui-card-echart">
<div style="flex-grow: 1">
<div class="pie-chart" id="log-echarts"></div>
</div>
</div>
</div>
</div>
<div class="layui-card">
<div class="layui-card-body">
<div style="display: flex" class="layui-card-echart">
<div style="flex-grow: 1">
<div style="display: flex;flex-direction: row">
<div style="width: 200px;display: inline-flex">
</div>
</div>
<!--<div class="layui-row alaysis NETHARDWARE_" style="display: none">
<div class="layui-col-md12">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-xs">自身告警情况</button>
<button type="button" class="layui-btn layui-btn-xs">设备Trap告警</button>
<button type="button" class="layui-btn layui-btn-xs">网络配置情况</button>
</div>
</div>
</div>
<div class="layui-row alaysis HOST_X86SERVER" style="display: none">
<div class="layui-col-md12">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-xs">运行账号及权限</button>
<button type="button" class="layui-btn layui-btn-xs">账号登录</button>
</div>
</div>
</div>
<div class="layui-row alaysis DATABASE_" style="display: none">
<div class="layui-col-md12">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-xs">批量删除</button>
<button type="button" class="layui-btn layui-btn-xs">表空间删除</button>
</div>
</div>
</div>
<div class="layui-row alaysis MIDDLEWARE_WEBLOGIC" style="display: none">
<div class="layui-col-md12">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-xs">登录信息</button>
</div>
</div>
</div>
<div class="layui-row alaysis NETSAFE_" style="display: none">
<div class="layui-col-md12">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-xs">非正常访问</button>
<button type="button" class="layui-btn layui-btn-xs">策略变动</button>
</div>
</div>
</div>-->
<table id="logTable" lay-filter="log-table-filter"></table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</article>
<script type="text/html" id="expandAll">
... ...