Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-XuHaoJie

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-XuHaoJie
XuHaoJie
Commit 938e844c96af26a3e529d630136f933270684e61 2 parents 4f43231a e22751c5
Showing 7 changed files with 43 additions and 60 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
hg-monitor-web-base/src/main/resources/static/src/controller/globalSearch.js
hg-monitor-web-base/src/main/resources/static/src/controller/resManageIndex.js
hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
hg-monitor-web-base/src/main/resources/static/src/index.js
hg-monitor-web-base/src/main/resources/static/src/views/layout.html
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/upload/index.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @938e844
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @938e844
@@ -3068,7 +3068,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
                         title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`;
                         if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
+/*
                             title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
+*/
                         }
                         if (res.state == 'new' && hardwareFlag.endsWith("N")){
                             layer.alert('资源未监控!',{icon:0});
@@ -3089,7 +3091,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
                         title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`;
                         if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
+/*
                             title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
+*/
                         }
                         obj.openNewWin(url,title,params,editFlag,fn,cancelfn,type);
                     }
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/globalSearch.js
View file @938e844
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/globalSearch.js
View file @938e844
@@ -252,7 +252,9 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports
                                 var topoStr = `<a class="layui-icon reslist-view-topo hide" data-resid="${d.resId}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>`;
                                 var assetsStr = '';
                                 if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) {
+/*
                                     assetsStr = `<a class="layui-icon reslist-assets-details hide" data-resid="${d.resId}" data-restype="${d.resType}" data-name="${d.resName}" data-ip="${d.ip}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
+*/
                                 }
                                 return '<div><span data-search-resource="' + d.resId + '" data-search-ip="' + d.ip + '" data-search-resType="' + d.resType + '" data-search-resname="' + d.resName + '" class="layui-table-link">' + d.resName + '</span>' +
                                     favStr + topoStr + assetsStr +
@@ -435,4 +437,4 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports
     });
-});
+});
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/resManageIndex.js
View file @938e844
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/resManageIndex.js
View file @938e844
@@ -752,7 +752,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', 
                         }
                         html += '<a class="layui-icon reslist-view-topo hide" data-resid="' + d.resId + '" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>';
                         if ((d.resCategory === 'share' || d.resCategory === 'assets') && d.hardwareFlag.endsWith("Y")) {
+/*
                             html += '<a class="layui-icon resmanage-assets-details hide" data-id="'+d.resId+'" data-ip="'+ d.ip +'" data-restype="'+d.resType+'" data-name="'+d.resName+'" data-rescategory="'+d.resCategory+'" data-hardwareflag="'+d.hardwareFlag+'"  style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>'
+*/
                         }
                         html += '</div>'
                         return html;
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
View file @938e844
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
View file @938e844
@@ -193,7 +193,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                 }, {
                     type: 'numbers', title: '序号'
                 }, {
-                    field: 'repType', title: '汇报类型', align: 'center', 
+                    field: 'repType', title: '汇报类型', align: 'center',
                     templet: function (d) {
                         var typeName = ''
                         switch (d.repType) {
@@ -213,7 +213,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                     field: 'repTitle', title: '标题', align: 'center', minWidth: 200,event: 'serRead',
                     templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>'
                 }, {
-                    field: 'attachmentList', title: '附件数量', align: 'center', 
+                    field: 'attachmentList', title: '附件数量', align: 'center',
                     templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-workReport-attachment">{{d.attachmentList.length}}</span></div>'
                 }, {
                     field: 'currIsRead', title: '状态', align: 'center',
@@ -253,11 +253,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                         return userName.toString();
                     }
                 }, {
-                    field: 'createUserNickName', title: '上报人', align: 'center', 
+                    field: 'createUserNickName', title: '上报人', align: 'center',
                 }, {
-                    field: 'manufacturerName', title: '厂商', align: 'center', 
+                    field: 'manufacturerName', title: '厂商', align: 'center',
                 }, {
-                    field: 'createTime', title: '上报时间', align: 'center', 
+                    field: 'createTime', title: '上报时间', align: 'center',
                 }]],
                 done: function () {
                     //获取附件列表
@@ -739,6 +739,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
             admin.req({
                 url: url
             }).done(function (response) {
+                // 执行成功，有没有数据都隐藏加载图标
+                echartObject.hideLoading();
                 if (response && response.map) {
                     xData = response.map.userList;
                     yData = response.map.valueList;
@@ -823,7 +825,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                         }],
                         series: series
                     }
-                    echartObject.hideLoading();
                     echartObject.setOption(option)
                 }
             })
