monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit c4492cf015f474cfd7af766ca04cc87a7c4c9a99 2 parents e754640a 12b3a16d

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

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 2 changed files with 5 additions and 7 deletions
@@ -42,11 +42,9 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli @@ -42,11 +42,9 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
42 }); 42 });
43 form.render(); 43 form.render();
44 44
45 - function autoHeight(el) {  
46 - // var height = el.parents('.layui-card').height();  
47 - // el.css('min-height', height - 75);  
48 - }  
49 - 45 + common.ddicSelect('jgraph-topo_type','JTOPO_TOPOTYPE',function (datalist) {
  46 + form.render('select');
  47 + });
50 //绑定机房 48 //绑定机房
51 admin.req({ 49 admin.req({
52 url: common.domainName + '/api-web/manage/machineroom/page' 50 url: common.domainName + '/api-web/manage/machineroom/page'
@@ -34,10 +34,10 @@ @@ -34,10 +34,10 @@
34 <label class="layui-form-label">拓扑类型</label> 34 <label class="layui-form-label">拓扑类型</label>
35 <div class="layui-input-block"> 35 <div class="layui-input-block">
36 <select id="jgraph-topo_type" lay-filter="jgraph-edittopo_topo_type" name="jgraph-topo_type"> 36 <select id="jgraph-topo_type" lay-filter="jgraph-edittopo_topo_type" name="jgraph-topo_type">
37 - <option value="1">业务拓扑</option> 37 + <!-- <option value="1">业务拓扑</option>
38 <option value="2">资源拓扑</option> 38 <option value="2">资源拓扑</option>
39 <option value="3">网络拓扑</option> 39 <option value="3">网络拓扑</option>
40 - <option value="4">机房拓扑</option> 40 + <option value="4">机房拓扑</option>-->
41 </select> 41 </select>
42 </div> 42 </div>
43 </div> 43 </div>