monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit e1e53f8319ada595ec31f47a5636eb1603c301ef 2 parents 1af58d13 4389922d

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

…master-v32-lushangqing
Inline Side-by-side
Showing 7 changed files with 18 additions and 14 deletions
@@ -1246,7 +1246,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1246,7 +1246,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1246 } 1246 }
1247 form.render('select'); 1247 form.render('select');
1248 form.render(); 1248 form.render();
1249 - //清空查询条件 joke add 20200409 开始 1249 + //清空查询条件 joke add 20200409 结束
1250 1250
1251 var targetId = ''; 1251 var targetId = '';
1252 var searchType = ""; 1252 var searchType = "";
@@ -1376,7 +1376,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1376,7 +1376,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1376 $("#res_minicomputer").parent().parent().removeClass("hide"); 1376 $("#res_minicomputer").parent().parent().removeClass("hide");
1377 var minicomputerStr = ''; 1377 var minicomputerStr = '';
1378 minicomputerStr = '<option value="">=小型机服务器=</option>'; 1378 minicomputerStr = '<option value="">=小型机服务器=</option>';
1379 - let url = `${common.domainName}/api-web/home/res-list/HOST_MINICOMPUTER?access_token=${accessToken}&page=1&limit=30&resCategory=resources` 1379 + let url = `${common.domainName}/api-web/home/res-list/hostMinicomputerPartitionParents?access_token=${accessToken}`
1380 $.ajax({ 1380 $.ajax({
1381 url: url, 1381 url: url,
1382 method: 'get', 1382 method: 'get',
@@ -1399,7 +1399,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1399,7 +1399,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1399 if (targetId && searchType) { 1399 if (targetId && searchType) {
1400 var url = "/api-web/home/res-list/" + searchType + "?page=1&limit=50"; 1400 var url = "/api-web/home/res-list/" + searchType + "?page=1&limit=50";
1401 if(searchType == 'MIDDLEWARE_WEBLOGIC'){ 1401 if(searchType == 'MIDDLEWARE_WEBLOGIC'){
1402 - url += '&parentId=null' 1402 + url += '&parentId=null&parentType=parent'
1403 } 1403 }
1404 admin.req({ 1404 admin.req({
1405 url: common.domainName + url 1405 url: common.domainName + url
@@ -30,7 +30,7 @@ layui.define(['laytpl', 'layer'], function(exports){ @@ -30,7 +30,7 @@ layui.define(['laytpl', 'layer'], function(exports){
30 //加载中 30 //加载中
31 view.loading = function(elem){ 31 view.loading = function(elem){
32 elem.append( 32 elem.append(
33 - this.elemLoad = $('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon layui-icon-loading layadmin-loading"></i>') 33 + this.elemLoad = $('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon layadmin-loading"></i>')
34 ); 34 );
35 }; 35 };
36 36
@@ -237,6 +237,10 @@ html { @@ -237,6 +237,10 @@ html {
237 margin: -16px -15px; 237 margin: -16px -15px;
238 font-size: 30px; 238 font-size: 30px;
239 color: #c2c2c2; 239 color: #c2c2c2;
  240 + background: url(/start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;
  241 + background-size: 100% 100%;
  242 + width: 70px;
  243 + height: 70px;
240 } 244 }
241 245
242 .layadmin-fixed { 246 .layadmin-fixed {
@@ -159,13 +159,13 @@ @@ -159,13 +159,13 @@
159 </div> 159 </div>
160 </div> 160 </div>
161 </div> 161 </div>
162 - <div class="layui-inline hide" >  
163 - <div class="layui-input-inline">  
164 - <select name="label" id="res_sub_restype" lay-filter="sub_restype">  
165 - <option value="">=资源类型=</option>  
166 - </select>  
167 - </div>  
168 - </div> 162 +<!-- <div class="layui-inline hide" >-->
  163 +<!-- <div class="layui-input-inline">-->
  164 +<!-- <select name="label" id="res_sub_restype" lay-filter="sub_restype">-->
  165 +<!-- <option value="">=资源类型=</option>-->
  166 +<!-- </select>-->
  167 +<!-- </div>-->
  168 +<!-- </div>-->
169 <div class="layui-inline hide"> 169 <div class="layui-inline hide">
170 <div class="layui-input-inline"> 170 <div class="layui-input-inline">
171 <select name="label" id="res_vendor" lay-filter="res_vendor"> 171 <select name="label" id="res_vendor" lay-filter="res_vendor">
1 <div> 1 <div>
2 <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" > 2 <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
3 - {{textString}}1111 3 + {{textString}}
4 </span> 4 </span>
5 5
6 <cm-dialog title="机房布局" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog"> 6 <cm-dialog title="机房布局" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">
1 <div> 1 <div>
2 <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" > 2 <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
3 - {{textString}}2222 3 + {{textString}}
4 </span> 4 </span>
5 5
6 <cm-dialog title="机柜" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog"> 6 <cm-dialog title="机柜" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">
@@ -81,7 +81,7 @@ export default { @@ -81,7 +81,7 @@ export default {
81 geo: { 81 geo: {
82 show: true, 82 show: true,
83 map: 'echarts', 83 map: 'echarts',
84 - roam: true, 84 + roam: false,
85 zoom: 1.25, 85 zoom: 1.25,
86 aspectScale:1,//地图的宽高比 86 aspectScale:1,//地图的宽高比
87 // 地图中心点的坐标, 可调节显示的偏移量 87 // 地图中心点的坐标, 可调节显示的偏移量