leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

111

Browse Source
This commit is contained in:
罗松柏 2021-06-11 17:29:59 +08:00
parent d549f46379
commit 10e2551c7c
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pages/event.html
View File

@ -9,7 +9,7 @@
</div> </div>
<div class="analysis-con-left-screen-list-left" style="margin-left: 24px;"> <div class="analysis-con-left-screen-list-left" style="margin-left: 24px;">
<div class="analysis-zhibiao-list"> <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>
</div> </div>
{{# if(d.filts.length > 0){ }} {{# if(d.filts.length > 0){ }}

23
web/src/x.min.js vendored
View File

@ -3944,7 +3944,14 @@ var X = window.X || {
X.api("data_auth/my_event","get",{},function(d){ X.api("data_auth/my_event","get",{},function(d){
eventdata = 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'], "eventDesc":eventdata[0]['category'][0]['event_desc'],
"eventName":eventdata[0]['category'][0]['event_name'], "eventName":eventdata[0]['category'][0]['event_name'],
"filts":[], "filts":[],
@ -3952,8 +3959,8 @@ var X = window.X || {
"relationUser":"and", "relationUser":"and",
"renameindicator":"" "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){ X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
groupitemeventsdata[0] = val; groupitemeventsdata[0] = val;
groupitemeventsdata[1] = val; groupitemeventsdata[1] = val;
@ -4090,16 +4097,18 @@ var X = window.X || {
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); 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){ X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
console.log(val); console.log(val);
obj.html(val.id); obj.html(val.id);
data['events'][index]['eventName'] = val.name; dataevent['eventName'] = val.name;
data['events'][index]['eventDesc'] = val.id; dataevent['eventDesc'] = val.id;
X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){ X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
console.log(val);
groupitemeventsdata[index] = val; groupitemeventsdata[index] = val;
}) })
console.log(groupitemeventsdata) // console.log(data['events']);
}) })
}) })

23
web/srczip/logic/retained.js
View File

@ -50,7 +50,14 @@
X.api("data_auth/my_event","get",{},function(d){ X.api("data_auth/my_event","get",{},function(d){
eventdata = 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'], "eventDesc":eventdata[0]['category'][0]['event_desc'],
"eventName":eventdata[0]['category'][0]['event_name'], "eventName":eventdata[0]['category'][0]['event_name'],
"filts":[], "filts":[],
@ -58,8 +65,8 @@
"relationUser":"and", "relationUser":"and",
"renameindicator":"" "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){ X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
groupitemeventsdata[0] = val; groupitemeventsdata[0] = val;
groupitemeventsdata[1] = val; groupitemeventsdata[1] = val;
@ -196,16 +203,18 @@
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); 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){ X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
console.log(val); console.log(val);
obj.html(val.id); obj.html(val.id);
data['events'][index]['eventName'] = val.name; dataevent['eventName'] = val.name;
data['events'][index]['eventDesc'] = val.id; dataevent['eventDesc'] = val.id;
X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){ X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
console.log(val);
groupitemeventsdata[index] = val; groupitemeventsdata[index] = val;
}) })
console.log(groupitemeventsdata) // console.log(data['events']);
}) })
}) })