From 10e2551c7c3e4ec05f7e1c31bc2cfcf5ec4c28d2 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Fri, 11 Jun 2021 17:29:59 +0800
Subject: [PATCH] 111

---
 web/pages/event.html         |  2 +-
 web/src/x.min.js             | 23 ++++++++++++++++-------
 web/srczip/logic/retained.js | 23 ++++++++++++++++-------
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/web/pages/event.html b/web/pages/event.html
index fc24db3..f3e345b 100644
--- a/web/pages/event.html
+++ b/web/pages/event.html
@@ -9,7 +9,7 @@
             </div>
             <div class="analysis-con-left-screen-list-left" style="margin-left: 24px;">
                 <div class="analysis-zhibiao-list">
-                    <div class="ant-dropdown-trigger analysis-zhibiao-list-type1 analysis-background" data-index="0"> {{d.eventDesc}}</div>
+                    <div class="ant-dropdown-trigger ant-dropdown-trigger0 analysis-zhibiao-list-type1 analysis-background" data-index="0"> {{d.eventDesc}}</div>
                 </div>
             </div>
             {{#  if(d.filts.length > 0){ }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 93c2627..fa8aeac 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -3944,7 +3944,14 @@ var X = window.X || {
 
             X.api("data_auth/my_event","get",{},function(d){
                 eventdata = d;
-                var arr = {
+                var arr = [{
+                    "eventDesc":eventdata[0]['category'][0]['event_desc'],
+                    "eventName":eventdata[0]['category'][0]['event_name'],
+                    "filts":[],
+                    "relation":"and",
+                    "relationUser":"and",
+                    "renameindicator":""
+                },{
                     "eventDesc":eventdata[0]['category'][0]['event_desc'],
                     "eventName":eventdata[0]['category'][0]['event_name'],
                     "filts":[],
@@ -3952,8 +3959,8 @@ var X = window.X || {
                     "relationUser":"and",
                     "renameindicator":""
                 }
-                data['events'].push(arr);
-                data['events'].push(arr);
+                ]
+                data['events'] = arr;
                 X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
                     groupitemeventsdata[0] = val;
                     groupitemeventsdata[1] = val;
@@ -4090,16 +4097,18 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
+                var dataevent= data['events'][index];
+                // console.log(dataevent);
                 X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.id);
-                    data['events'][index]['eventName'] = val.name;
-                    data['events'][index]['eventDesc'] = val.id;
+                    dataevent['eventName'] = val.name;
+                    dataevent['eventDesc'] = val.id;
+
                     X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
-                        console.log(val);
                         groupitemeventsdata[index] = val;
                     })
-                    console.log(groupitemeventsdata)
+                    // console.log(data['events']);
 
                 })
             })
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 23d0405..637582d 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -50,7 +50,14 @@
 
             X.api("data_auth/my_event","get",{},function(d){
                 eventdata = d;
-                var arr = {
+                var arr = [{
+                    "eventDesc":eventdata[0]['category'][0]['event_desc'],
+                    "eventName":eventdata[0]['category'][0]['event_name'],
+                    "filts":[],
+                    "relation":"and",
+                    "relationUser":"and",
+                    "renameindicator":""
+                },{
                     "eventDesc":eventdata[0]['category'][0]['event_desc'],
                     "eventName":eventdata[0]['category'][0]['event_name'],
                     "filts":[],
@@ -58,8 +65,8 @@
                     "relationUser":"and",
                     "renameindicator":""
                 }
-                data['events'].push(arr);
-                data['events'].push(arr);
+                ]
+                data['events'] = arr;
                 X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
                     groupitemeventsdata[0] = val;
                     groupitemeventsdata[1] = val;
@@ -196,16 +203,18 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
+                var dataevent= data['events'][index];
+                // console.log(dataevent);
                 X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.id);
-                    data['events'][index]['eventName'] = val.name;
-                    data['events'][index]['eventDesc'] = val.id;
+                    dataevent['eventName'] = val.name;
+                    dataevent['eventDesc'] = val.id;
+
                     X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
-                        console.log(val);
                         groupitemeventsdata[index] = val;
                     })
-                    console.log(groupitemeventsdata)
+                    // console.log(data['events']);
 
                 })
             })