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

1

Browse Source
This commit is contained in:
罗松柏 2021-11-01 11:44:12 +08:00
parent 5c5ae25924
commit d09dfe3df9
8 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/pages/analysis.html
View File

@ -252,7 +252,7 @@
<div class="analysis-con-left-screen-list-left">
<div class="analysis-num">{{index}}</div>
<div class="analysis-zhibiao-list">
<div class="ant-dropdown-trigger analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}"> {{item.event_desc}} </div>
<div class="ant-dropdown-trigger analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}"> {{item.event_desc}}</div>
<span style="margin-left: 6px;">的</span>
<div id="analysis-zhibiao-list-type2-{{index}}" class="analysis-zhibiao-list-type2 analysis-background" data-index="{{index}}">{{item.event_attr}}</div>
{{# if(item.event_attr_id != "*"){ }}
@ -370,6 +370,13 @@
<div class="analysis-zhibiao" data-index="{{index}}" title="切换为指标选择"></div>
<div class="analysis-jia1" data-index="{{index}}" title="添加指标"></div>
<div class="analysis-fuzhi" title="复制指标" data-index="{{index}}"></div>
{{# if(item.is_show){ }}
<div class="analysis-isshow analysis-isshow-click" title="显示" data-type="true" data-index="{{index}}"></div>
{{# } else { }}
<div class="analysis-ishide analysis-isshow-click" title="隐藏" data-type="false" data-index="{{index}}"></div>
{{# } }}
<div class="analysis-del" data-index="{{index}}" title="删除指标"></div>
</div>
</div>

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

@ -800,7 +800,9 @@ var X = window.X || {
X.eventchart = function(data,callback){
var legenddata=[];
var legendnamearr = [];
for(let i in data){
legendnamearr.push(data[i]['event_name'])
for(let z in data[i]['groups']){
var pj = data[i]['event_name']+data[i]['groups'][z];
legenddata.push(pj);
@ -866,11 +868,12 @@ var X = window.X || {
chain_ratiotype = '-'
}
}
console.log(legendnamearr);
var dataArr = {
xAxisData:data[0]['date_range'],
legenddata:legenddata,
seriesData:seriesData,
legendnamearr:legendnamearr,
selected:selected,
date:date,
sum:sum,
@ -3437,7 +3440,8 @@ var X = window.X || {
"customEvent":'',
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
"formatname":'两位小数',
"is_show" : true
}
data.events.push(defaultindicator);
updataindex(data.events);
@ -3559,6 +3563,15 @@ var X = window.X || {
})
});
// 显示隐藏
$(document).off("click",".analysis-isshow-click").on("click",".analysis-isshow-click",function(){
var index = $(this).attr("data-index");
var type = $(this).attr("data-type");
var isshow = (type == "true") ? false : true;
data['events'][index]['is_show'] = isshow;
updataindex(data.events);
});
// 切换为指标公式或组合
$(document).off('click','.analysis-gongshi').on('click','.analysis-gongshi',function(){
var index = $(this).attr("data-index");
@ -3617,9 +3630,6 @@ var X = window.X || {
obj.html(htmlstring);
data['events'][index]['event_desc'] = val.id;
data['events'][index]['event_name'] = val.name;
})
});
//设置一级事件中第二个参数
@ -3799,7 +3809,8 @@ var X = window.X || {
"customEvent":'',
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
"formatname":'两位小数',
"is_show": true
}
data['events'].push(defaultindicator);
@ -6535,9 +6546,9 @@ var X = window.X || {
}
},
color: X.DATA.echartscolor,
// legend: {
// data: legendData
// },
legend: {
// data: eventdata['legendnamearr'],
},
grid: {
left: '2%',
right: '2%',

5
web/srczip/common.js
View File

@ -799,7 +799,9 @@ var X = window.X || {
X.eventchart = function(data,callback){
var legenddata=[];
var legendnamearr = [];
for(let i in data){
legendnamearr.push(data[i]['event_name'])
for(let z in data[i]['groups']){
var pj = data[i]['event_name']+data[i]['groups'][z];
legenddata.push(pj);
@ -865,11 +867,12 @@ var X = window.X || {
chain_ratiotype = '-'
}
}
console.log(legendnamearr);
var dataArr = {
xAxisData:data[0]['date_range'],
legenddata:legenddata,
seriesData:seriesData,
legendnamearr:legendnamearr,
selected:selected,
date:date,
sum:sum,

18
web/srczip/logic/analysis.js
View File

@ -80,7 +80,8 @@
"customEvent":'',
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
"formatname":'两位小数',
"is_show" : true
}
data.events.push(defaultindicator);
updataindex(data.events);
@ -202,6 +203,15 @@
})
});
// 显示隐藏
$(document).off("click",".analysis-isshow-click").on("click",".analysis-isshow-click",function(){
var index = $(this).attr("data-index");
var type = $(this).attr("data-type");
var isshow = (type == "true") ? false : true;
data['events'][index]['is_show'] = isshow;
updataindex(data.events);
});
// 切换为指标公式或组合
$(document).off('click','.analysis-gongshi').on('click','.analysis-gongshi',function(){
var index = $(this).attr("data-index");
@ -260,9 +270,6 @@
obj.html(htmlstring);
data['events'][index]['event_desc'] = val.id;
data['events'][index]['event_name'] = val.name;
})
});
//设置一级事件中第二个参数
@ -442,7 +449,8 @@
"customEvent":'',
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
"formatname":'两位小数',
"is_show": true
}
data['events'].push(defaultindicator);

6
web/srczip/logic/dashboard.js
View File

@ -1144,9 +1144,9 @@
}
},
color: X.DATA.echartscolor,
// legend: {
// data: legendData
// },
legend: {
// data: eventdata['legendnamearr'],
},
grid: {
left: '2%',
right: '2%',

4
web/static/css/analysis.css
View File

@ -82,7 +82,7 @@
.analysis-con-left-screen-list-right-box { display: none; }
.analysis-con-left-screen-list-right { margin-right: 8px; display: flex; justify-content: space-between; align-items: center; }
.analysis-con-left-screen-list-right div { width: 24px; height: 24px; border-radius: 2px; margin-left: 8px; cursor: pointer;}
.analysis-con-left-screen-list-right div { width: 24px; height: 24px; border-radius: 2px; margin-left: 8px; cursor: pointer; background-position: 4px 4px !important;}
.analysis-con-left-screen-list-right div:hover { background-color: #f0f2f5; }
.analysis-chongmingming { background: url("../img/chongmingming.png") no-repeat; }
.analysis-chongmingming-del { background: url("../img/cha1.png") no-repeat; display: none;}
@ -93,6 +93,8 @@
.analysis-fuzhi { background: url("../img/fuzhi.png") no-repeat; }
.analysis-del { background: url("../img/del.png") no-repeat;}
.analysis-zuhe { background: url("../img/zuhe.png") no-repeat !important; }
.analysis-isshow { background: url("../img/isshow.png") no-repeat ; }
.analysis-ishide { background: url("../img/ishide.png") no-repeat ; }
.analysis-con-left-screen-list-left-zhibiaoname { display: none; color: #42546d; height: 24px; margin-left: 32px; padding-bottom: 8px; font-weight: 500; font-size: 13px; line-height: 24px; border: 0px ; }
.analysis-con-left-screen-list-left-zhibiaoname input { color: #42546d; border: 0; background-color: rgba(0, 0, 0, 0); }
.analysis-con-left-screen-list-left-zhibiaoname2 { border-bottom: 1px solid #f0f0f0; display: block; color: #42546d; height: 24px; margin-left: 7px; padding-bottom: 8px; font-weight: 500; font-size: 13px; line-height: 24px; border: 0px ; }

BIN
web/static/img/ishide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 452 B

BIN
web/static/img/isshow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 477 B