-
-
@@ -183,9 +90,6 @@
{{# }); }}
{{# } }}
-
-
-
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 9e8ed84..b68a9d8 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -121,7 +121,7 @@ var X = window.X || {
(function(){
//本地
- // var ipurl = "http://10.0.0.77:7889/api/v1/";
+ // var ipurl = "http://10.0.0.77:7899/api/v1/";
// 线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
//线上测试
@@ -277,7 +277,8 @@ var X = window.X || {
'Content-Type':'application/json',
},
}
-
+ console.log(url);
+ console.log(request);
const response = await fetch(url, request);
// const filename = response.headers.get('content-disposition').split('=')[1];
@@ -2245,7 +2246,7 @@ var X = window.X || {
"analysisname":'',
"analysis":'total_count',
"filts":[],//过滤项
- "condrelation":'and',
+ "relation":'and',
"customEvent":'',
"eventNameDisplay":'',//重命名指标
"format":'float',
@@ -2542,7 +2543,7 @@ var X = window.X || {
// 且和或切换
$(document).off('click','.analysis-con-left-screen-list-right-screen-qh-tit').on("click",".analysis-con-left-screen-list-right-screen-qh-tit",function(){
- var html = $(this).html(); //condrelation筛选条件的关系
+ var html = $(this).html(); //relation筛选条件的关系
var index = $(this).attr("data-index");
if(html == "且"){
$(this).html('或');
@@ -2583,7 +2584,7 @@ var X = window.X || {
"analysisname":'',
"analysis":'total_count',
"filts":[],//过滤项
- "condrelation":'and',
+ "relation":'and',
"customEvent":'',
"eventNameDisplay":'',//重命名指标
"format":'float',
@@ -2860,7 +2861,7 @@ var X = window.X || {
$(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){
- var html = $(this).html(); //condrelation筛选条件的关系
+ var html = $(this).html(); //relation筛选条件的关系
if(html == "且"){
$(this).html('或');
data['eventView']['relation'] = 'or'
@@ -4769,7 +4770,25 @@ var X = window.X || {
X.pageLogic['dashboard'].gettabledata();
})
}else if(d.id == 'export'){
- X.download('ck/'+ cat +'_model_export',{report_id:id},name);
+ var arr = [];
+ arr.push(id);
+ X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){
+ console.log(d);
+ var arr = {
+ "eventView": d[0]['query']['eventView'],
+ "events": d[0]['query']['events'],
+ // "report_id": id,
+ }
+ var dateid = "times"+id;
+ var time = $("#"+dateid).html();
+ var timearr = time.split(" ");
+ arr['eventView']['startTime'] = timearr[0] + ' 00:00:00';
+ arr['eventView']['endTime'] = timearr[2] + ' 23:59:59';
+
+ X.download('ck/'+ cat +'_model_export',arr,name);
+ })
+
+
}else {
layer.confirm('确认移除['+ name + ']', {
btn: ['取消','删除 '] //按钮
@@ -6325,12 +6344,18 @@ var X = window.X || {
var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs");
var val = $(this).val();
- console.log(val);
var valarr = val.split(",");
data['events'][index]['filts'][indexs]['ftv']=valarr;
data['events'][index]['filts'][indexs]['strftv']=val;
});
+ // 删除筛选
+ $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
+ var index = $(this).attr("data-twonum");
+ data['events'][0]['filts'].splice(index,1);
+ X.template("userpar","userpar-event",data['events']);
+ });
+
// 分组项
$(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
var index = $(this).attr("data-index");
@@ -7908,15 +7933,14 @@ var X = window.X || {
onUpdate:function(evt){
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
- let item = submitdata.splice(oldIndex, 1) // arr删除2，把2给item
- submitdata.splice(newIndex, 0, item[0])
+ let item = submitdata.splice(oldIndex, 1); // arr删除2，把2给item
+ submitdata.splice(newIndex, 0, item[0]);
+ console.log(item);
+ console.log(submitdata);
for(let i in submitdata){
- submitdata[i]['sort'] = i
+ submitdata[i]['sort'] = i + 1
}
- // console.log(submitdata);
-
X.api('dashboard/add_report','post',{_id:X['DATA']['dashboard_id'],report_ids:submitdata},function(d){
- // console.log(d);
kanbanupdata();
});
}
@@ -8034,7 +8058,7 @@ var X = window.X || {
name:toadddata[i]['name'],
graph_size:toadddata[i]['show_config']['graph_size'] || 'in',
// sort: toadddata[i]['show_config']['sort']
- sort: i
+ sort: i + 1
};
submitdata.push(arr);
}
@@ -8320,7 +8344,7 @@ var X = window.X || {
});
//给用户修改权限
- $(document).on("click",".kongjian-renyuan .kongjian-renyuan-jurisdiction",function(){
+ $(document).off('click','.kongjian-renyuan .kongjian-renyuan-jurisdiction').on("click",".kongjian-renyuan .kongjian-renyuan-jurisdiction",function(){
var obj = $(this);
var offset = obj.offset();
X.parametersopen(obj.attr('data-type'),'jurisdiction',[offset.top+obj.height(),offset.left-160],function(val){
@@ -8338,7 +8362,7 @@ var X = window.X || {
})
});
//添加用户
- $(document).on("click",".member-user-con-right",function(){
+ $(document).off("click",".member-user-con-right").on("click",".member-user-con-right",function(){
var userid = $(this).attr('data-id');
for(let i in userarr){
if(userarr[i]["_id"] == userid){
@@ -8369,7 +8393,7 @@ var X = window.X || {
me.updatauserarr();
});
- $(".kongjian-but .kongjian-qd").click(function(){
+ $(document).off('click','.kongjian-but .kongjian-qd').on('click','.kongjian-but .kongjian-qd',function(){
var tit = $(".kongjian-mc-box .kongjian-mc-box-txt").val();
var adduserarr = X.DATA['adduadaserarr'];
if(tit == ''){
@@ -8425,6 +8449,7 @@ var X = window.X || {
var adduadaserarr = X.DATA['adduadaserarr'];
var userarr = X.DATA['userarr'];
//以添加用户
+ console.log(adduadaserarr)
X.laytpldata("#kongjian-renyuan-box-dot",adduadaserarr,".kongjian-renyuan-box2");
//未添加的用户
X.laytpldata("#member-user-con-box-dot",userarr,".member-user-con-box");
@@ -8789,23 +8814,41 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback;
var data = parms;
- // console.log("table",data);
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
$("#conent-box"+data.id).html(html);
+
// if(data.modeltype == 'table' && data.modelsize != "small"){
+
+ // var oldcondata = data.condata;
+ // var newcondata = [];
+ // for(let i in oldcondata){
+ // var condataArr = {};
+ // for(let j in oldcondata[i]){
+ // condataArr['name'+j] = oldcondata[i][j];
+ // }
+ // newcondata.push(condataArr);
+ // }
+
// var headdata = [];
// for(let i in data.titledata){
// var arr = {
- // width: "150px",
- // field: data.titledata[i],
- // fixed: false
+ // width: 150,
+ // title: data.titledata[i],
+ // name: 'name'+i,
+ // align: 'center'
// };
// if(i == 0){
// arr['fixed'] = true;
// }
// headdata.push(arr);
// }
- // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
+
+ // $("#table-tbody-box-"+data.id).mmGrid({
+ // cols: headdata,
+ // items: newcondata,
+ // fullWidthRows: true
+ // });
+ // // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
// }
})
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 0b22518..4c0008a 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -120,7 +120,7 @@ var X = window.X || {
(function(){
//本地
- // var ipurl = "http://10.0.0.77:7889/api/v1/";
+ // var ipurl = "http://10.0.0.77:7899/api/v1/";
// 线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
//线上测试
@@ -276,7 +276,8 @@ var X = window.X || {
'Content-Type':'application/json',
},
}
-
+ console.log(url);
+ console.log(request);
const response = await fetch(url, request);
// const filename = response.headers.get('content-disposition').split('=')[1];
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index aab6d30..174f4f2 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -609,7 +609,25 @@
X.pageLogic['dashboard'].gettabledata();
})
}else if(d.id == 'export'){
- X.download('ck/'+ cat +'_model_export',{report_id:id},name);
+ var arr = [];
+ arr.push(id);
+ X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){
+ console.log(d);
+ var arr = {
+ "eventView": d[0]['query']['eventView'],
+ "events": d[0]['query']['events'],
+ // "report_id": id,
+ }
+ var dateid = "times"+id;
+ var time = $("#"+dateid).html();
+ var timearr = time.split(" ");
+ arr['eventView']['startTime'] = timearr[0] + ' 00:00:00';
+ arr['eventView']['endTime'] = timearr[2] + ' 23:59:59';
+
+ X.download('ck/'+ cat +'_model_export',arr,name);
+ })
+
+
}else {
layer.confirm('确认移除['+ name + ']', {
btn: ['取消','删除 '] //按钮
diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js
index aebfd40..cd5b493 100644
--- a/web/srczip/logic/distribution.js
+++ b/web/srczip/logic/distribution.js
@@ -293,12 +293,18 @@
var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs");
var val = $(this).val();
- console.log(val);
var valarr = val.split(",");
data['events'][index]['filts'][indexs]['ftv']=valarr;
data['events'][index]['filts'][indexs]['strftv']=val;
});
+ // 删除筛选
+ $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
+ var index = $(this).attr("data-twonum");
+ data['events'][0]['filts'].splice(index,1);
+ X.template("userpar","userpar-event",data['events']);
+ });
+
// 分组项
$(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
var index = $(this).attr("data-index");
diff --git a/web/srczip/logic/kanbanadmin.js b/web/srczip/logic/kanbanadmin.js
index 6313265..a7f9cd2 100644
--- a/web/srczip/logic/kanbanadmin.js
+++ b/web/srczip/logic/kanbanadmin.js
@@ -44,15 +44,14 @@
onUpdate:function(evt){
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
- let item = submitdata.splice(oldIndex, 1) // arr删除2，把2给item
- submitdata.splice(newIndex, 0, item[0])
+ let item = submitdata.splice(oldIndex, 1); // arr删除2，把2给item
+ submitdata.splice(newIndex, 0, item[0]);
+ console.log(item);
+ console.log(submitdata);
for(let i in submitdata){
- submitdata[i]['sort'] = i
+ submitdata[i]['sort'] = i + 1
}
- // console.log(submitdata);
-
X.api('dashboard/add_report','post',{_id:X['DATA']['dashboard_id'],report_ids:submitdata},function(d){
- // console.log(d);
kanbanupdata();
});
}
@@ -170,7 +169,7 @@
name:toadddata[i]['name'],
graph_size:toadddata[i]['show_config']['graph_size'] || 'in',
// sort: toadddata[i]['show_config']['sort']
- sort: i
+ sort: i + 1
};
submitdata.push(arr);
}
diff --git a/web/srczip/logic/kongjianshezhi.js b/web/srczip/logic/kongjianshezhi.js
index 38a8f03..67a9ebf 100644
--- a/web/srczip/logic/kongjianshezhi.js
+++ b/web/srczip/logic/kongjianshezhi.js
@@ -113,7 +113,7 @@
});
//给用户修改权限
- $(document).on("click",".kongjian-renyuan .kongjian-renyuan-jurisdiction",function(){
+ $(document).off('click','.kongjian-renyuan .kongjian-renyuan-jurisdiction').on("click",".kongjian-renyuan .kongjian-renyuan-jurisdiction",function(){
var obj = $(this);
var offset = obj.offset();
X.parametersopen(obj.attr('data-type'),'jurisdiction',[offset.top+obj.height(),offset.left-160],function(val){
@@ -131,7 +131,7 @@
})
});
//添加用户
- $(document).on("click",".member-user-con-right",function(){
+ $(document).off("click",".member-user-con-right").on("click",".member-user-con-right",function(){
var userid = $(this).attr('data-id');
for(let i in userarr){
if(userarr[i]["_id"] == userid){
@@ -162,7 +162,7 @@
me.updatauserarr();
});
- $(".kongjian-but .kongjian-qd").click(function(){
+ $(document).off('click','.kongjian-but .kongjian-qd').on('click','.kongjian-but .kongjian-qd',function(){
var tit = $(".kongjian-mc-box .kongjian-mc-box-txt").val();
var adduserarr = X.DATA['adduadaserarr'];
if(tit == ''){
@@ -218,6 +218,7 @@
var adduadaserarr = X.DATA['adduadaserarr'];
var userarr = X.DATA['userarr'];
//以添加用户
+ console.log(adduadaserarr)
X.laytpldata("#kongjian-renyuan-box-dot",adduadaserarr,".kongjian-renyuan-box2");
//未添加的用户
X.laytpldata("#member-user-con-box-dot",userarr,".member-user-con-box");
diff --git a/web/srczip/logic/modeltable.js b/web/srczip/logic/modeltable.js
index bed0893..a46ddaa 100644
--- a/web/srczip/logic/modeltable.js
+++ b/web/srczip/logic/modeltable.js
@@ -5,23 +5,41 @@
this.parms = parms;
this.callback = parms.callback;
var data = parms;
- // console.log("table",data);
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
$("#conent-box"+data.id).html(html);
+
// if(data.modeltype == 'table' && data.modelsize != "small"){
+
+ // var oldcondata = data.condata;
+ // var newcondata = [];
+ // for(let i in oldcondata){
+ // var condataArr = {};
+ // for(let j in oldcondata[i]){
+ // condataArr['name'+j] = oldcondata[i][j];
+ // }
+ // newcondata.push(condataArr);
+ // }
+
// var headdata = [];
// for(let i in data.titledata){
// var arr = {
- // width: "150px",
- // field: data.titledata[i],
- // fixed: false
+ // width: 150,
+ // title: data.titledata[i],
+ // name: 'name'+i,
+ // align: 'center'
// };
// if(i == 0){
// arr['fixed'] = true;
// }
// headdata.push(arr);
// }
- // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
+
+ // $("#table-tbody-box-"+data.id).mmGrid({
+ // cols: headdata,
+ // items: newcondata,
+ // fullWidthRows: true
+ // });
+ // // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
// }
})