Merge branch 'wangfeng-500-dev' into 'master-500-dev'

涉及未处理的漏洞进行提示



See merge request !1244

@@ -57,9 +57,12 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
                 , type: "get"
                 , type: "get"
                 , async: false
                 , async: false
                 , done: function (res) {
                 , done: function (res) {
+                    // 如果有未读的漏洞则弹出未读漏洞信息
                     if(res.data && res.data.length > 0){
                     if(res.data && res.data.length > 0){
                         list = res.data;
                         list = res.data;
                         vulnerabilityDialog(res.data)
                         vulnerabilityDialog(res.data)
+                    }else{ // 提示有涉及但未处理的漏洞
+                        countRelatedUnSolvevulnerability();
                     }
                     }
                 }
                 }
             });
             });
@@ -83,7 +86,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
             `
             `
             if (list.length>0){
             if (list.length>0){
                 layer.open({
                 layer.open({
-                    title: ['漏洞咨询', 'font-size:20px;background-color: #d0ddec;display:flex;align-items: center; justify-content: flex-start;'],
+                    title: ['漏洞资讯', 'font-size:20px;background-color: #d0ddec;display:flex;align-items: center; justify-content: flex-start;'],
                     type: 1,
                     type: 1,
                     area: ['40%', '60%'],
                     area: ['40%', '60%'],
                     closeBtn:0,
                     closeBtn:0,
@@ -188,6 +191,18 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
             }
             }
         }
         }
 
 
+        // 涉及但未处理的漏洞
+        function countRelatedUnSolvevulnerability() {
+            admin.req({
+                url: common.domainName + '/api-web/vulnerabilities/unsolve'
+                , type: "get"
+                , done: function (res) {
+                    if(res.count > 0){
+                        layer.msg('您有 '+res.count+" 条涉及漏洞未处理，请前往【漏洞管理】进行处理！", {icon: 7, time: 5000});
+                    }
+                }
+            });
+        }
         function checkPassword(pattern, oldPwd) {
         function checkPassword(pattern, oldPwd) {
             var msg = "密码安全等级过低，请修改密码";
             var msg = "密码安全等级过低，请修改密码";
             var password = localStorage.getItem("password");
             var password = localStorage.getItem("password");