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

1

Browse Source
This commit is contained in:
罗松柏 2021-09-30 09:58:00 +08:00
parent b85a920464
commit d3499c9f85
9 changed files with 110 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pages/dashboard.html
View File

@ -622,7 +622,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}" >
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}" data-avesumdata="{{d.avesumdata}}" data-daydata="{{d.daydata}}">
<img src="./static/img/gengduo.png" />
</div>
</div>
@ -663,7 +663,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}" data-avesumdata="{{d.avesumdata}}" data-daydata="{{d.daydata}}">
<img src="./static/img/gengduo.png" />
</div>
</div>
@ -700,7 +700,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}" data-avesumdata="{{d.avesumdata}}" data-daydata="{{d.daydata}}" >
<img src="./static/img/gengduo.png" />
</div>
</div>

28
web/pages/setupbaobiao.html
View File

@ -112,6 +112,34 @@
</div>
</div>
<div class="setupbaobiao-left-from-list-box">
<span class="setupbaobiao-left-from-list-title">当天数据展示</span>
<div class="setupbaobiao-left-from-list-radio">
<div class="setupbaobiao-left-from-list-radio-box">
<div>
<input type="radio" name="daydata" value="true" id="daydatatrue">开启
</div>
<div style="margin-left: 20px;">
<input type="radio" name="daydata" value="false" id="daydatafalse">关闭
</div>
</div>
</div>
</div>
<div class="setupbaobiao-left-from-list-box">
<span class="setupbaobiao-left-from-list-title">平均总和展示</span>
<div class="setupbaobiao-left-from-list-radio">
<div class="setupbaobiao-left-from-list-radio-box">
<div>
<input type="radio" name="avesumdata" value="true" id="avesumdatatrue">开启
</div>
<div style="margin-left: 20px;">
<input type="radio" name="avesumdata" value="false" id="avesumdatafalse">关闭
</div>
</div>
</div>
</div>
<div class="setupbaobiao-left-from-list-box">
<span class="setupbaobiao-left-from-list-title">视窗大小</span>
<div class="setupbaobiao-left-from-list-radio">

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

