monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit 8833c50638037fa2fefbf34f548c8793eb393f69 2 parents f510ff8c 20eb07cd

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-V32-XuHaoJie

Inline Side-by-side
Showing 10 changed files with 84 additions and 25 deletions
@@ -41,7 +41,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -41,7 +41,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
41 loadFavoriteList("0"); 41 loadFavoriteList("0");
42 //解决点击面包屑，favorites_parentId没有赋值问题 joke add 20200518 开始 42 //解决点击面包屑，favorites_parentId没有赋值问题 joke add 20200518 开始
43 $("#favorites_parentId").val('0'); 43 $("#favorites_parentId").val('0');
44 - //解决点击面包屑，favorites_parentId没有赋值问题 joke add 20200518 开始 44 + //解决点击面包屑，favorites_parentId没有赋值问题 joke add 20200518 结束
  45 + //清空面包屑其他按钮选中状态
  46 + $(".layui-breadcrumb .breadcrumb_a").removeClass("active");
  47 + $("#tofavorite_home").addClass("active");
45 }); 48 });
46 //创建收藏夹 49 //创建收藏夹
47 $("#create_favorite").on("click",function () { 50 $("#create_favorite").on("click",function () {
@@ -57,7 +60,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -57,7 +60,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
57 yes:function (index,layero) { 60 yes:function (index,layero) {
58 var favoritesName = $(layero).find('input[name=favoritesName]').val(); 61 var favoritesName = $(layero).find('input[name=favoritesName]').val();
59 // Start xwx 2021/11/1 新建文件夹名称不能为空 62 // Start xwx 2021/11/1 新建文件夹名称不能为空
60 - if (favoritesName!=''){ 63 + if (favoritesName.trim()!=''){
61 saveFavorite(null,favoritesName,parentId); 64 saveFavorite(null,favoritesName,parentId);
62 $("e.empty").hide(); 65 $("e.empty").hide();
63 //刷新列表 66 //刷新列表
@@ -175,10 +178,16 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -175,10 +178,16 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
175 $(".empty").show(); 178 $(".empty").show();
176 loadFavoriteList(id); 179 loadFavoriteList(id);
177 } 180 }
178 - 181 + //反射面包屑选中,先清空所有选中状态 joke add 20211203
  182 + $(".layui-breadcrumb .breadcrumb_a").removeClass("active");
  183 + $("#tofavorite_home").removeClass("active");
  184 + //反射面包屑选中 joke add 20211203
  185 + $('#'+id).addClass("active");
179 //面包屑点击事件 186 //面包屑点击事件
180 $(".layui-breadcrumb a.breadcrumb_a").unbind('click').on("click",function () { 187 $(".layui-breadcrumb a.breadcrumb_a").unbind('click').on("click",function () {
181 $(".layui-breadcrumb .breadcrumb_a").removeClass("active"); 188 $(".layui-breadcrumb .breadcrumb_a").removeClass("active");
  189 + //点击面包屑时，去除我的收藏夹选中状态 joke add 20211203
  190 + $("#tofavorite_home").removeClass("active");
182 $(this).addClass("active"); 191 $(this).addClass("active");
183 var id = $(this).attr("id"); 192 var id = $(this).attr("id");
184 var flag = $(this).data("flag"); 193 var flag = $(this).data("flag");
@@ -213,6 +222,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -213,6 +222,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
213 $(".layui-icon-ok").on("click",function (e) { 222 $(".layui-icon-ok").on("click",function (e) {
214 e.stopPropagation(); 223 e.stopPropagation();
215 var name = $("#name_"+id).val(); 224 var name = $("#name_"+id).val();
  225 + if (name.trim() == ''){
  226 + layer.msg('收藏夹名称不能为空', {icon: 0, time: 3000});
  227 + return;
  228 + }
216 saveFavorite(id,name,parentId,"title_"+id); 229 saveFavorite(id,name,parentId,"title_"+id);
217 }); 230 });
218 //编辑收藏夹下取消按钮点击事件 joke add 20200515 231 //编辑收藏夹下取消按钮点击事件 joke add 20200515
@@ -224,7 +237,8 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -224,7 +237,8 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
224 //删除收藏夹 237 //删除收藏夹
225 $(".favorite-icon-del").on("click",function () { 238 $(".favorite-icon-del").on("click",function () {
226 var id = $(this).data("id"); 239 var id = $(this).data("id");
227 - deleteFavorite(id); 240 + var pid = $(this).data("pid");
  241 + deleteFavorite(id,pid);
228 }); 242 });
229 } 243 }
230 //判断字符串是否再集合中 244 //判断字符串是否再集合中
@@ -252,7 +266,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -252,7 +266,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
252 }); 266 });
253 } 267 }
254 //删除收藏夹 268 //删除收藏夹
255 - function deleteFavorite(id) { 269 + function deleteFavorite(id,pid) {
256 //确认提示框 270 //确认提示框
257 layer.confirm('即将删除收藏夹及所有子收藏夹，删除后将无法恢复，您确定要删除吗？', { 271 layer.confirm('即将删除收藏夹及所有子收藏夹，删除后将无法恢复，您确定要删除吗？', {
258 btn: ['确定', '取消'] //按钮 272 btn: ['确定', '取消'] //按钮
@@ -266,6 +280,8 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -266,6 +280,8 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
266 offset: '15px' 280 offset: '15px'
267 , icon: 1 281 , icon: 1
268 , time: 1000 282 , time: 1000
  283 + },function () {
  284 + // loadFavoriteList(pid);
269 }); 285 });
270 }).error(function (error) { 286 }).error(function (error) {
271 console.log(error); 287 console.log(error);
@@ -315,7 +315,12 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -315,7 +315,12 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
315 layer.msg('暂无告警', {icon: 0}); 315 layer.msg('暂无告警', {icon: 0});
316 return false; 316 return false;
317 } 317 }
  318 + //不以资源类型不包括父节点的资源类型 包括阿里云、华为云
  319 + if("ALI_CLOUD_PLAT"== _resType || "HUAWEI_CLOUD_PLAT" == _resType){
  320 + _resType =_resType.substring(0,_resType.lastIndexOf("_"));
  321 + }
318 $(this).attr("lay-href", "/alarm/activewarning/restype=" + _resType + "/level=" + level); 322 $(this).attr("lay-href", "/alarm/activewarning/restype=" + _resType + "/level=" + level);
  323 + // $(this).trigger();
319 }); 324 });
320 325
321 // 点击资源数量 326 // 点击资源数量
@@ -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
@@ -1609,7 +1609,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1609,7 +1609,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1609 id: 'layer-select-favorites', 1609 id: 'layer-select-favorites',
1610 content: '<div class="div-select-favorites"><div id="slt-favorites-tree"></div></div>', 1610 content: '<div class="div-select-favorites"><div id="slt-favorites-tree"></div></div>',
1611 offset: '150px', 1611 offset: '150px',
1612 - area: ['20%', '15%'], 1612 + area: ['20%', '25%'],
1613 btn: ['选择', '取消'], 1613 btn: ['选择', '取消'],
1614 resize: false, 1614 resize: false,
1615 success: function () { 1615 success: function () {
@@ -1622,7 +1622,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1622,7 +1622,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1622 clickClose: true, 1622 clickClose: true,
1623 autoRow: true, 1623 autoRow: true,
1624 filterable: true, 1624 filterable: true,
1625 - height: 'auto', 1625 + height: '200px',
1626 toolbar: { 1626 toolbar: {
1627 show: true, 1627 show: true,
1628 }, 1628 },
@@ -1636,7 +1636,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1636,7 +1636,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1636 showFolderIcon: true, 1636 showFolderIcon: true,
1637 showLine: true, 1637 showLine: true,
1638 indent: 20, 1638 indent: 20,
1639 - expandedKeys: [-3], 1639 + expandedKeys: true,
1640 strict: false 1640 strict: false
1641 }, 1641 },
1642 data: data 1642 data: data
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 <div class="card-main"> 79 <div class="card-main">
80 <div class="layui-btn-group favorites-btngroup" style="z-index: 99"> 80 <div class="layui-btn-group favorites-btngroup" style="z-index: 99">
81 <i class="layui-icon favorite-icon-edit" title="编辑" data-id="{{item.favId}}" data-pid="{{item.parentId}}">&#xe642;</i> 81 <i class="layui-icon favorite-icon-edit" title="编辑" data-id="{{item.favId}}" data-pid="{{item.parentId}}">&#xe642;</i>
82 - <i class="layui-icon favorite-icon-del" title="删除" data-id="{{item.favId}}">&#xe640;</i> 82 + <i class="layui-icon favorite-icon-del" title="删除" data-id="{{item.favId}}" data-pid="{{item.parentId}}">&#xe640;</i>
83 </div> 83 </div>
84 <div class="favorite-icon" data-id="{{item.favId}}" data-pid="{{item.parentId}}" data-child="{{item.childNum}}" 84 <div class="favorite-icon" data-id="{{item.favId}}" data-pid="{{item.parentId}}" data-child="{{item.childNum}}"
85 data-name="{{item.favName}}" data-res="{{item.resNum}}"> 85 data-name="{{item.favName}}" data-res="{{item.resNum}}">
@@ -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">
@@ -58,4 +58,11 @@ custom-class="config-dialog" @@ -58,4 +58,11 @@ custom-class="config-dialog"
58 } 58 }
59 .button-more{ 59 .button-more{
60 position: absolute;right: 0;top: 33px;z-index: 1;background: #f5f7fa;width: 80px; padding: 10px; 60 position: absolute;right: 0;top: 33px;z-index: 1;background: #f5f7fa;width: 80px; padding: 10px;
  61 +}
  62 +.breadcrumb .el-breadcrumb{
  63 + background: #ffffff;
  64 + padding: 20px 5px 0;
  65 +}
  66 +.breadcrumb .el-breadcrumb .el-breadcrumb__item{
  67 + cursor: pointer;
61 } 68 }
@@ -91,6 +91,17 @@ @@ -91,6 +91,17 @@
91 </div> 91 </div>
92 <!--列表--> 92 <!--列表-->
93 <div v-if="activeBtn == 'list'"> 93 <div v-if="activeBtn == 'list'">
  94 + <el-row>
  95 + <el-col :span="24" class="breadcrumb">
  96 + <el-breadcrumb :separator-icon="ArrowRight">
  97 + <template v-for="(item,index) in breadcrumbList">
  98 + <el-breadcrumb-item :key="index" v-if="item.data.name" @click="nodeClick(item, item.data)">{{item.data.name}}</el-breadcrumb-item>
  99 + </template>
  100 +
  101 + </el-breadcrumb>
  102 + </el-col>
  103 + </el-row>
  104 +
