From 3a83a9f44dbc0408ba5335b6ac16807f556bfb43 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Wed, 28 Jul 2021 17:02:49 +0800
Subject: [PATCH] 111

---
 web/pages/dashboard.html        |  2 +-
 web/src/x.min.js                | 23 ++++++++++++++++-------
 web/srczip/logic/analysis.js    |  2 +-
 web/srczip/logic/dashboard.js   | 17 ++++++++++++++---
 web/srczip/logic/setgrouping.js |  4 +---
 web/static/css/analysis.css     |  2 +-
 6 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 903b731..154a8a5 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -524,7 +524,7 @@
 
 <script id="layui-project-dot" type="text/html">
     <li class="layui-nav-item">
-        <a href="javascript:;" class="projecttit">{{d[0]["name"]}}</a>
+        <a href="javascript:;" class="projecttit"></a>
         <dl class="layui-nav-child">
             {{#  layui.each(d, function(index, item){ }}
                 <dd><a href="javascript:void(0);" class="selectproject" data-game="{{item.game}}" data-id="{{item._id}}">{{item.name}}</a></dd>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index affb082..d34ef55 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -2128,7 +2128,7 @@ var X = window.X || {
                     "section":[-1,1],//区间
                     "tableType":screentypedata[0]['id']
                 };
-                console.log(drr);
+                // console.log(drr);
                 data['eventView']['filts'].push(drr);//上传全局数据
                 filtsftvdata.push(screentypedata[0]['category'][0]['category'])
 
@@ -3249,9 +3249,14 @@ var X = window.X || {
             X.api("project/","get",{},function(d){
                 X.laytpldata('#layui-project-dot',d,'.layui-project-box');
                 X.DATA['projectarr'] = d;
-                X.DATA['projectid'] = d[0]["_id"];
-                X.DATA["game"] = d[0]["game"];
-                me.freshMenu(d[0]["_id"]);
+                X.DATA['projectid'] = X.DATA['projectid'] || d[0]["_id"];
+                X.DATA["game"] = X.DATA["game"] || d[0]["game"];
+                for(let i in d){
+                    if(d[i]['game'] == X.DATA["game"]){
+                        $(".projecttit").html(d[i]['name']);
+                    }
+                }
+                me.freshMenu(X.DATA['projectid']);
                 // X.template("toptab","analysis-zhanwei",d);
             });
 
@@ -3338,6 +3343,8 @@ var X = window.X || {
 
             //筛选
             $(document).off('click','.tab-right-box .tjsx').on("click",".tab-right-box .tjsx",function(){
+                layer.msg('该功能暂未开放');
+                return;
                 X.open({
                     type: 1,
                     title: false,
@@ -3421,6 +3428,8 @@ var X = window.X || {
     
             // 用户搜索
             $("#search").click(function(){
+                layer.msg('该功能暂未开放');
+                return;
                 X.open({
                     type: 1,
                     title: false,
@@ -3432,6 +3441,8 @@ var X = window.X || {
             });
             
             $(document).off('click','.tab-right-box .shezhi').on("click",".tab-right-box .shezhi",function(){
+                layer.msg('该功能暂未开放');
+                return;
                 X.open({
                     type: 1,
                     title: false,
@@ -8627,14 +8638,13 @@ var X = window.X || {
             // 搜索
             $('.setgrouping-sousuo-txt-box input').bind('input propertychange', function() {
                 var value = $(this).val();
-                console.log(data);
                 if(value != ""){
                     $(".setgrouping-sousuo-txt-box img").show();
                     var filteringdata = [];
                     for(let i in data){
                         var detailsdata = [];
                         for(let j in data[i]["category"]){
-                            if(data[i]["category"][j]['event_name'].indexOf(value) != -1){
+                            if(data[i]["category"][j]['event_desc'].indexOf(value) != -1){
                                 detailsdata.push(data[i]["category"][j]);
                             }
                         }
@@ -8647,7 +8657,6 @@ var X = window.X || {
                             filteringdata.push(arr);
                         }
                     }
-                    console.log(filteringdata);
                     X.laytpldata("#judge-box-dot",filteringdata,".setgrouping-box .setgrouping-content-box");
                 }else {
                     $(".setgrouping-sousuo-txt-box img").hide();
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index d47907e..fe2b2f5 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -613,7 +613,7 @@
                     "section":[-1,1],//区间
                     "tableType":screentypedata[0]['id']
                 };
-                console.log(drr);
+                // console.log(drr);
                 data['eventView']['filts'].push(drr);//上传全局数据
                 filtsftvdata.push(screentypedata[0]['category'][0]['category'])
 
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index f602003..7fd746c 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -13,9 +13,14 @@
             X.api("project/","get",{},function(d){
                 X.laytpldata('#layui-project-dot',d,'.layui-project-box');
                 X.DATA['projectarr'] = d;
-                X.DATA['projectid'] = d[0]["_id"];
-                X.DATA["game"] = d[0]["game"];
-                me.freshMenu(d[0]["_id"]);
+                X.DATA['projectid'] = X.DATA['projectid'] || d[0]["_id"];
+                X.DATA["game"] = X.DATA["game"] || d[0]["game"];
+                for(let i in d){
+                    if(d[i]['game'] == X.DATA["game"]){
+                        $(".projecttit").html(d[i]['name']);
+                    }
+                }
+                me.freshMenu(X.DATA['projectid']);
                 // X.template("toptab","analysis-zhanwei",d);
             });
 
@@ -102,6 +107,8 @@
 
             //筛选
             $(document).off('click','.tab-right-box .tjsx').on("click",".tab-right-box .tjsx",function(){
+                layer.msg('该功能暂未开放');
+                return;
                 X.open({
                     type: 1,
                     title: false,
@@ -185,6 +192,8 @@
     
             // 用户搜索
             $("#search").click(function(){
+                layer.msg('该功能暂未开放');
+                return;
                 X.open({
                     type: 1,
                     title: false,
@@ -196,6 +205,8 @@
             });
             
             $(document).off('click','.tab-right-box .shezhi').on("click",".tab-right-box .shezhi",function(){
+                layer.msg('该功能暂未开放');
+                return;
                 X.open({
                     type: 1,
                     title: false,
diff --git a/web/srczip/logic/setgrouping.js b/web/srczip/logic/setgrouping.js
index 470133d..61e2c9c 100644
--- a/web/srczip/logic/setgrouping.js
+++ b/web/srczip/logic/setgrouping.js
@@ -11,14 +11,13 @@
             // 搜索
             $('.setgrouping-sousuo-txt-box input').bind('input propertychange', function() {
                 var value = $(this).val();
-                console.log(data);
                 if(value != ""){
                     $(".setgrouping-sousuo-txt-box img").show();
                     var filteringdata = [];
                     for(let i in data){
                         var detailsdata = [];
                         for(let j in data[i]["category"]){
-                            if(data[i]["category"][j]['event_name'].indexOf(value) != -1){
+                            if(data[i]["category"][j]['event_desc'].indexOf(value) != -1){
                                 detailsdata.push(data[i]["category"][j]);
                             }
                         }
@@ -31,7 +30,6 @@
                             filteringdata.push(arr);
                         }
                     }
-                    console.log(filteringdata);
                     X.laytpldata("#judge-box-dot",filteringdata,".setgrouping-box .setgrouping-content-box");
                 }else {
                     $(".setgrouping-sousuo-txt-box img").hide();
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index 980f55a..6d3c128 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -273,7 +273,7 @@
 .conditionquery-copy { cursor: pointer; color: #fff; background-color: #3d90ff; border-radius: 2px; padding: 0 16px; font-weight: 400; font-size: 14px; height: 32px; line-height: 32px; }
 .conditionquery-but-box span{ background-color: #eaecf8; color: #3d90ff; padding: 0 8px; cursor: pointer; display: inline-block; }
 
-.table-div-box { width: 100%; height: 660px; overflow: auto; }
+.table-div-box { width: 100%; max-height: 660px; overflow: auto; }
 .table-fenxi-box { width: 100%; }
 .table-fenxi-box th { background-color: #f0f2f5; min-width: 100px; max-width: 200px; padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #f0f2f5; }
 .table-fenxi-box tr { text-align: center; border-left: 1px solid #e6e6e6; }