monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit a921bc1232349db059eb195dae9c8e5c1c07a711 1 parent 6d184527

chore:日志视图样式优化

Inline Side-by-side
Showing 2 changed files with 22 additions and 93 deletions
@@ -335,6 +335,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin', @@ -335,6 +335,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
335 elem: '#logTable' 335 elem: '#logTable'
336 , url: domainName + '/api-web/log/detail/listPage' 336 , url: domainName + '/api-web/log/detail/listPage'
337 , where: getParams() 337 , where: getParams()
  338 + , height: 'full-280'
338 , cellMinWidth: 80 339 , cellMinWidth: 80
339 , page: { 340 , page: {
340 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 341 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
@@ -136,52 +136,38 @@ @@ -136,52 +136,38 @@
136 border-top: dashed 1px grey; 136 border-top: dashed 1px grey;
137 } 137 }
138 138
  139 + xm-select > .xm-body{
  140 + max-width: 240px;
  141 + }
  142 + #searchKeyWords{
  143 + width: 240px!important;
  144 + }
  145 +
139 146
140 </style> 147 </style>
141 <article class="page-container"> 148 <article class="page-container">
142 <div class="page-panel"> 149 <div class="page-panel">
143 - <div class="main"> 150 + <div class="main commonDiv">
144 <div class="layui-card"> 151 <div class="layui-card">
145 <div class="layui-card-header"> 152 <div class="layui-card-header">
146 <form class="layui-form layui-card-header" lay-filter="form_log_condition" onsubmit="return false;"> 153 <form class="layui-form layui-card-header" lay-filter="form_log_condition" onsubmit="return false;">
147 <input type="hidden" id="searchDataRange"> 154 <input type="hidden" id="searchDataRange">
148 <input type="hidden" id="searchDataType"> 155 <input type="hidden" id="searchDataType">
149 - <!--<div class="display-flex log-header">  
150 - <div class="title">新搜索</div>  
151 - <div class="layui-inline layui-btn-group time-group tools" id="createTimeBtn" >  
152 - <button type="button" class="layui-btn layui-btn-primary layui-btn-sm">新建</button>  
153 - <button type="button" class="layui-btn layui-btn-primary layui-btn-sm">打开</button>  
154 - <button type="button" class="layui-btn layui-btn-primary layui-btn-sm">保存</button> 156 + <div class="layui-form-item newlog-form-item">
  157 + <div class="layui-inline">
  158 + <div style="width: 240px" id="resTypeList"></div>
155 </div> 159 </div>
156 - </div>-->  
157 - <!---->  
158 - <div class="layui-row">  
159 - <div class="layui-col-md2">  
160 - <div style="width: 120px" id="resTypeList"></div>  
161 - <!--<select id="resTypeList" name="modules" lay-search="">  
162 - <option value="">直接选择或搜索选择</option>  
163 - <option value="HOST_X86SERVER">服务器</option>  
164 - <option value="DATABASE_">数据库</option>  
165 - <option value="MIDDLEWARE_WEBLOGIC">中间件</option>  
166 - <option value="NETSAFE_">安全设备</option>  
167 - <option value="NETHARDWARE_">网络设备</option>  
168 - </select>--> 160 + <div class="layui-inline">
  161 + <input type="text" id="searchKeyWords" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
169 </div> 162 </div>
170 - <div class="layui-col-md9">  
171 - <div class="layui-row">  
172 - <div class="layui-col-md8">  
173 - <input type="text" id="searchKeyWords" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">  
174 - </div>  
175 - <div class="layui-col-md4">  
176 - <div class="layui-btn layui-btn-primary" style="margin-bottom: 8px;border-left: 0px" id="time-select"> 163 + <div class="layui-inline">
  164 + <div class="layui-btn layui-btn-primary" id="time-select">
