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

1

Browse Source
This commit is contained in:
罗松柏 2021-09-14 19:21:51 +08:00
parent 5ef96c7a93
commit 3befdd1ebe
6 changed files with 89 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pages/dashboard.html
View File

@ -616,7 +616,7 @@
<div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新"> <div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新">
<img src="./static/img/gengxin.png" /> <img src="./static/img/gengxin.png" />
</div> </div>
<div class="tishi tishi-tjsx" data-id="{{d.report_id}}" title="条件筛选"> <div class="tishi tishi-tjsx" 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}}" title="条件筛选">
<img src="./static/img/guolv.png" /> <img src="./static/img/guolv.png" />
</div> </div>
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}" > <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}" >
@ -657,7 +657,7 @@
<div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新"> <div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新">
<img src="./static/img/gengxin.png" /> <img src="./static/img/gengxin.png" />
</div> </div>
<div class="tishi tishi-tjsx" data-id="{{d.report_id}}" title="条件筛选"> <div class="tishi tishi-tjsx" 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}}" title="条件筛选">
<img src="./static/img/guolv.png" /> <img src="./static/img/guolv.png" />
</div> </div>
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}"> <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
@ -694,7 +694,7 @@
<div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新"> <div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新">
<img src="./static/img/gengxin.png" /> <img src="./static/img/gengxin.png" />
</div> </div>
<div class="tishi tishi-tjsx" data-id="{{d.report_id}}" title="条件筛选"> <div class="tishi tishi-tjsx" 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}}" title="条件筛选">
<img src="./static/img/guolv.png" /> <img src="./static/img/guolv.png" />
</div> </div>
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}"> <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">

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

@ -116,9 +116,9 @@ var X = window.X || {
(function(){ (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/"; // var ipurl = "http://139.159.159.3:7889/api/v1/";
@ -4081,7 +4081,12 @@ var X = window.X || {
// 单个表格筛选 // 单个表格筛选
$(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){ $(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){
var id = $(this).attr('data-id'); var obj = $(this);
var id = obj.attr('data-id');
var cat = obj.attr('data-cat');
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var name = obj.attr('data-name');
X.open({ X.open({
type: 1, type: 1,
title: false, title: false,
@ -4090,7 +4095,33 @@ var X = window.X || {
shadeClose: false, shadeClose: false,
offset: [120,270], offset: [120,270],
url: "screen", url: "screen",
extData : id extData : id,
callback : function(d){
var dataArr = {
report_id : id,
ext_filter : d
}
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
if(vals == null){
layer.msg('查无数据');
return;
}
var bbsetdata = {
graph_size:modelsize,
graph_type:modeltype,
model:cat,
name:name,
report_id:id
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
//渲染模板和数据
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
});
})
}
}) })
}); });
@ -4571,6 +4602,8 @@ var X = window.X || {
//总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充 //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
fillmodeldata:function(d,id,type){ fillmodeldata:function(d,id,type){
X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){ X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
console.log(d);
console.log(id);
if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){ if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){
$('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>'); $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
@ -4606,13 +4639,16 @@ var X = window.X || {
modeldata:function(d,val,type){ modeldata:function(d,val,type){
var eventdata = []; var eventdata = [];
var timeParticleSize = d['query']['eventView']['timeParticleSize']; if(d['query']){
var timeParticleSize = d['query']['eventView']['timeParticleSize'];
var granularity = '' var granularity = ''
if(timeParticleSize){ if(timeParticleSize){
X.granularity(timeParticleSize,function(d){ X.granularity(timeParticleSize,function(d){
granularity = d; granularity = d;
}); });
} }
}
if(d['model'] == "event"){ if(d['model'] == "event"){
// 事件分析 // 事件分析
@ -10231,8 +10267,8 @@ var X = window.X || {
// 计算按钮 // 计算按钮
$(document).off('click','.screen-right-box .jisuan').on('click','.screen-right-box .jisuan',function(){ $(document).off('click','.screen-right-box .jisuan').on('click','.screen-right-box .jisuan',function(){
console.log(data); console.log(data);
console.log(reportid); // 刷新看板里的数据暂时没有
// 刷新看板里的数据暂时没有 me.callback && me.callback(data);
}); });
} }
@ -10805,7 +10841,6 @@ var X = window.X || {
}, },
useradmin : function(id){ useradmin : function(id){
X.tabledata('#userdata','project/members',[[ X.tabledata('#userdata','project/members',[[
{field:'name', width:180, title: '成员账号', sort: true} {field:'name', width:180, title: '成员账号', sort: true}
,{field:'nickname', width:180, title: '成员显示名'} ,{field:'nickname', width:180, title: '成员显示名'}

4
web/srczip/common.js
View File

@ -115,9 +115,9 @@ var X = window.X || {
(function(){ (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/"; // var ipurl = "http://139.159.159.3:7889/api/v1/";

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

@ -143,7 +143,12 @@
// 单个表格筛选 // 单个表格筛选
$(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){ $(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){
var id = $(this).attr('data-id'); var obj = $(this);
var id = obj.attr('data-id');
var cat = obj.attr('data-cat');
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var name = obj.attr('data-name');
X.open({ X.open({
type: 1, type: 1,
title: false, title: false,
@ -152,7 +157,33 @@
shadeClose: false, shadeClose: false,
offset: [120,270], offset: [120,270],
url: "screen", url: "screen",
extData : id extData : id,
callback : function(d){
var dataArr = {
report_id : id,
ext_filter : d
}
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
if(vals == null){
layer.msg('查无数据');
return;
}
var bbsetdata = {
graph_size:modelsize,
graph_type:modeltype,
model:cat,
name:name,
report_id:id
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
//渲染模板和数据
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
});
})
}
}) })
}); });
@ -633,6 +664,8 @@
//总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充 //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
fillmodeldata:function(d,id,type){ fillmodeldata:function(d,id,type){
X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){ X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
console.log(d);
console.log(id);
if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){ if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){
$('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>'); $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
@ -668,13 +701,16 @@
modeldata:function(d,val,type){ modeldata:function(d,val,type){
var eventdata = []; var eventdata = [];
var timeParticleSize = d['query']['eventView']['timeParticleSize']; if(d['query']){
var timeParticleSize = d['query']['eventView']['timeParticleSize'];
var granularity = '' var granularity = ''
if(timeParticleSize){ if(timeParticleSize){
X.granularity(timeParticleSize,function(d){ X.granularity(timeParticleSize,function(d){
granularity = d; granularity = d;
}); });
} }
}
if(d['model'] == "event"){ if(d['model'] == "event"){
// 事件分析 // 事件分析

4
web/srczip/logic/screen.js
View File

@ -132,8 +132,8 @@
// 计算按钮 // 计算按钮
$(document).off('click','.screen-right-box .jisuan').on('click','.screen-right-box .jisuan',function(){ $(document).off('click','.screen-right-box .jisuan').on('click','.screen-right-box .jisuan',function(){
console.log(data); console.log(data);
console.log(reportid); // 刷新看板里的数据暂时没有
// 刷新看板里的数据暂时没有 me.callback && me.callback(data);
}); });
} }

1
web/srczip/logic/useradmin.js
View File

@ -119,7 +119,6 @@
}, },
useradmin : function(id){ useradmin : function(id){
X.tabledata('#userdata','project/members',[[ X.tabledata('#userdata','project/members',[[
{field:'name', width:180, title: '成员账号', sort: true} {field:'name', width:180, title: '成员账号', sort: true}
,{field:'nickname', width:180, title: '成员显示名'} ,{field:'nickname', width:180, title: '成员显示名'}