1
This commit is contained in:
parent
bb36959485
commit
d78ad8598f
90
web/src/x.min.js
vendored
90
web/src/x.min.js
vendored
@ -192,10 +192,61 @@ var X = window.X || {
|
||||
}
|
||||
});
|
||||
};
|
||||
// 看板单独调用api方法,去除loading效果
|
||||
X.modelapi = function(url,type,parms,callback){
|
||||
var loginCache = X.loginCache();
|
||||
var token = (loginCache? loginCache.token:"");
|
||||
token = "Bearer "+token;
|
||||
var contentType;
|
||||
if(url.indexOf("login") != -1){
|
||||
var data = parms;
|
||||
var url = ipurl+url;
|
||||
}else {
|
||||
var data = {};
|
||||
contentType = 'application/json';
|
||||
if(parms != 1){
|
||||
var data = JSON.stringify(parms);
|
||||
}
|
||||
if(url == 'data_mana/list'){
|
||||
var url = ipurl+url+"?game="+ X.DATA.game+"&"+parms || "";
|
||||
}else {
|
||||
var url = ipurl+url+"?game="+ X.DATA.game || "";
|
||||
}
|
||||
}
|
||||
$.ajax({
|
||||
headers: {
|
||||
Authorization:token//此处放置请求到的用户token
|
||||
},
|
||||
url: url,
|
||||
type:type,
|
||||
data:data,
|
||||
async:true,
|
||||
contentType: contentType,
|
||||
beforeSend: function () {
|
||||
|
||||
},
|
||||
success:function(d){
|
||||
if(d.code == 0){
|
||||
if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
|
||||
callback && callback(d.data);
|
||||
}else {
|
||||
// layer.msg('查无数据');
|
||||
callback && callback(d.data);
|
||||
}
|
||||
}else {
|
||||
layer.msg(d.msg);
|
||||
}
|
||||
|
||||
},
|
||||
error:function(error){
|
||||
layer.msg('条件错误');
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
//下载报表
|
||||
X.download=function(url, params,name){
|
||||
console.log(url);
|
||||
// console.log(url);
|
||||
postDownload(url, params,name);
|
||||
};
|
||||
|
||||
@ -4261,7 +4312,7 @@ var X = window.X || {
|
||||
X.granularityid(timeParticleSizename,function(d){
|
||||
timeParticleSize = d;
|
||||
query['eventView']['timeParticleSize'] = timeParticleSize;
|
||||
X.api("ck/"+ cat +"_model","post",query,function(val){
|
||||
X.modelapi("ck/"+ cat +"_model","post",query,function(val){
|
||||
if(JSON.stringify(val) != "{}"){
|
||||
var bbsetdata = {
|
||||
graph_size:modelsize,
|
||||
@ -4318,7 +4369,7 @@ var X = window.X || {
|
||||
query['eventView']['startTime'] = timearr[0] + ' 00:00:00';
|
||||
query['eventView']['endTime'] = timearr[2] + ' 23:59:59';
|
||||
// console.log(query);
|
||||
X.api("ck/"+ cat +"_model","post",query,function(vals){
|
||||
X.modelapi("ck/"+ cat +"_model","post",query,function(vals){
|
||||
var bbsetdata = {
|
||||
graph_size:modelsize,
|
||||
graph_type:modeltype,
|
||||
@ -4493,9 +4544,9 @@ var X = window.X || {
|
||||
//填充看板数据
|
||||
//总体逻辑是:根据获取到的看板内容去先渲染放置的框,在根据不同分析模型处理对应的数据进行填充
|
||||
fillmodeldata:function(d,id,type){
|
||||
X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
|
||||
// console.log(val);
|
||||
if(val == null ){
|
||||
X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
|
||||
|
||||
if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){
|
||||
$('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
|
||||
}else {
|
||||
var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
|
||||
@ -4878,7 +4929,7 @@ var X = window.X || {
|
||||
//获取表格数据
|
||||
//先渲染外框大小位置和标题
|
||||
gettabledata:function(){
|
||||
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
X.modelapi('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
X['DATA']['kanbanlist'] = d;
|
||||
var modellist=[];
|
||||
for(let i in d){
|
||||
@ -8057,51 +8108,52 @@ var X = window.X || {
|
||||
(function(){
|
||||
X.pageLogic['personalsettings'] = {
|
||||
init : function(){
|
||||
|
||||
X.laytpldata("#personalsettings-bg-box-dot",X.DATA.userinfo,".personalsettings-bg-box");
|
||||
|
||||
var userinfostying = localStorage.getItem('loginData');
|
||||
var userinfo = JSON.parse(userinfostying);
|
||||
// console.log(userinfo);
|
||||
X.laytpldata("#personalsettings-bg-box-dot",userinfo,".personalsettings-bg-box");
|
||||
|
||||
$(document).off('click','.personalsettings-name').on('click','.personalsettings-name',function(){
|
||||
$(".personalsettings-mr-name").hide();
|
||||
$(".personalsettings-updata-name").show();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-name-qd').on('click','.personalsettings-name-qd',function(){
|
||||
$(".personalsettings-mr-name").show();
|
||||
$(".personalsettings-updata-name").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-name-qx').on('click','.personalsettings-name-qx',function(){
|
||||
var tit = $(".personalsettings-name-txt").val();
|
||||
X.api("user/edit_profile","post",{nickname: tit},function(d){
|
||||
console.log(d);
|
||||
// console.log(d);
|
||||
X.DATA.userinfo['nickname'] = d.nickname;
|
||||
X.laytpldata("#personalsettings-bg-box-dot",X.DATA.userinfo,".personalsettings-bg-box");
|
||||
})
|
||||
$(".personalsettings-mr-name").show();
|
||||
$(".personalsettings-updata-name").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-tel').on('click','.personalsettings-tel',function(){
|
||||
$(".personalsettings-mr-tel").hide();
|
||||
$(".personalsettings-binding-tel").show();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-tel-qd').on('click','.personalsettings-tel-qd',function(){
|
||||
$(".personalsettings-mr-tel").show();
|
||||
$(".personalsettings-binding-tel").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-tel-qx').on('click','.personalsettings-tel-qx',function(){
|
||||
var tit = $(".personalsettings-tel-txt").val();
|
||||
X.api("user/edit_profile","post",{tel: tit},function(d){
|
||||
console.log(d);
|
||||
// console.log(d);
|
||||
X.DATA.userinfo['tel'] = d.tel;
|
||||
X.laytpldata("#personalsettings-bg-box-dot",X.DATA.userinfo,".personalsettings-bg-box");
|
||||
})
|
||||
$(".personalsettings-mr-tel").show();
|
||||
$(".personalsettings-binding-tel").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-updata-password').on('click','.personalsettings-updata-password',function(){
|
||||
X.open({
|
||||
@ -8112,7 +8164,7 @@ var X = window.X || {
|
||||
skin: 'yourclass',
|
||||
url: 'updatapassword'
|
||||
})
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
@ -191,10 +191,61 @@ var X = window.X || {
|
||||
}
|
||||
});
|
||||
};
|
||||
// 看板单独调用api方法,去除loading效果
|
||||
X.modelapi = function(url,type,parms,callback){
|
||||
var loginCache = X.loginCache();
|
||||
var token = (loginCache? loginCache.token:"");
|
||||
token = "Bearer "+token;
|
||||
var contentType;
|
||||
if(url.indexOf("login") != -1){
|
||||
var data = parms;
|
||||
var url = ipurl+url;
|
||||
}else {
|
||||
var data = {};
|
||||
contentType = 'application/json';
|
||||
if(parms != 1){
|
||||
var data = JSON.stringify(parms);
|
||||
}
|
||||
if(url == 'data_mana/list'){
|
||||
var url = ipurl+url+"?game="+ X.DATA.game+"&"+parms || "";
|
||||
}else {
|
||||
var url = ipurl+url+"?game="+ X.DATA.game || "";
|
||||
}
|
||||
}
|
||||
$.ajax({
|
||||
headers: {
|
||||
Authorization:token//此处放置请求到的用户token
|
||||
},
|
||||
url: url,
|
||||
type:type,
|
||||
data:data,
|
||||
async:true,
|
||||
contentType: contentType,
|
||||
beforeSend: function () {
|
||||
|
||||
},
|
||||
success:function(d){
|
||||
if(d.code == 0){
|
||||
if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
|
||||
callback && callback(d.data);
|
||||
}else {
|
||||
// layer.msg('查无数据');
|
||||
callback && callback(d.data);
|
||||
}
|
||||
}else {
|
||||
layer.msg(d.msg);
|
||||
}
|
||||
|
||||
},
|
||||
error:function(error){
|
||||
layer.msg('条件错误');
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
//下载报表
|
||||
X.download=function(url, params,name){
|
||||
console.log(url);
|
||||
// console.log(url);
|
||||
postDownload(url, params,name);
|
||||
};
|
||||
|
||||
|
@ -367,7 +367,7 @@
|
||||
X.granularityid(timeParticleSizename,function(d){
|
||||
timeParticleSize = d;
|
||||
query['eventView']['timeParticleSize'] = timeParticleSize;
|
||||
X.api("ck/"+ cat +"_model","post",query,function(val){
|
||||
X.modelapi("ck/"+ cat +"_model","post",query,function(val){
|
||||
if(JSON.stringify(val) != "{}"){
|
||||
var bbsetdata = {
|
||||
graph_size:modelsize,
|
||||
@ -424,7 +424,7 @@
|
||||
query['eventView']['startTime'] = timearr[0] + ' 00:00:00';
|
||||
query['eventView']['endTime'] = timearr[2] + ' 23:59:59';
|
||||
// console.log(query);
|
||||
X.api("ck/"+ cat +"_model","post",query,function(vals){
|
||||
X.modelapi("ck/"+ cat +"_model","post",query,function(vals){
|
||||
var bbsetdata = {
|
||||
graph_size:modelsize,
|
||||
graph_type:modeltype,
|
||||
@ -599,9 +599,9 @@
|
||||
//填充看板数据
|
||||
//总体逻辑是:根据获取到的看板内容去先渲染放置的框,在根据不同分析模型处理对应的数据进行填充
|
||||
fillmodeldata:function(d,id,type){
|
||||
X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
|
||||
// console.log(val);
|
||||
if(val == null ){
|
||||
X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
|
||||
|
||||
if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){
|
||||
$('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
|
||||
}else {
|
||||
var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
|
||||
@ -984,7 +984,7 @@
|
||||
//获取表格数据
|
||||
//先渲染外框大小位置和标题
|
||||
gettabledata:function(){
|
||||
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
X.modelapi('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
X['DATA']['kanbanlist'] = d;
|
||||
var modellist=[];
|
||||
for(let i in d){
|
||||
|
@ -1,51 +1,52 @@
|
||||
(function(){
|
||||
X.pageLogic['personalsettings'] = {
|
||||
init : function(){
|
||||
|
||||
X.laytpldata("#personalsettings-bg-box-dot",X.DATA.userinfo,".personalsettings-bg-box");
|
||||
|
||||
var userinfostying = localStorage.getItem('loginData');
|
||||
var userinfo = JSON.parse(userinfostying);
|
||||
// console.log(userinfo);
|
||||
X.laytpldata("#personalsettings-bg-box-dot",userinfo,".personalsettings-bg-box");
|
||||
|
||||
$(document).off('click','.personalsettings-name').on('click','.personalsettings-name',function(){
|
||||
$(".personalsettings-mr-name").hide();
|
||||
$(".personalsettings-updata-name").show();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-name-qd').on('click','.personalsettings-name-qd',function(){
|
||||
$(".personalsettings-mr-name").show();
|
||||
$(".personalsettings-updata-name").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-name-qx').on('click','.personalsettings-name-qx',function(){
|
||||
var tit = $(".personalsettings-name-txt").val();
|
||||
X.api("user/edit_profile","post",{nickname: tit},function(d){
|
||||
console.log(d);
|
||||
// console.log(d);
|
||||
X.DATA.userinfo['nickname'] = d.nickname;
|
||||
X.laytpldata("#personalsettings-bg-box-dot",X.DATA.userinfo,".personalsettings-bg-box");
|
||||
})
|
||||
$(".personalsettings-mr-name").show();
|
||||
$(".personalsettings-updata-name").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-tel').on('click','.personalsettings-tel',function(){
|
||||
$(".personalsettings-mr-tel").hide();
|
||||
$(".personalsettings-binding-tel").show();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-tel-qd').on('click','.personalsettings-tel-qd',function(){
|
||||
$(".personalsettings-mr-tel").show();
|
||||
$(".personalsettings-binding-tel").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-tel-qx').on('click','.personalsettings-tel-qx',function(){
|
||||
var tit = $(".personalsettings-tel-txt").val();
|
||||
X.api("user/edit_profile","post",{tel: tit},function(d){
|
||||
console.log(d);
|
||||
// console.log(d);
|
||||
X.DATA.userinfo['tel'] = d.tel;
|
||||
X.laytpldata("#personalsettings-bg-box-dot",X.DATA.userinfo,".personalsettings-bg-box");
|
||||
})
|
||||
$(".personalsettings-mr-tel").show();
|
||||
$(".personalsettings-binding-tel").hide();
|
||||
})
|
||||
});
|
||||
|
||||
$(document).off('click','.personalsettings-updata-password').on('click','.personalsettings-updata-password',function(){
|
||||
X.open({
|
||||
@ -56,7 +57,7 @@
|
||||
skin: 'yourclass',
|
||||
url: 'updatapassword'
|
||||
})
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user