Merge branch 'master-500-dev-xwx' into 'master-500-dev'

通知查询-【无】-资源列表不展示



See merge request !926

@@ -117,6 +117,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             renderSearchCondition(resType, bizId);
             renderSearchCondition(resType, bizId);
             let colResType = resType;
             let colResType = resType;
             if (colResType == 'MIDDLEWARE_WEBLOGIC' &&  parentId == 'null') {
             if (colResType == 'MIDDLEWARE_WEBLOGIC' &&  parentId == 'null') {
+                // 展示控制台的表头
                 colResType = 'MIDDLEWARE_WEBLOGICCONSOLE'
                 colResType = 'MIDDLEWARE_WEBLOGICCONSOLE'
             }
             }
 
 
@@ -515,7 +516,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                 xmSelect.get('#collProtocolSelect', true).setValue([]);
                 xmSelect.get('#collProtocolSelect', true).setValue([]);
                 collProtocols = '';
                 collProtocols = '';
             }
             }
-            form.render('select');
 
 
             var targetId = '';
             var targetId = '';
             var searchType = "";
             var searchType = "";
@@ -535,8 +535,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                 $("#biz_reslist_res_cluster_id").show();
                 $("#biz_reslist_res_cluster_id").show();
             } else if (resType == 'MIDDLEWARE_WEBLOGIC') {
             } else if (resType == 'MIDDLEWARE_WEBLOGIC') {
                 searchType = 'MIDDLEWARE_WEBLOGIC';
                 searchType = 'MIDDLEWARE_WEBLOGIC';
-                optons = "<option value='null'>=全部控制台=</option>"
-                optons += "<option value=''>全部服务</option>"
+                optons = "<option value=''>=服务列表=</option>"
+                optons += "<option value='null'>=控制台列表=</option>"
                 targetId = 'biz_reslist_res_cluster';
                 targetId = 'biz_reslist_res_cluster';
                 $("#biz_reslist_res_cluster_id").show();
                 $("#biz_reslist_res_cluster_id").show();
             } else {
             } else {
@@ -631,6 +631,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                         });
                         });
                     }
                     }
                     $('#' + targetId).html(optons);
                     $('#' + targetId).html(optons);
+
+                    $('#biz_reslist_res_cluster').val(parentId);
                     form.render("select");
                     form.render("select");
                 })
                 })
             }
             }
@@ -787,7 +789,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                 } else {
                 } else {
                     $('#' + domStr).find('.div-link-state').show();
                     $('#' + domStr).find('.div-link-state').show();
                 }
                 }
+
+                $('#biz_reslist_res_cluster').val(parentId);
                 form.render("select");
                 form.render("select");
+
             })
             })
         }
         }
 
 

@@ -243,7 +243,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             method: 'GET',
             method: 'GET',
             success: function (res) {
             success: function (res) {
                 // 资源类型下拉框
                 // 资源类型下拉框
-                if (res && res.success && response.data.length > 0) {
+                if (res && res.success && res.data.length > 0) {
                     var resTypeList = res.data;
                     var resTypeList = res.data;
                     resTypeSelect = xmSelect.render({
                     resTypeSelect = xmSelect.render({
                         el: '#notice_search_resType',
                         el: '#notice_search_resType',