monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit cf983d1e695b00b89d9fb2ccbfcdd3764253709d 2 parents 6c62f626 6bb11e89

杭州-首页-大屏title修改

Inline Side-by-side
Showing 7 changed files with 48 additions and 14 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 // 点击资源数量
@@ -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
@@ -163,6 +163,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -163,6 +163,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
163 editMode: 'true' 163 editMode: 'true'
164 }, 164 },
165 done: function (res) { 165 done: function (res) {
  166 + //更新table_data数据 joke add 20211206
  167 + table_data = res.data;
166 if(resListSelectIds.length > 0){ 168 if(resListSelectIds.length > 0){
167 $.each(res.data,function (i,e) { 169 $.each(res.data,function (i,e) {
168 $.each(resListSelectIds,function (j,k) { 170 $.each(resListSelectIds,function (j,k) {
@@ -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}}">
@@ -666,7 +666,12 @@ export default { @@ -666,7 +666,12 @@ export default {
666 * 上传 666 * 上传
667 */ 667 */
668 let showUploadFile = (flg) => { 668 let showUploadFile = (flg) => {
669 - showUploadDialogVisible.value = flg; 669 + if(flg && currentNodeData.value.id==0){
  670 + proxy.$global.showMsg("根目录不可以上传文件！", "warning");
  671 + }else{
  672 + showUploadDialogVisible.value = flg;
  673 + }
  674 +
670 } 675 }
671 let uploadCallBack = ({document, fileInfo}) => { 676 let uploadCallBack = ({document, fileInfo}) => {
672 reload(false); 677 reload(false);
@@ -43,16 +43,22 @@ @@ -43,16 +43,22 @@
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){ }}
52 <li class="layui-nav-item" > 58 <li class="layui-nav-item" >
53 59
54 <div id="toYTHView_div" > 60 <div id="toYTHView_div" >
55 - <dd layadmin-event="toYTHViewScreen" lay-tips="一体化监控台"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px"></a></dd> 61 + <dd layadmin-event="toYTHViewScreen" title="一体化控制台"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px"></a></dd>
56 </div> 62 </div>
57 </li> 63 </li>
58 64