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

1

Browse Source
This commit is contained in:
罗松柏 2021-10-13 15:47:46 +08:00
parent de1e76850a
commit aed7efd665
11 changed files with 136 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/main.html
View File

@ -9,8 +9,9 @@
<link rel="stylesheet" href="./static/css/event.css" >
<link rel="stylesheet" href="./static/css/basics.css" >
<link rel="stylesheet" href="./static/css/daterangepicker.css"><!-- 时间选择控件样式 -->
<link rel="stylesheet" href="./static/css/fixed-table.css"> <!-- table -->
<!-- <link rel="stylesheet" href="./static/css/fixed-table.css"> table -->
<link rel="stylesheet" href="./static/css/mmGrid.css">
<!-- <link rel="stylesheet" href="./static/img/iconfont/iconfont.css"> -->
<script src="./src/jquery.min.js"></script>
<script src="./src/echarts.min.js"></script><!-- 图标控件 -->
@ -34,7 +35,9 @@
<script src="./src/Sortable.js" type="text/javascript"></script>
<!-- table -->
<script src="./src/FixedTable.js" type="text/javascript"></script>
<!-- <script src="./src/FixedTable.js" type="text/javascript"></script> -->
<script src="./src/mmGrid.js" type="text/javascript"></script>
<script src="./src/mmPaginator.js" type="text/javascript"></script>
<!-- <script src="./src/doT.js"></script> -->

2
web/pages/jurisdiction.html
View File

@ -18,7 +18,7 @@
<p class="Sjurisdiction-but-left-tit2">允许在空间下添加看板或文件夹</p>
</div>
<div class="Sjurisdiction-but-right">
<input type="radio" class="" id="Sjurisdiction-bianji" name="仅编辑" value="仅编辑"/>
<input type="radio" class="" id="Sjurisdiction-bianji" name="可编辑" value="可编辑"/>
</div>
</div>

2
web/pages/kongjianshezhi.html
View File

@ -103,7 +103,7 @@
{{# if(item.authority == "r"){ }}
<div class="kongjian-renyuan-jurisdiction" data-type='r' data-index="{{index}}" >仅查看</div>
{{# } else { }}
<div class="kongjian-renyuan-jurisdiction" data-type='rw' data-index="{{index}}" >仅查看</div>
<div class="kongjian-renyuan-jurisdiction" data-type='rw' data-index="{{index}}" >可编辑</div>
{{# }}}
<div class="kongjian-renyuan-del" data-id="{{item._id}}"></div>
</div>

96
web/pages/modeltable.html
View File

@ -35,99 +35,6 @@
<div class="table-box">
<div class="table-tbody-box" id="table-tbody-box-{{d.id}}">
<!-- <div class="fixed-table-box row-col-fixed" >
<div class="fixed-table_header-wraper">
<table class="fixed-table_header" cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
<thead>
<tr>
{{# layui.each(d.titledata, function(indexs, items) { }}
<th style="width: 100px;">
<div class="table-cell">{{items}}</div>
</th>
{{# }); }}
</tr>
</thead>
</table>
</div>
{{# if(d.cat === "event"){ }}
<div class="fixed-table_body-wraper" data-parentid="Lyn_FixedTable_1">
<table class="fixed-table_body" cellspacing="0" cellpadding="0" border="0" style="width: 100%">
<tbody>
{{# layui.each(d.condata, function(indexs, items) { }}
<tr >
{{# layui.each(items, function(indexss, itemss) { }}
<td class="ws-100">
<div class="table-cell">{{itemss}}</div>
</td>
{{# }); }}
</tr>
{{# }); }}
</tbody>
</table>
</div>
{{# } else if(d.cat === "retention" || d.cat == "scatter"){ }}
<div class="fixed-table_body-wraper" data-parentid="Lyn_FixedTable_1">
<table class="fixed-table_body" cellspacing="0" cellpadding="0" border="0" style="width: 100%">
<tbody>
{{# layui.each(d.condata, function(indexs, items) { }}
<tr >
<td class="ws-100">
<div class="table-cell">{{items.date}}</div>
</td>
<td class="ws-100">
<div class="table-cell">{{items.d0}}</div>
</td>
{{# layui.each(items.data, function(indexss, itemss){ }}
<td class="ws-100">
<div class="table-cell">
<p>{{itemss.n}}</p>
<p>{{itemss.p}}%</p>
</div>
</td>
{{# }); }}
</tr>
{{# }); }}
</tbody>
</table>
</div>
{{# } else if(d.cat === "ltv"){ }}
<div class="fixed-table_body-wraper" data-parentid="Lyn_FixedTable_1">
<table class="fixed-table_body" cellspacing="0" cellpadding="0" border="0" style="width: 100%">
<tbody>
{{# layui.each(d.condata, function(indexs, items) { }}
<tr >
{{# layui.each(items, function(indexss, itemss){ }}
<td class="ws-100">
<div class="table-cell">{{itemss}}</div>
</td>
{{# }); }}
</tr>
{{# }); }}
</tbody>
</table>
</div>
{{# } else if(d.cat === "user_property"){ }}
<div class="fixed-table_body-wraper" data-parentid="Lyn_FixedTable_1">
<table class="fixed-table_body" cellspacing="0" cellpadding="0" border="0" style="width: 100%">
<tbody>
{{# layui.each(d.condata, function(indexs, items) { }}
<tr>
<td class="ws-100">
<div class="table-cell">{{indexs}}</div>
</td>
<td class="ws-100">
<div class="table-cell">{{items}}</div>
</td>
</tr>
{{# }); }}
</tbody>
</table>
</div>
{{# } }}
</div> -->
<table class="table-fenxi-box">
<thead>
<tr class="table-fenxi-th">
@ -183,9 +90,6 @@
</tr>
{{# }); }}
{{# } }}
</table>
</div>

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

@ -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);
// }
})

5
web/srczip/common.js
View File

@ -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];

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

@ -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: ['取消','删除 '] //按钮

8
web/srczip/logic/distribution.js
View File

@ -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");

13
web/srczip/logic/kanbanadmin.js
View File

@ -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);
}

7
web/srczip/logic/kongjianshezhi.js
View File

@ -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");

28
web/srczip/logic/modeltable.js
View File

@ -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);
// }
})