This commit is contained in:
罗松柏 2021-08-04 18:30:10 +08:00
parent 5ca4d18580
commit 0c029436aa
10 changed files with 151 additions and 49 deletions

View File

@ -575,13 +575,13 @@
{{# layui.each(items.children, function(value, datas){ }}
<dl class="layui-nav-child modeify-layui-nav-child">
<dd class="layui-left-dd" data-id="{{datas._id}}"><a href="javascript:;" class="fontcolor second3 category"> <span>{{datas.name}}</span>
<img src="./static/img/gengduo.png" alt=""></a></dd>
<img src="./static/img/gengduo.png" alt="" data-id="{{items._id}}"></a></dd>
</dl>
{{# }); }}
</li>
{{# } else { }}
<dd class="layui-left-dd" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
<img src="./static/img/gengduo.png" alt="" class="nav-action-bar"></a>
<img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
</dd>
{{# } }}
{{# }); }}

17
web/pages/modifyname.html Normal file
View File

@ -0,0 +1,17 @@
<!-- 重命名 -->
<div class="modifyname-bg">
<div class="modifyname-box">
<div class="modifyname-top">
<p>看板名称</p>
<img src="./static/img/cha.png" id="modifyname-cha"/>
</div>
<input id="modifynameid" style="display: none;">
<div class="modifyname-txt-box">
<input type="text" class="modifyname-txt" id="modifyname-txt"/>
</div>
<div class="modifyname-but-box">
<div class="modifyname-qx" id="modifyname-qx">取消</div>
<div class="modifyname-qd" id="modifyname-qd">确定</div>
</div>
</div>
</div>

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

@ -9,8 +9,8 @@ var X = window.X || {
'taboperationdata':{
kanban:[
{'title':'重命名','img':'xiugai.png','click':'modifyname'},
{'title':'移动至','img':'yidong.png','click':'move'},
{'title':'复制看板','img':'fuzhi.png','click':'copy'},
{'title':'移动至','img':'yidong.png','click':'yidong-pop'},
// {'title':'复制看板','img':'fuzhi.png','click':'copykanban'},
{'title':'删除看板','img':'del.png','click':'del'},
],
wenjian:[
@ -103,8 +103,8 @@ var X = window.X || {
(function(){
// var ipurl = "http://10.0.0.77:7889/api/v1/";
var ipurl = "http://139.159.159.3:9865/api/v1/";
var ipurl = "http://10.0.0.77:7889/api/v1/";
// var ipurl = "http://139.159.159.3:9865/api/v1/";
//设置或读取登录缓存需要保存到localStorage防止刷新时候登录数据丢失
X.loginCache = function(data){
@ -591,12 +591,10 @@ var X = window.X || {
type: 'line',
data: arr
}
console.log(arr);
for(let i in arr){
sum = sum + arr[i];
sameday = arr[i];
}
console.log(mean);
date = '近'+xAxisData.length+'天时间';
mean = (sum / arr.length).toFixed(2);
@ -1293,7 +1291,7 @@ var X = window.X || {
}
}
console.log(ProjectData)
for(let i in ProjectData){
if(ProjectData[i]['title'].indexOf(txt) != -1){
ssProjectData.push(ProjectData[i])
@ -1369,7 +1367,8 @@ var X = window.X || {
'mykanban':selectkanbanidarr(mykanban),
'kongjian':selectkongjianidarr(kongjian)
}
X.parametersopen(data,'yidong-pop','auto',function(){
var source_id = data['mykanban'].concat(data['kongjian']);
X.parametersopen(source_id,'yidong-pop','auto',function(){
me.updata(X.DATA['projectid']);
})
});
@ -1390,18 +1389,18 @@ var X = window.X || {
layer.confirm('确认删除选中的看板吗?该操作不可恢复', {
btn: ['取消','删除 '] //按钮
}, function(){
// 取消
//取消
layer.close(layer.index);
}, function(){
//删除
X.api("dashboard/delete",'post',{ids:data},function(d){
layer.msg('删除成功');
layer.close(layer.index);
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
me.updata(X.DATA.projectid);//刷新数据
})
});
});
});
@ -3506,14 +3505,6 @@ var X = window.X || {
var id = $(this).attr('data-id');
var gourl='';
// <dd><a class="ajax-content" href="analysis" data-id="conetnt">事件分析</a></dd>
// <dd><a class="ajax-content" href="retained" data-id="conetnt">留存分析</a></dd>
// <dd><a class="ajax-content" href="ltvmodel" data-id="conetnt">LTV模型</a></dd>
// <dd><a class="ajax-content" href="funnelanalysis" data-id="conetnt">漏斗分析</a></dd>
// <dd><a class="ajax-content" href="distribution" data-id="conetnt">分布分析</a></dd>
// <dd><a class="ajax-content" href="routeanalysis" data-id="conetnt">路径分析</a></dd>
// <dd><a class="ajax-content" href="sqlquery" data-id="conetnt">SQL查询</a></dd>
if(cat == 'event'){
gourl = 'analysis';
}else if(cat == 'retention'){
@ -3532,7 +3523,37 @@ var X = window.X || {
// 渲染下拉框
$(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
e.stopPropagation();
console.log('更多操作按钮');
// console.log('更多操作按钮');
var obj = $(this);
var offset = obj.offset();
var offsets = [ offset.top + 10,offset.left];
var id = $(this).attr('data-id');
X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist",offsets,function(d){
var arr = [];
arr.push(id);
if(d.click != 'del'){
X.parametersopen(arr,d.click,'auto',function(){
// me.updata(X.DATA['projectid']);
me.freshMenu();
})
}else {
layer.confirm('确认删除选中的看板吗?该操作不可恢复', {
btn: ['取消','删除 '] //按钮
}, function(){
//取消
layer.close(layer.index);
}, function(){
//删除
X.api("dashboard/delete",'post',{ids:arr},function(d){
layer.msg('删除成功');
layer.close(layer.index);
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
me.updata(X.DATA.projectid);//刷新数据
})
});
}
});
});
},
@ -4490,8 +4511,8 @@ var X = window.X || {
$(document).off('click','.dropdownlist-list').on('click','.dropdownlist-list',function(){
var index = $(this).attr("data-index");
var dataArr = listdata[index];
me.callback && me.callback(dataArr);
layer.closeAll();
me.callback && me.callback(dataArr);
})
}
@ -6439,6 +6460,26 @@ var X = window.X || {
}
};
})();
// srczip/logic/modifyname.js
(function(){
X.pageLogic['modifyname'] = {
init : function(parms){
var me = this;
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;
console.log(11111,data);
$(document).off('click','.modifyname-qd').on('click','.modifyname-qd',function(){
var txt = $(".modifyname-txt").val();
X.api("dashboard/edit","post",{dashboard_id:data[0],new_name:txt},function(d){
console.log(d);
layer.closeAll(0);
})
})
}
};
})();
// srczip/logic/newkanban.js
(function(){
X.pageLogic['newkanban'] = {
@ -9416,9 +9457,9 @@ var X = window.X || {
alert('请选择添加的位置');
return;
}
var source_id = data['mykanban'].concat(data['kongjian']);
// var source_id = data['mykanban'].concat(data['kongjian']);
var dataArr = {
'source_ids':source_id,
'source_ids':data,
'dest_pid': id,
'cat':type
};

View File

@ -8,8 +8,8 @@ var X = window.X || {
'taboperationdata':{
kanban:[
{'title':'重命名','img':'xiugai.png','click':'modifyname'},
{'title':'移动至','img':'yidong.png','click':'move'},
{'title':'复制看板','img':'fuzhi.png','click':'copy'},
{'title':'移动至','img':'yidong.png','click':'yidong-pop'},
// {'title':'复制看板','img':'fuzhi.png','click':'copykanban'},
{'title':'删除看板','img':'del.png','click':'del'},
],
wenjian:[
@ -102,8 +102,8 @@ var X = window.X || {
(function(){
// var ipurl = "http://10.0.0.77:7889/api/v1/";
var ipurl = "http://139.159.159.3:9865/api/v1/";
var ipurl = "http://10.0.0.77:7889/api/v1/";
// var ipurl = "http://139.159.159.3:9865/api/v1/";
//设置或读取登录缓存需要保存到localStorage防止刷新时候登录数据丢失
X.loginCache = function(data){
@ -590,12 +590,10 @@ var X = window.X || {
type: 'line',
data: arr
}
console.log(arr);
for(let i in arr){
sum = sum + arr[i];
sameday = arr[i];
}
console.log(mean);
date = '近'+xAxisData.length+'天时间';
mean = (sum / arr.length).toFixed(2);

View File

@ -67,7 +67,7 @@
}
}
console.log(ProjectData)
for(let i in ProjectData){
if(ProjectData[i]['title'].indexOf(txt) != -1){
ssProjectData.push(ProjectData[i])
@ -143,7 +143,8 @@
'mykanban':selectkanbanidarr(mykanban),
'kongjian':selectkongjianidarr(kongjian)
}
X.parametersopen(data,'yidong-pop','auto',function(){
var source_id = data['mykanban'].concat(data['kongjian']);
X.parametersopen(source_id,'yidong-pop','auto',function(){
me.updata(X.DATA['projectid']);
})
});
@ -164,18 +165,18 @@
layer.confirm('确认删除选中的看板吗?该操作不可恢复', {
btn: ['取消','删除 '] //按钮
}, function(){
// 取消
//取消
layer.close(layer.index);
}, function(){
//删除
X.api("dashboard/delete",'post',{ids:data},function(d){
layer.msg('删除成功');
layer.close(layer.index);
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
me.updata(X.DATA.projectid);//刷新数据
})
});
});
});

View File

@ -243,14 +243,6 @@
var id = $(this).attr('data-id');
var gourl='';
// <dd><a class="ajax-content" href="analysis" data-id="conetnt">事件分析</a></dd>
// <dd><a class="ajax-content" href="retained" data-id="conetnt">留存分析</a></dd>
// <dd><a class="ajax-content" href="ltvmodel" data-id="conetnt">LTV模型</a></dd>
// <dd><a class="ajax-content" href="funnelanalysis" data-id="conetnt">漏斗分析</a></dd>
// <dd><a class="ajax-content" href="distribution" data-id="conetnt">分布分析</a></dd>
// <dd><a class="ajax-content" href="routeanalysis" data-id="conetnt">路径分析</a></dd>
// <dd><a class="ajax-content" href="sqlquery" data-id="conetnt">SQL查询</a></dd>
if(cat == 'event'){
gourl = 'analysis';
}else if(cat == 'retention'){
@ -269,7 +261,37 @@
// 渲染下拉框
$(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
e.stopPropagation();
console.log('更多操作按钮');
// console.log('更多操作按钮');
var obj = $(this);
var offset = obj.offset();
var offsets = [ offset.top + 10,offset.left];
var id = $(this).attr('data-id');
X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist",offsets,function(d){
var arr = [];
arr.push(id);
if(d.click != 'del'){
X.parametersopen(arr,d.click,'auto',function(){
// me.updata(X.DATA['projectid']);
me.freshMenu();
})
}else {
layer.confirm('确认删除选中的看板吗?该操作不可恢复', {
btn: ['取消','删除 '] //按钮
}, function(){
//取消
layer.close(layer.index);
}, function(){
//删除
X.api("dashboard/delete",'post',{ids:arr},function(d){
layer.msg('删除成功');
layer.close(layer.index);
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
me.updata(X.DATA.projectid);//刷新数据
})
});
}
});
});
},

View File

@ -12,8 +12,8 @@
$(document).off('click','.dropdownlist-list').on('click','.dropdownlist-list',function(){
var index = $(this).attr("data-index");
var dataArr = listdata[index];
me.callback && me.callback(dataArr);
layer.closeAll();
me.callback && me.callback(dataArr);
})
}

View File

@ -0,0 +1,19 @@
(function(){
X.pageLogic['modifyname'] = {
init : function(parms){
var me = this;
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;
console.log(11111,data);
$(document).off('click','.modifyname-qd').on('click','.modifyname-qd',function(){
var txt = $(".modifyname-txt").val();
X.api("dashboard/edit","post",{dashboard_id:data[0],new_name:txt},function(d){
console.log(d);
layer.closeAll(0);
})
})
}
};
})();

View File

@ -56,9 +56,9 @@
alert('请选择添加的位置');
return;
}
var source_id = data['mykanban'].concat(data['kongjian']);
// var source_id = data['mykanban'].concat(data['kongjian']);
var dataArr = {
'source_ids':source_id,
'source_ids':data,
'dest_pid': id,
'cat':type
};

View File

@ -176,7 +176,7 @@ input::-webkit-input-placeholder{ color:#a7b5c3;}
.xiangmukongjian:hover > img{ display: block; }
/* 修改看板名称 */
.modifyname-bg { display: none; background-color: rgba(0, 0, 0, 0.3); width: 100%; height: 100%; position: fixed; top: 0; z-index: 9999; }
.modifyname-bg { width: 396px; height: 200px;}
.modifyname-box { width: 396px; height: 174px; position: absolute; margin: auto; left: 0; right: 0; top: 0; bottom: 0; background-color: #ffffff; border-radius: 2px; }
.modifyname-top { display: flex; justify-content: space-between; align-items: center; padding: 16px 24px; color: #202d3f; font-size: 16px; }
.modifyname-top img { cursor: pointer; }
@ -483,3 +483,7 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
.small-proportion { padding: 20px 24px; display: flex; justify-content: space-between; align-items: center; }
.fu { transform:rotate(180deg); border-bottom: 3px solid #ff5d5d; }
.funum { color: #ff5d5d !important; }
/* 重命名 */