monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 62b2427125ddf311b88bbfb38a84bb60ce37a19b 2 parents 1e15101b dc8715b7

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/resmanage/index.html
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -226,7 +226,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions'], func @@ -226,7 +226,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions'], func
226 realtime: true, //拖动滚动条时是否动态的更新图表数据 226 realtime: true, //拖动滚动条时是否动态的更新图表数据
227 height: 25, //滚动条高度 227 height: 25, //滚动条高度
228 start: 5, //滚动条开始位置（共100等份） 228 start: 5, //滚动条开始位置（共100等份）
229 - end: 55 //结束位置（共100等份） 229 + end: 12 //结束位置（共100等份）//lsq x轴缩放距离调整 2022-05-25
230 } 230 }
231 ], 231 ],
232 //end lsq 2022-03-10 232 //end lsq 2022-03-10
@@ -35,9 +35,9 @@ @@ -35,9 +35,9 @@
35 autocomplete="off" class="layui-input"> 35 autocomplete="off" class="layui-input">
36 </div> 36 </div>
37 </div> 37 </div>
38 - <div class="layui-inline" style="width: 200px">  
39 - <div class="layui-input-inline">  
40 - <div id="resManageBusSelect" class="xm-select" style="width: 200px"></div> 38 + <div class="layui-inline">
  39 + <div class="layui-input-inline" style="width:200px;">
  40 + <div id="resManageBusSelect" class="xm-select" ></div>
41 </div> 41 </div>
42 </div> 42 </div>
43 <div class="layui-inline"> 43 <div class="layui-inline">