流量提醒，菜单样式，菜单报送

src/main/websrc/js/app/ToolService.js

@@ -6,7 +6,7 @@
 
     function toolservice($rootScope,$timeout,UtilService){
     	var service = {},that = $rootScope,
-        rootmenu = {"admonitor":"广告监测","behavior":"行为分析","export":"数据导出","management":"管理中心"},
+        rootmenu = {"dataview":"数据概览","action":"行为分析","user":"用户分析","event":"埋点管理","tool":"工具"},
         menu = {"custommenu": "行业看单","eventstats": "事件分析","funnel": "漏斗转化","retention": "留存分析",
                 "intelligentpath": "智能路径","usergroup": "用户分群","event": "APP事件管理","profile": "用户属性管理",
                 "logtool": "日志流","report": "下载报表","app": "产品中心","auth": "成员管理"};
@@ -404,7 +404,6 @@
         //菜单报送数据
         service.getMenuSubmitData = function(submenu){
             if($rootScope.pagePath=="userinfo")return;
-            if(!rootmenu[$rootScope.mainMenu])return;
 
             var cmids = service.getCMidInfo();
             var company = service.getUser().company;
@@ -412,21 +411,25 @@
                 company = "";
             }
 
-            var appkey = "",appcategory = "",appname = "";
+            var appkey = "",appcategory = "",appname = "",rootmenukey;
             if($rootScope.appInstance){
                 appkey = $rootScope.appInstance.appkey;
                 appcategory = $rootScope.appInstance.appGenreName;
                 appname = $rootScope.appInstance.name;
             }
             if(!submenu || submenu==''){submenu = menu[$rootScope.pagePath];}
-
+            for (var m in that.meauTree){
+               if(that.meauTree[m].indexOf($rootScope.pagePath)>-1){
+                 rootmenukey = m;
+               }
+            }
             var Uuser = UtilService.getUser();
             var params = {
                 appid: UtilService.getTKAppkey(),
                 who:Uuser.email,
                 what:"pageview",
                 context:{
-                    rootmenu:rootmenu[$rootScope.mainMenu], //菜单分类
+                    rootmenu:rootmenu[rootmenukey], //菜单分类
                     menu:menu[$rootScope.pagePath], //当前菜单
                     submenu:submenu, //子菜单-看单
                     sessionid:UtilService.getCookie("JSESSIONID"),

src/main/websrc/js/app/app.js

@@ -275,14 +275,21 @@
             }
 
             $scope.flowKnow = true;
-						UtilService.setCookie("ryioRedCircle",true,7);
+			UtilService.setCookie("ryioRedCircle",true,7);
 
+            var params = {
+              accountId: auid
+            };
             if(type == 'ioAlert'){
                 $scope.ioAlert = false;
+                params.ioFlow = true;
             }
             else if(type == 'ioDateAlert'){
                 $scope.ioDateAlert = false;
+                params.ioPastTime = true;
             }
+            var closePM = HttpService.postInfo("mng/accountRestrict/confirm", params);
+            closePM.then(function(data) {});
         }
 
 				$rootScope.menuSubmitData = function(submenu){

src/main/websrc/js/collect/menu.js

@@ -3,7 +3,7 @@
         .controller("collectCtrl",["$rootScope","$scope","$state","ToolService","$timeout",collectCtrl]);
 
     function collectCtrl($rootScope,$scope,$state,ToolService,$timeout){
-        var meauTree = {
+        $rootScope.meauTree = {
             "dataview":["custommenu"],
             "action":["eventstats","funnel","retention","intelligentpath"],
             "user":["usergroup"],
@@ -28,8 +28,8 @@
                     n = n.substring(0,n);
                 }
                 $scope.menuCurFlag = "";
-                for(var k in meauTree){
-                    var ms = meauTree[k];
+                for(var k in $rootScope.meauTree){
+                    var ms = $rootScope.meauTree[k];
                     if(ms.indexOf(n)>-1){
                         $scope.menuCurFlag = k;
                         $scope.menustatus[k] = true;

src/main/websrc/styles/style.scss

@@ -26,9 +26,12 @@ html,body{
 	display:inline-block;
 	margin-right:3px;
 }
-.iconfont.active, .active>.iconfont,.sidebarNav li:hover .iconfont, .activemore>.iconfont{
+.iconfont.active, .active>.iconfont, .activemore>.iconfont{
 	color:#4186ec;
 }
+.sidebarNav li:not(.activemore):hover .iconfont{
+	color: $menulihoverft;
+}
 .icon-logo{
 	font-size:25px;
 	color:#fff;
@@ -1109,8 +1112,8 @@ textarea.iptform{
 	margin-top:15px;
 	margin-right: 18px;
 }
-.sidebarNav li:hover a{
-	color:$menuliactiveft;
+.sidebarNav li:not(.activemore):not(.active):hover a{
+	color:$menulihoverft;
 }
 .sidebarNav li.active{
 	background-color:$menuliactivebg;
@@ -1139,7 +1142,7 @@ textarea.iptform{
 	color:$menuliactiveft;
 }
 .sidebarNav .subli:hover{
-	color:$menuliactiveft;
+	background:$menulihoverbg;
 }
 .submenuIcon{
 	background:url(../images/submenu.png) no-repeat;
@@ -6534,7 +6537,7 @@ pre{
     color:$menuftcolor;
   }
   .smallMenu li:hover a{
-    color:$menuliactiveft;
+    color:$menulihoverft;
   }
   .sidebarNav .subli.active {
     border-left-color: $menubgcolor;