monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 7eb1e9071031ddbcde8a719bcbca8566ed1e16d7 2 parents d2b181dd 19c475f7

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

…eb into master-500-dev
Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
1 <div> 1 <div>
2 <el-select @visible-change="selectClose" v-model="modelValueLabel" :filter-method="selectFilterMethod" 2 <el-select @visible-change="selectClose" v-model="modelValueLabel" :filter-method="selectFilterMethod"
3 - style="min-width: 550px;" :size="size" placeholder="资源类型" :filterable="isFilter" clearable 3 + style="min-width: 120px;" :size="size" placeholder="资源类型" :filterable="isFilter" clearable
4 :collapse-tags="true" @change="selectChangeMethod"> 4 :collapse-tags="true" @change="selectChangeMethod">
5 <el-option :value="modelValue" style="height: auto;padding: 0;"> 5 <el-option :value="modelValue" style="height: auto;padding: 0;">
6 <el-tree ref="resTypeTree" :data="list" :check-on-click-node="true" :default-expand-all="isDefaultAll" 6 <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', ' @@ -1109,7 +1109,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1109 1109
1110 commonCols.colsClickEvent(editFlag); 1110 commonCols.colsClickEvent(editFlag);
1111 1111
1112 - loadRightResTypeSelectEvent(curTreeNode.data.id, "normal", res.obj); 1112 + loadRightResTypeSelectEvent(curTreeNode.id, "normal", res.obj);
1113 1113
1114 //表格排序监听 joke add 20200408 1114 //表格排序监听 joke add 20200408
1115 table.on('sort(resListTable)', function (obj) { 1115 table.on('sort(resListTable)', function (obj) {
@@ -1398,7 +1398,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1398,7 +1398,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1398 //加载右侧资源类型下拉框 1398 //加载右侧资源类型下拉框
1399 function loadRightResTypeSelectEvent(resType, type, obj) { 1399 function loadRightResTypeSelectEvent(resType, type, obj) {
1400 layer.closeAll('tips'); 1400 layer.closeAll('tips');
1401 -  
1402 var str = ''; 1401 var str = '';
1403 var domStr = 'resListContent' 1402 var domStr = 'resListContent'
1404 var fun = reloadTable; 1403 var fun = reloadTable;