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

…eb into master-500-dev

 <div>
 	<el-select @visible-change="selectClose" v-model="modelValueLabel" :filter-method="selectFilterMethod"
-		style="min-width: 550px;" :size="size" placeholder="资源类型" :filterable="isFilter" clearable
+		style="min-width: 120px;" :size="size" placeholder="资源类型" :filterable="isFilter" clearable
 		:collapse-tags="true" @change="selectChangeMethod">
 		<el-option :value="modelValue" style="height: auto;padding: 0;">
 			<el-tree ref="resTypeTree" :data="list" :check-on-click-node="true" :default-expand-all="isDefaultAll"

@@ -1109,7 +1109,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
 
                         commonCols.colsClickEvent(editFlag);
 
-                        loadRightResTypeSelectEvent(curTreeNode.data.id, "normal", res.obj);
+                        loadRightResTypeSelectEvent(curTreeNode.id, "normal", res.obj);
 
                         //表格排序监听 joke add 20200408
                         table.on('sort(resListTable)', function (obj) {
@@ -1398,7 +1398,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
         //加载右侧资源类型下拉框
         function loadRightResTypeSelectEvent(resType, type, obj) {
             layer.closeAll('tips');
-
             var str = '';
             var domStr = 'resListContent'
             var fun = reloadTable;