monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by ww
Commit 363308353d0d8fc715bd0139386f72622a53ab56 1 parent 45a8557e

fix: 样式优化

Inline Side-by-side
Showing 4 changed files with 7 additions and 8 deletions
@@ -163,7 +163,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -163,7 +163,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
163 createStart: $("#shutdownplanCreateStart").val(), 163 createStart: $("#shutdownplanCreateStart").val(),
164 createEnd: $("#shutdownplanCreateEnd").val() 164 createEnd: $("#shutdownplanCreateEnd").val()
165 } 165 }
166 - , height: 'full-210' 166 + , height: 'full-100'
167 , cellMinWidth: 100 167 , cellMinWidth: 100
168 , page: { 168 , page: {
169 layout: ['count','limit', 'prev', 'page', 'next', 'skip'] 169 layout: ['count','limit', 'prev', 'page', 'next', 'skip']
@@ -16,13 +16,13 @@ @@ -16,13 +16,13 @@
16 lay-filter="form-ip-condition"> 16 lay-filter="form-ip-condition">
17 <div class="layui-form-item"> 17 <div class="layui-form-item">
18 <div class="layui-inline hide"> 18 <div class="layui-inline hide">
19 - <div class="layui-input-inline layui-input-inline--long keyword-input"> 19 + <div class="layui-input-inline layui-input-inline--long">
20 <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含： </br>IP地址" name="ipLike" 20 <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含： </br>IP地址" name="ipLike"
21 placeholder="IP地址" type="text"> 21 placeholder="IP地址" type="text">
22 </div> 22 </div>
23 </div> 23 </div>
24 <div class="layui-inline keyword-input"> 24 <div class="layui-inline keyword-input">
25 - <div class="layui-input-inline layui-input-inline--long"> 25 + <div class="layui-input-inline layui-input-inline--long keyword-input">
26 <input autocomplete="off" class="layui-input" name="ipLikeRight" placeholder="IP地址段" 26 <input autocomplete="off" class="layui-input" name="ipLikeRight" placeholder="IP地址段"
27 type="text"> 27 type="text">
28 </div> 28 </div>
@@ -147,15 +147,14 @@ @@ -147,15 +147,14 @@
147 <input type="hidden" id="searchDataType"> 147 <input type="hidden" id="searchDataType">
148 <div class="layui-form-item newlog-form-item"> 148 <div class="layui-form-item newlog-form-item">
149 <div class="layui-inline"> 149 <div class="layui-inline">
150 - <div style="width: 240px" id="resTypeList"></div> 150 + <input type="text" id="searchKeyWords" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
151 </div> 151 </div>
152 <div class="layui-inline"> 152 <div class="layui-inline">
153 - <input type="text" id="searchKeyWords" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input"> 153 + <div style="width: 240px" id="resTypeList"></div>
154 </div> 154 </div>
155 <div class="layui-inline"> 155 <div class="layui-inline">
156 <div class="layui-btn layui-btn-primary" id="time-select"> 156 <div class="layui-btn layui-btn-primary" id="time-select">
157 - <span id="time-select-span">  
158 - </span> 157 + <span id="time-select-span"></span>
159 </div> 158 </div>
160 </div> 159 </div>
161 <div class="layui-inline query-btn-inline"> 160 <div class="layui-inline query-btn-inline">
1 <div > 1 <div >
2 <!-- 表格--> 2 <!-- 表格-->
3 - <el-table :border="showBorder" v-loading="loading" :size="size" ref="multipleTable" @selection-change="handleSelectionChange" :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height" 3 + <el-table :border="showBorder" v-loading="loading" :size="size" ref="multipleTable" @selection-change="handleSelectionChange" :data="dataList" header-row-class-name="tbl-header-class" :height="height"
4 style="width: 100%;margin: 0px 0px; font-size:13.5px;" :row-key="getRowKeys" :expand-row-keys="expands" :default-expand-all="defaultExpand" 4 style="width: 100%;margin: 0px 0px; font-size:13.5px;" :row-key="getRowKeys" :expand-row-keys="expands" :default-expand-all="defaultExpand"
5 @select="handleSelect" @select-all="handleSelectAll" 5 @select="handleSelect" @select-all="handleSelectAll"
6 > 6 >