177 <span id="time-select-span"> 165 <span id="time-select-span">
178 </span> 166 </span>
179 - </div>  
180 - </div>  
181 </div> 167 </div>
182 </div> 168 </div>
183 - <div class="layui-col-md1">  
184 - <button class="layui-btn layui-btn-normal" style="margin-bottom: 8px;margin-left: 10px" id="log-search"> 169 + <div class="layui-inline query-btn-inline">
  170 + <button class="layui-btn layui-btn-normal" id="log-search">
185 搜索 171 搜索
186 </button> 172 </button>
187 </div> 173 </div>
@@ -205,70 +191,12 @@ @@ -205,70 +191,12 @@
205 </form> 191 </form>
206 </div> 192 </div>
207 193
208 - <div class="layui-card" style="min-height: 200px">  
209 - <div class="layui-card-body">  
210 - <div style="display: flex;height: 200px" class="layui-card-echart">  
211 - <div style="flex-grow: 1">  
212 - <div class="pie-chart" id="log-echarts"></div>  
213 - </div>  
214 - </div>  
215 - </div>  
216 - </div>  
217 -  
218 - <div class="layui-card">  
219 - <div class="layui-card-body">  
220 - <div style="display: flex" class="layui-card-echart">  
221 - <div style="flex-grow: 1">  
222 - <div style="display: flex;flex-direction: row">  
223 - <div style="width: 200px;display: inline-flex">  
224 -  
225 - </div>  
226 - </div>  
227 - <!--<div class="layui-row alaysis NETHARDWARE_" style="display: none">  
228 - <div class="layui-col-md12">  
229 - <div class="layui-btn-group">  
230 - <button type="button" class="layui-btn layui-btn-xs">自身告警情况</button>  
231 - <button type="button" class="layui-btn layui-btn-xs">设备Trap告警</button>  
232 - <button type="button" class="layui-btn layui-btn-xs">网络配置情况</button>  
233 - </div>  
234 - </div>  
235 - </div>  
236 - <div class="layui-row alaysis HOST_X86SERVER" style="display: none">  
237 - <div class="layui-col-md12">  
238 - <div class="layui-btn-group">  
239 - <button type="button" class="layui-btn layui-btn-xs">运行账号及权限</button>  
240 - <button type="button" class="layui-btn layui-btn-xs">账号登录</button>  
241 - </div>  
242 - </div>  
243 - </div>  
244 - <div class="layui-row alaysis DATABASE_" style="display: none">  
245 - <div class="layui-col-md12">  
246 - <div class="layui-btn-group">  
247 - <button type="button" class="layui-btn layui-btn-xs">批量删除</button>  
248 - <button type="button" class="layui-btn layui-btn-xs">表空间删除</button>  
249 - </div>  
250 - </div>  
251 - </div>  
252 - <div class="layui-row alaysis MIDDLEWARE_WEBLOGIC" style="display: none">  
253 - <div class="layui-col-md12">  
254 - <div class="layui-btn-group">  
255 - <button type="button" class="layui-btn layui-btn-xs">登录信息</button>  
256 - </div>  
257 - </div>  
258 - </div>  
259 - <div class="layui-row alaysis NETSAFE_" style="display: none">  
260 - <div class="layui-col-md12">  
261 - <div class="layui-btn-group">  
262 - <button type="button" class="layui-btn layui-btn-xs">非正常访问</button>  
263 - <button type="button" class="layui-btn layui-btn-xs">策略变动</button>  
264 - </div>  
265 - </div>  
266 - </div>-->  
267 - <table id="logTable" lay-filter="log-table-filter"></table>  
268 - </div>  
269 - </div> 194 + <div style="display: flex;height: 200px" class="layui-card-echart">
  195 + <div style="flex-grow: 1">
  196 + <div class="pie-chart" id="log-echarts"></div>
270 </div> 197 </div>
271 </div> 198 </div>
  199 + <table id="logTable" lay-filter="log-table-filter"></table>
272 </div> 200 </div>
273 </div> 201 </div>
274 </div> 202 </div>