Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -349,6 +349,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
 
 
         //加载虚拟化数据（平台、资源池、物理机、虚拟机）
         //加载虚拟化数据（平台、资源池、物理机、虚拟机）
         function loadVirtualizationView(parentNode, data, node, options) {
         function loadVirtualizationView(parentNode, data, node, options) {
+            $('#res_coll_protocol_select_div').show();
             //绑定业务
             //绑定业务
             // common.bizTypeSelect("treetableBizTypes", function () {
             // common.bizTypeSelect("treetableBizTypes", function () {
             //     form.render("select");
             //     form.render("select");
@@ -1337,6 +1338,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                         limit: -1
                         limit: -1
                     }
                     }
                 }).done(function (res) {
                 }).done(function (res) {
+                    $('#res_coll_protocol_select_div').show();
                     xmSelect.render({
                     xmSelect.render({
                         el: '#collProtocolSelect'
                         el: '#collProtocolSelect'
                         , filterable: true
                         , filterable: true
@@ -1371,6 +1373,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                         }
                         }
                     })
                     })
                 })
                 })
+            }else{
+                $('#res_coll_protocol_select_div').hide();
             }
             }
             if (resType === 'HOST_MINICOMPUTER_PARTITION') {
             if (resType === 'HOST_MINICOMPUTER_PARTITION') {
                 $("#res_minicomputer").parent().parent().removeClass("hide");
                 $("#res_minicomputer").parent().parent().removeClass("hide");

@@ -163,6 +163,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                     editMode: 'true'
                     editMode: 'true'
                 },
                 },
                 done: function (res) {
                 done: function (res) {
+                    //更新table_data数据  joke add 20211206
+                    table_data = res.data;
                     if(resListSelectIds.length > 0){
                     if(resListSelectIds.length > 0){
                         $.each(res.data,function (i,e) {
                         $.each(res.data,function (i,e) {
                             $.each(resListSelectIds,function (j,k) {
                             $.each(resListSelectIds,function (j,k) {

@@ -153,7 +153,7 @@
                                         </select>
                                         </select>
                                     </div>
                                     </div>
                                 </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-inline" id="res_coll_protocol_select_div">
                                     <div class="layui-input-inline layui-input-inline--long" style="width: 180px;">
                                     <div class="layui-input-inline layui-input-inline--long" style="width: 180px;">
                                         <div id="collProtocolSelect" class="xm-select">
                                         <div id="collProtocolSelect" class="xm-select">
                                         </div>
                                         </div>