Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -1246,7 +1246,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             }
             form.render('select');
             form.render();
-            //清空查询条件 joke add 20200409 开始
+            //清空查询条件 joke add 20200409 结束
 
             var targetId = '';
             var searchType = "";
@@ -1376,7 +1376,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                 $("#res_minicomputer").parent().parent().removeClass("hide");
                 var minicomputerStr = '';
                 minicomputerStr = '<option value="">=小型机服务器=</option>';
-                let url = `${common.domainName}/api-web/home/res-list/HOST_MINICOMPUTER?access_token=${accessToken}&page=1&limit=30&resCategory=resources`
+                let url = `${common.domainName}/api-web/home/res-list/hostMinicomputerPartitionParents?access_token=${accessToken}`
                 $.ajax({
                     url: url,
                     method: 'get',
@@ -1399,7 +1399,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             if (targetId && searchType) {
                 var url = "/api-web/home/res-list/" + searchType + "?page=1&limit=50";
                 if(searchType == 'MIDDLEWARE_WEBLOGIC'){
-                    url += '&parentId=null'
+                    url += '&parentId=null&parentType=parent'
                 }
                 admin.req({
                     url: common.domainName + url

@@ -30,7 +30,7 @@ layui.define(['laytpl', 'layer'], function(exports){
   //加载中
   view.loading = function(elem){
     elem.append(
-      this.elemLoad = $('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon layui-icon-loading layadmin-loading"></i>')
+      this.elemLoad = $('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon  layadmin-loading"></i>')
     );
   };
 

@@ -4,7 +4,7 @@
  @Author：贤心
  @Site：http://www.layui.com/admin/
  @License：LPPL
- 
+
  */
 
 html #layuicss-layuiAdmin {
@@ -174,21 +174,21 @@ html {
 
 /* 重置表格风格 */
 /*
-.layui-table th, 
-.layui-table td, 
+.layui-table th,
+.layui-table td,
 .layui-table[lay-skin="line"],
-.layui-table[lay-skin="row"], 
-.layui-table-view, 
+.layui-table[lay-skin="row"],
+.layui-table-view,
 .layui-table-header,
 .layui-table-tool,
 .layui-table-page,
 .layui-table-fixed-r,
 .layui-table-tips-main{border-color: #f6f6f6;}
 
-.layui-table thead tr, 
-.layui-table-header, 
+.layui-table thead tr,
+.layui-table-header,
 .layui-table-tool,
-.layui-table-patch, 
+.layui-table-patch,
 .layui-table-mend{background-color: #fff;}
 
 .layui-table[lay-even] tr:nth-child(even),
@@ -237,6 +237,10 @@ html {
     margin: -16px -15px;
     font-size: 30px;
     color: #c2c2c2;
+    background: url(/start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;
+    background-size: 100% 100%;
+    width: 70px;
+    height: 70px;
 }
 
 .layadmin-fixed {
@@ -759,9 +763,9 @@ html {
 }
 
 /*
- 
+
  格局
- 
+
 */
 
 .layui-fluid {
@@ -803,9 +807,9 @@ html {
 }
 
 /*
- 
+
  控制台
- 
+
 */
 
 /* 重置轮播样式 */
@@ -1040,9 +1044,9 @@ html {
 }
 
 /********************************
- 
+
   其它主页开始 By star1029
- 
+
 *******************************/
 
 /* 主页示例一 by star1029 */
@@ -1291,7 +1295,7 @@ html {
 /*
 
  应用
- 
+
 */
 
 /* 消息中心 */
@@ -1330,9 +1334,9 @@ html {
 }
 
 /*
- 
+
  系统
- 
+
 */
 
 /* 头部图标重置 */

@@ -159,13 +159,13 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-inline hide" >
-                                    <div class="layui-input-inline">
-                                        <select name="label" id="res_sub_restype" lay-filter="sub_restype">
-                                            <option value="">=资源类型=</option>
-                                        </select>
-                                    </div>
-                                </div>
+<!--                                <div class="layui-inline hide" >-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <select name="label" id="res_sub_restype" lay-filter="sub_restype">-->
+<!--                                            <option value="">=资源类型=</option>-->
+<!--                                        </select>-->
+<!--                                    </div>-->
+<!--                                </div>-->
                                 <div class="layui-inline hide">
                                     <div class="layui-input-inline">
                                         <select name="label" id="res_vendor" lay-filter="res_vendor">

 <div>
     <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
-          {{textString}}1111
+          {{textString}}
     </span>
 
     <cm-dialog title="机房布局" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">

 <div>
     <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
-          {{textString}}2222
+          {{textString}}
     </span>
 
     <cm-dialog title="机柜" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">

@@ -81,7 +81,7 @@ export default {
                                 geo: {
                                     show: true,
                                     map: 'echarts',
-                                    roam: true,
+                                    roam: false,
                                     zoom: 1.25,
                                     aspectScale:1,//地图的宽高比
                                     // 地图中心点的坐标, 可调节显示的偏移量