@@ -1001,7 +1002,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                 readChart.setOption(option);
             });
         }
-        
+
         function setRead(workReportIds) {
             if (workReportIds.length == 0) {
                 layer.msg('请至少选择一项未读的数据。', {icon: 0, time: 3000});
@@ -1055,4 +1056,4 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
           //  loadReportableChart();
         }
     });
-});
+});
--- a/hg-monitor-web-base/src/main/resources/static/src/index.js
View file @938e844
+++ b/hg-monitor-web-base/src/main/resources/static/src/index.js
View file @938e844
@@ -107,63 +107,26 @@ layui.extend({
           tabsPage.index = index;
         }
       });
-        // 遍历左侧菜单
-        var tabList=[]
-        $.ajax({
-            url: sessionStorage.getItem('domainName') + '/api-user/menus/current?type=1',
-            async: false,
-            data: {access_token:localStorage.getItem("access_token"),},
-            success(response) {
-                $.each(response.data, function (i, v) {
-                    if(v.subMenus){
-                        $.each(v.subMenus, function (i, e) {
-                            tabList.push(e)
-                            if(e.subMenus){
-                                $.each(e.subMenus, function (i, ev) {
-                                    tabList.push(ev)
-                                    if(ev.subMenus){
-                                        $.each(ev.subMenus, function (i, every) {
-                                            tabList.push(every)
-                                        });
-                                    }
-                                });
-                            }
-                        });
-                    }
+        var tabName;
+        try {
+            tabName=  admin.tabsPage.elem.text()
+        } catch (e){
-                });
-
-            }
-        });
+        }
+        if(!tabName){
+            tabName=  res.title
+        }
         //如果未在选项卡中匹配到，则追加选项卡
         if(setter.pageTabs && pathURL !== '/'){
         if(!matchTo){
-            var tabName='' // tab标签名
-            tabList.forEach((e) =>{
-                var url = e.path;
-                if(url && !url.startsWith('/')){
-                    url = '/'+url;
-                }
-                if(pathURL && !pathURL.startsWith('/')){
-                    pathURL = '/'+pathURL;
-                }
-
-                 if(url && url.indexOf(pathURL) != -1){
-                     tabName = e.name
-                 }
-            });
-            if(!tabName){
-                tabName=  res.title
-            }
             $(APP_BODY).append('<div class="layadmin-tabsbody-item layui-show"></div>');
-          tabsPage.index = tabs.length;
-          element.tabAdd(FILTER_TAB_TBAS, {
-              title: '<span>'+ (tabName || '新标签页') +'</span>'
-              // title: '<span>'+ (res.title || '新标签页') +'</span>'
-            ,id: pathURL
-            ,attr: router.href
-          });
+            tabsPage.index = tabs.length;
+            element.tabAdd(FILTER_TAB_TBAS, {
+               title: '<span>'+ (tabName || '新标签页') +'</span>'
+             ,id: pathURL
+             ,attr: router.href
+           });
         }
       }
@@ -172,6 +135,8 @@ layui.extend({
       //定位当前tabs
       element.tabChange(FILTER_TAB_TBAS, pathURL);
+      // 修改为当前菜单名称
+      $('* [lay-id="' + pathURL + '"] span').text(tabName)
       admin.tabsBodyChange(tabsPage.index);
     }).done(function(){
--- a/hg-monitor-web-base/src/main/resources/static/src/views/layout.html
View file @938e844
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/layout.html
View file @938e844
@@ -539,7 +539,9 @@
         {{# } }}
         <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>
         {{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }}
+<!--
         <a class="layui-icon reslist-assets-details hide" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-ip="{{ d.ip }}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>
+-->
         {{# } }}
     </div>
 </script>
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/upload/index.js
View file @938e844
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/upload/index.js
View file @938e844
@@ -121,6 +121,13 @@ export default {
                 docNo:props.docNo
             }
+            // xwx 文档上传名称不能包含空字符串
+            if (fileObj.name.indexOf(" ") >=0){
+                proxy.$global.showMsg("文档名称不能存在空格！", "warning");
+                return;
+            }
+
+
             /*文件大小限制更改为200M
             * lu 20211206
             */