@ -116,9 +116,9 @@ var X = window.X || {
(function(){
//本地
// var ipurl = "http://10.0.0.77:7889/api/v1/";
var ipurl = "http://10.0.0.77:7889/api/v1/";
// 线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
// var ipurl = "http://139.159.159.3:9865/api/v1/";
//线上测试
// var ipurl = "http://139.159.159.3:7889/api/v1/";
@ -4553,7 +4553,6 @@ var X = window.X || {
// }
// })
X.api("report/read_report",'post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
console.log(q);
var query = {
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
@ -4720,6 +4719,8 @@ var X = window.X || {
var name = obj.attr('data-name');
var modelswitch = obj.attr("data-modelswitch");
var ascending = obj.attr("data-ascending");
var avesumdata = obj.attr("data-avesumdata");
var daydata = obj.attr("data-daydata");
X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
if(d.id == 'shezhi'){
var data = {
@ -4727,7 +4728,9 @@ var X = window.X || {
modelsize : modelsize,
modeltype : modeltype,
modelswitch: modelswitch,
ascending:ascending
ascending:ascending,
daydata:daydata,
avesumdata:avesumdata
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@ -4770,7 +4773,7 @@ var X = window.X || {
}
}
}
console.log(d.spaces[i]['children'][0]['_id']);
// console.log(d.spaces[i]['children'][0]['_id']);
setHashParms("menu",d.spaces[i]['children'][0]['_id']);
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
@ -4881,7 +4884,6 @@ var X = window.X || {
}
}
if(d['model'] == "event"){
// 事件分析
if(d['graph_size'] == 'small'){
@ -4952,6 +4954,8 @@ var X = window.X || {
data['id'] = d['report_id'];
data['modelsize'] = d['graph_size'];
data['cat'] = d['model'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
@ -5002,6 +5006,8 @@ var X = window.X || {
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -5039,6 +5045,8 @@ var X = window.X || {
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -5072,6 +5080,8 @@ var X = window.X || {
data['cat'] = d['model'];
data['date'] = "";
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -5103,6 +5113,8 @@ var X = window.X || {
data['modelsize'] = d['graph_size'];
data['cat'] = d['model'];
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -5187,7 +5199,6 @@ var X = window.X || {
// query['eventView']['timeParticleSize'] = timeParticleSize;
X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){
if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){
console.log(q);
var bbsetdata = {
graph_size:oclickarr['modelsize'],
graph_type:oclickarr['modeltype'],
@ -11554,6 +11565,18 @@ var X = window.X || {
}else {
$("#gbreverseorder").prop("checked",true);
}
if(data.daydata && data.daydata != undefined && data.daydata == "false"){
$('#daydatafalse').prop('checked',true);
}else {
$('#daydatatrue').prop('checked',true);
}
if(data.avesumdata && data.avesumdata != undefined && data.avesumdata == "false"){
$('#avesumdatafalse').prop('checked',true);
}else {
$('#avesumdatatrue').prop('checked',true);
}
X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select");
});
@ -11596,8 +11619,12 @@ var X = window.X || {
var modelsize = $('input:radio[name="modelsize"]:checked').val();
var modelswitch = $('input:radio[name="xyswitch"]:checked').val();
var ascending = $('input:radio[name="reverseorder"]:checked').val();
var avesumdata = $('input:radio[name="avesumdata"]:checked').val();
var daydata = $('input:radio[name="daydata"]:checked').val();
if(modelswitch == "true"){ modelswitch = true;}else {modelswitch = false;};
if(ascending == 'true'){ ascending = true }else { ascending = false };
if(avesumdata == "true"){ avesumdata = true;}else {avesumdata = false;};
if(daydata == 'true'){ daydata = true }else { daydata = false };
var arr = {
_id:X.DATA.dashboard_id,
report:{
@ -11608,7 +11635,9 @@ var X = window.X || {
graph_type:modeltype,
graph_size:modelsize,
modelswitch: modelswitch,
ascending:ascending
ascending:ascending,
avesumdata:avesumdata,
daydata:daydata
}
}
console.log(arr);

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

@ -407,7 +407,6 @@
// }
// })
X.api("report/read_report",'post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
console.log(q);
var query = {
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
@ -574,6 +573,8 @@
var name = obj.attr('data-name');
var modelswitch = obj.attr("data-modelswitch");
var ascending = obj.attr("data-ascending");
var avesumdata = obj.attr("data-avesumdata");
var daydata = obj.attr("data-daydata");
X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
if(d.id == 'shezhi'){
var data = {
@ -581,7 +582,9 @@
modelsize : modelsize,
modeltype : modeltype,
modelswitch: modelswitch,
ascending:ascending
ascending:ascending,
daydata:daydata,
avesumdata:avesumdata
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@ -624,7 +627,7 @@
}
}
}
console.log(d.spaces[i]['children'][0]['_id']);
// console.log(d.spaces[i]['children'][0]['_id']);
setHashParms("menu",d.spaces[i]['children'][0]['_id']);
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
@ -735,7 +738,6 @@
}
}
if(d['model'] == "event"){
// 事件分析
if(d['graph_size'] == 'small'){
@ -806,6 +808,8 @@
data['id'] = d['report_id'];
data['modelsize'] = d['graph_size'];
data['cat'] = d['model'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
@ -856,6 +860,8 @@
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -893,6 +899,8 @@
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -926,6 +934,8 @@
data['cat'] = d['model'];
data['date'] = "";
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -957,6 +967,8 @@
data['modelsize'] = d['graph_size'];
data['cat'] = d['model'];
data['desc'] = d['desc'];
data['avesumdata']=d['avesumdata'];
data['daydata'] = d['daydata'];
eventdata.push(data);
})
}
@ -1041,7 +1053,6 @@
// query['eventView']['timeParticleSize'] = timeParticleSize;
X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){
if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){
console.log(q);
var bbsetdata = {
graph_size:oclickarr['modelsize'],
graph_type:oclickarr['modeltype'],

20
web/srczip/logic/setupbaobiao.js
View File

@ -47,6 +47,18 @@
}else {
$("#gbreverseorder").prop("checked",true);
}
if(data.daydata && data.daydata != undefined && data.daydata == "false"){
$('#daydatafalse').prop('checked',true);
}else {
$('#daydatatrue').prop('checked',true);
}
if(data.avesumdata && data.avesumdata != undefined && data.avesumdata == "false"){
$('#avesumdatafalse').prop('checked',true);
}else {
$('#avesumdatatrue').prop('checked',true);
}
X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select");
});
@ -89,8 +101,12 @@
var modelsize = $('input:radio[name="modelsize"]:checked').val();
var modelswitch = $('input:radio[name="xyswitch"]:checked').val();
var ascending = $('input:radio[name="reverseorder"]:checked').val();
var avesumdata = $('input:radio[name="avesumdata"]:checked').val();
var daydata = $('input:radio[name="daydata"]:checked').val();
if(modelswitch == "true"){ modelswitch = true;}else {modelswitch = false;};
if(ascending == 'true'){ ascending = true }else { ascending = false };
if(avesumdata == "true"){ avesumdata = true;}else {avesumdata = false;};
if(daydata == 'true'){ daydata = true }else { daydata = false };
var arr = {
_id:X.DATA.dashboard_id,
report:{
@ -101,7 +117,9 @@
graph_type:modeltype,
graph_size:modelsize,
modelswitch: modelswitch,
ascending:ascending
ascending:ascending,
avesumdata:avesumdata,
daydata:daydata
}
}
console.log(arr);

1
web/static/css/daterangepicker.css
View File

@ -220,6 +220,7 @@
.daterangepicker td.end-date {
border-radius: 0 4px 4px 0;
background-color: #ffa756 !important;
}
.daterangepicker td.start-date.end-date {

5
web/static/css/style.css
View File

@ -163,9 +163,10 @@
.thesum-box { font-size: 12px; color: #202d3f; }
.thesum-box span { font-size: 20px; color: #202d3f; margin-left: 8px; margin-right: 4px; }
.thesum { margin-right: 24px; }
.echarts-box { padding: 0 24px; margin-top: 10px; height: 204px; }
.echarts-box { padding: 0 24px; margin-top: 10px; }
.layui-card:last-child { padding-bottom: 12px; }
.echarts { width: 100%; height: 250px; }
.echarts2 { width: 100%; height: 296px; }
.control { height: 21px; display: block; }
.tool-show .control { display: block; }
@ -601,7 +602,7 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
.setupbaobiao-left-from-list-radio { display: inline-block; width: 100%; line-height: 32px; }
.setupbaobiao-left-from-list-radio-box { display: flex; color: #42546d; }
.setupbaobiao-left-from-list-radio-box input { position: relative; top: 2px; margin-right: 5px; }
.setupbaobiao-zs { color: #42546d; font-size: 12px; line-height: 20px; margin-bottom: 10px; padding: 0 10px 0 20px; }
.setupbaobiao-zs { color: #42546d; font-size: 12px; line-height: 20px; margin-bottom: 3px; padding: 0 10px 0 20px; }
.fixed-table-box{/*当表格的宽度大于.fixed-table-box的宽度时才会有横向滚动条*//* width: 800px;margin: 50px auto; */}
.test-fixedTable{margin: 0 auto;background-color: #ccc;}