Merge branch 'joke' into 'master'

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

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

See merge request !194

@@ -758,7 +758,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                                             showFolderIcon: true,
                                             showLine: true,
                                             indent: 20,
-                                            expandedKeys: [-3],
+                                            expandedKeys: true,
                                             strict: false
                                         },
                                         data: data

@@ -914,8 +914,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 var sessions = layui.sessions;
                 accessToken = sessions.getToken()['access_token'];
             });
-            var parseData=JSON.parse(data['cols']);
-            var cols = parseData[0];
+            var cols = data['cols'][0];
             $.each(cols, function (i, e) {
                 if (e['isChild']) {
                     if (e['isChild'] && typeof e['isChild'] === 'function') {

@@ -3159,7 +3159,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                                                 showFolderIcon: true,
                                                 showLine: true,
                                                 indent: 20,
-                                                expandedKeys: [-3],
+                                                expandedKeys: true,
                                                 strict: false
                                             },
                                             data: response.data,

@@ -1618,7 +1618,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
                                             showFolderIcon: true,
                                             showLine: true,
                                             indent: 20,
-                                            expandedKeys: [-3],
+                                            expandedKeys: true,
                                             strict: false
                                         },
                                         data: data

@@ -210,7 +210,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports
                                         showFolderIcon: true,
                                         showLine: true,
                                         indent: 20,
-                                        expandedKeys: [-3],
+                                        expandedKeys: true,
                                         strict: false
                                     },
                                     data: data

@@ -950,7 +950,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                                                     showFolderIcon: true,
                                                     showLine: true,
                                                     indent: 20,
-                                                    expandedKeys: [-3],
+                                                    expandedKeys: true,
                                                     strict: false
                                                 },
                                                 data: data

@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                 type: 'text'
                             }
                         },
-                        height: 'auto',
+                        height: '200px',
                         data: resTypeTree,
                         on: function (data) {
                             if(data.isAdd){

 <div class="analysis-add-container">
-    <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;color:#337ab7">
+    <div class="add-top-title" style=" padding: 20px 20px 0px 20px;font-weight: bold">
         比对分析场景
     </div>
     <div class="analysis-drop" v-if="!isShowLIst">