94 <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true" 105 <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true"
95 :showBorder="false" :showSelection="false" :showTools="isEditName" 106 :showBorder="false" :showSelection="false" :showTools="isEditName"
96 :showPage="false" :height="height - 54"> 107 :showPage="false" :height="height - 54">
@@ -132,6 +132,11 @@ export default { @@ -132,6 +132,11 @@ export default {
132 let historyNode = Vue.ref([]); 132 let historyNode = Vue.ref([]);
133 let isUserFolder = Vue.ref(false); 133 let isUserFolder = Vue.ref(false);
134 134
  135 + /*面包屑路径数据
  136 + * lu
  137 + */
  138 + let breadcrumbList=Vue.ref([]);
  139 +
135 let addHistoryNode = (item) => { 140 let addHistoryNode = (item) => {
136 141
137 if (item.name == undefined && item.fileName) { 142 if (item.name == undefined && item.fileName) {
@@ -148,6 +153,8 @@ export default { @@ -148,6 +153,8 @@ export default {
148 arr.push(item); 153 arr.push(item);
149 historyNode.value = arr; 154 historyNode.value = arr;
150 } 155 }
  156 + breadcrumbList.value.push({data:item});
  157 + console.log("breadcrumbList",breadcrumbList.value)
151 158
152 currentNodeData.value = item; 159 currentNodeData.value = item;
153 } 160 }
@@ -307,8 +314,14 @@ export default { @@ -307,8 +314,14 @@ export default {
307 let arr = []; 314 let arr = [];
308 arr.push(id); 315 arr.push(id);
309 defaultExpandedKeys.value = arr; 316 defaultExpandedKeys.value = arr;
310 -  
311 - 317 + let indexSlice='';
  318 + let arrList= breadcrumbList.value;
  319 + arrList.map((item,index)=>{
  320 + if(id == item.data.id){
  321 + indexSlice=index
  322 + }
  323 + })
  324 + breadcrumbList.value=arrList.slice(0,indexSlice)
312 addHistoryNode(data); 325 addHistoryNode(data);
313 326
314 getPage(id); 327 getPage(id);
@@ -866,6 +879,7 @@ export default { @@ -866,6 +879,7 @@ export default {
866 879
867 return { 880 return {
868 /* viewEdit,*/ 881 /* viewEdit,*/
  882 + breadcrumbList,
869 editFileName, 883 editFileName,
870 isInput, 884 isInput,
871 iconclass, 885 iconclass,
@@ -43,9 +43,15 @@ @@ -43,9 +43,15 @@
43 <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i> 43 <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
44 </a> 44 </a>
45 </li> 45 </li>
46 - <li class="layui-nav-item" lay-tips="大屏">  
47 - <a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>  
48 - </li> 46 + <!--判定是否有daping角色，如果有则显示该菜单 joke add 20211203-->
  47 + <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/checkHasRole?roleCode=daping">
  48 + {{# if(d.count > 0){ }}
  49 + <li class="layui-nav-item" lay-tips="大屏">
  50 + <a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>
  51 + </li>
  52 + {{# } }}
  53 + </script>
  54 +
49 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/sxview/getbizListByUser?access_token={{localStorage.getItem('access_token')}}"> 55 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/sxview/getbizListByUser?access_token={{localStorage.getItem('access_token')}}">
50 56
51 {{# if(d.data.length>0){ }} 57 {{# if(d.data.length>0){ }}
@@ -18,7 +18,7 @@ export default { @@ -18,7 +18,7 @@ export default {
18 return { 18 return {
19 timer:null, 19 timer:null,
20 domainName:sessionStorage.getItem('domainName'), 20 domainName:sessionStorage.getItem('domainName'),
21 - apiUrl:'/api-web/sxview/getbizListByUser?access_token=', 21 + apiUrl:'/api-web/sxview/getBizListForHzDp?access_token=',
22 checkId:0,//当前选中的tabs 22 checkId:0,//当前选中的tabs
23 listItem:1,//轮播数-总页数 23 listItem:1,//轮播数-总页数
24 pageSize:5,//每页显示5条数据 24 pageSize:5,//每页显示5条数据