+
diff --git a/web/src/x.min.js b/web/src/x.min.js
index a2769c7..ea0be9a 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -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/";
@@ -4081,7 +4081,12 @@ var X = window.X || {
// 单个表格筛选
$(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({
type: 1,
title: false,
@@ -4090,7 +4095,33 @@ var X = window.X || {
shadeClose: false,
offset: [120,270],
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){
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) == "[]"){
$('#model-two-'+d['report_id']).html('查无数据');
@@ -4606,13 +4639,16 @@ var X = window.X || {
modeldata:function(d,val,type){
var eventdata = [];
- var timeParticleSize = d['query']['eventView']['timeParticleSize'];
+ if(d['query']){
+ var timeParticleSize = d['query']['eventView']['timeParticleSize'];
var granularity = ''
if(timeParticleSize){
X.granularity(timeParticleSize,function(d){
granularity = d;
});
}
+ }
+
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(){
console.log(data);
- console.log(reportid);
- // 刷新看板里的数据暂时没有
+ // 刷新看板里的数据暂时没有
+ me.callback && me.callback(data);
});
}
@@ -10805,7 +10841,6 @@ var X = window.X || {
},
useradmin : function(id){
-
X.tabledata('#userdata','project/members',[[
{field:'name', width:180, title: '成员账号', sort: true}
,{field:'nickname', width:180, title: '成员显示名'}
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 151a71d..9a980ab 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -115,9 +115,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/";
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 3b403a0..a95d8f5 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -143,7 +143,12 @@
// 单个表格筛选
$(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({
type: 1,
title: false,
@@ -152,7 +157,33 @@
shadeClose: false,
offset: [120,270],
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){
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) == "[]"){
$('#model-two-'+d['report_id']).html('查无数据');
@@ -668,13 +701,16 @@
modeldata:function(d,val,type){
var eventdata = [];
- var timeParticleSize = d['query']['eventView']['timeParticleSize'];
+ if(d['query']){
+ var timeParticleSize = d['query']['eventView']['timeParticleSize'];
var granularity = ''
if(timeParticleSize){
X.granularity(timeParticleSize,function(d){
granularity = d;
});
}
+ }
+
if(d['model'] == "event"){
// 事件分析
diff --git a/web/srczip/logic/screen.js b/web/srczip/logic/screen.js
index 7f63a7a..8fa9e09 100644
--- a/web/srczip/logic/screen.js
+++ b/web/srczip/logic/screen.js
@@ -132,8 +132,8 @@
// 计算按钮
$(document).off('click','.screen-right-box .jisuan').on('click','.screen-right-box .jisuan',function(){
console.log(data);
- console.log(reportid);
- // 刷新看板里的数据暂时没有
+ // 刷新看板里的数据暂时没有
+ me.callback && me.callback(data);
});
}
diff --git a/web/srczip/logic/useradmin.js b/web/srczip/logic/useradmin.js
index a3833c0..ad9f647 100644
--- a/web/srczip/logic/useradmin.js
+++ b/web/srczip/logic/useradmin.js
@@ -119,7 +119,6 @@
},
useradmin : function(id){
-
X.tabledata('#userdata','project/members',[[
{field:'name', width:180, title: '成员账号', sort: true}
,{field:'nickname', width:180, title: '成员显示名'}
