monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 860b3cd69e67b6f75d2efa44eb73250b44d8e584 2 parents 0bac0554 db277569

Merge branch 'joke' into 'master' 

1、杭州-处理资源列表调整列位置保存异常问题 2、杭州-活动告警页面调整资源类型下拉框高度

1、杭州-处理资源列表调整列位置保存异常问题
2、杭州-活动告警页面调整资源类型下拉框高度

See merge request !194
Inline Side-by-side
Showing 8 changed files with 8 additions and 9 deletions
@@ -758,7 +758,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm @@ -758,7 +758,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
758 showFolderIcon: true, 758 showFolderIcon: true,
759 showLine: true, 759 showLine: true,
760 indent: 20, 760 indent: 20,
761 - expandedKeys: [-3], 761 + expandedKeys: true,
762 strict: false 762 strict: false
763 }, 763 },
764 data: data 764 data: data
@@ -914,8 +914,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -914,8 +914,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
914 var sessions = layui.sessions; 914 var sessions = layui.sessions;
915 accessToken = sessions.getToken()['access_token']; 915 accessToken = sessions.getToken()['access_token'];
916 }); 916 });
917 - var parseData=JSON.parse(data['cols']);  
918 - var cols = parseData[0]; 917 + var cols = data['cols'][0];
919 $.each(cols, function (i, e) { 918 $.each(cols, function (i, e) {
920 if (e['isChild']) { 919 if (e['isChild']) {
921 if (e['isChild'] && typeof e['isChild'] === 'function') { 920 if (e['isChild'] && typeof e['isChild'] === 'function') {
@@ -3159,7 +3159,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3159,7 +3159,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3159 showFolderIcon: true, 3159 showFolderIcon: true,
3160 showLine: true, 3160 showLine: true,
3161 indent: 20, 3161 indent: 20,
3162 - expandedKeys: [-3], 3162 + expandedKeys: true,
3163 strict: false 3163 strict: false
3164 }, 3164 },
3165 data: response.data, 3165 data: response.data,
@@ -1618,7 +1618,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' @@ -1618,7 +1618,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
1618 showFolderIcon: true, 1618 showFolderIcon: true,
1619 showLine: true, 1619 showLine: true,
1620 indent: 20, 1620 indent: 20,
1621 - expandedKeys: [-3], 1621 + expandedKeys: true,
1622 strict: false 1622 strict: false
1623 }, 1623 },
1624 data: data 1624 data: data
@@ -210,7 +210,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports @@ -210,7 +210,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports
210 showFolderIcon: true, 210 showFolderIcon: true,
211 showLine: true, 211 showLine: true,
212 indent: 20, 212 indent: 20,
213 - expandedKeys: [-3], 213 + expandedKeys: true,
214 strict: false 214 strict: false
215 }, 215 },
216 data: data 216 data: data
@@ -950,7 +950,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -950,7 +950,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
950 showFolderIcon: true, 950 showFolderIcon: true,
951 showLine: true, 951 showLine: true,
952 indent: 20, 952 indent: 20,
953 - expandedKeys: [-3], 953 + expandedKeys: true,
954 strict: false 954 strict: false
955 }, 955 },
956 data: data 956 data: data
@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
195 type: 'text' 195 type: 'text'
196 } 196 }
197 }, 197 },
198 - height: 'auto', 198 + height: '200px',
199 data: resTypeTree, 199 data: resTypeTree,
200 on: function (data) { 200 on: function (data) {
201 if(data.isAdd){ 201 if(data.isAdd){
1 <div class="analysis-add-container"> 1 <div class="analysis-add-container">
2 - <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;color:#337ab7"> 2 + <div class="add-top-title" style=" padding: 20px 20px 0px 20px;font-weight: bold">
3 比对分析场景 3 比对分析场景
4 </div> 4 </div>
5 <div class="analysis-drop" v-if="!isShowLIst"> 5 <div class="analysis-drop" v-if="!isShowLIst">