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

…eb into master-500-dev-lushangqing

@@ -42,11 +42,9 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
         });
         form.render();
 
-        function autoHeight(el) {
-            // var height = el.parents('.layui-card').height();
-            // el.css('min-height', height - 75);
-        }
-
+        common.ddicSelect('jgraph-topo_type','JTOPO_TOPOTYPE',function (datalist) {
+            form.render('select');
+        });
         //绑定机房
         admin.req({
             url: common.domainName + '/api-web/manage/machineroom/page'

@@ -34,10 +34,10 @@
                 <label class="layui-form-label">拓扑类型</label>
                 <div class="layui-input-block">
                     <select id="jgraph-topo_type" lay-filter="jgraph-edittopo_topo_type" name="jgraph-topo_type">
-                        <option value="1">业务拓扑</option>
+                       <!-- <option value="1">业务拓扑</option>
                         <option value="2">资源拓扑</option>
                         <option value="3">网络拓扑</option>
-                        <option value="4">机房拓扑</option>
+                        <option value="4">机房拓扑</option>-->
                     </select>
                 </div>
             </div>