111
This commit is contained in:
parent
0efd3bd3bb
commit
9339ee4a13
@ -8,10 +8,14 @@
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="chuangjiankongjian-box">
|
||||
<div class="chuangjiankongjian-box addkongjian" style="display: none;">
|
||||
<p class="chuangjiankongjian-tit">创建空间</p>
|
||||
<p class="chuangjiankongjian-tit2">选择成员创建共享空间,添加看板至空间实现统一共享</p>
|
||||
</div>
|
||||
<div class="chuangjiankongjian-box editkongjian" style="display: none;">
|
||||
<p class="chuangjiankongjian-tit">空间设置</p>
|
||||
<p class="chuangjiankongjian-tit2">重新编辑已创建空间</p>
|
||||
</div>
|
||||
<div class="kongjian-mc-box">
|
||||
<span>空间名称</span>
|
||||
<input type="text" placeholder="空间名称" class="kongjian-mc-box-txt"/>
|
||||
|
72
web/src/x.min.js
vendored
72
web/src/x.min.js
vendored
@ -107,8 +107,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){
|
||||
@ -3879,7 +3879,9 @@ var X = window.X || {
|
||||
// $('.layui-row').dad({
|
||||
// draggable: '.layui-card'
|
||||
// });
|
||||
// $('.layui-row').dad();
|
||||
// $('.layui-row').dad({
|
||||
// draggable:'table'
|
||||
// });
|
||||
})
|
||||
},
|
||||
|
||||
@ -4006,7 +4008,7 @@ var X = window.X || {
|
||||
})
|
||||
},
|
||||
|
||||
//定义一个比较器--降序排列
|
||||
//定义一个比较器--升序排列
|
||||
compare:function(propertyName) {
|
||||
// console.log(propertyName)
|
||||
return function(object1, object2) {
|
||||
@ -6244,18 +6246,23 @@ var X = window.X || {
|
||||
$(".member-top-box .member-cha").click(function(){
|
||||
$(".kongjian-box .member-box").hide();
|
||||
});
|
||||
var userarr,adduadaserarr;
|
||||
var userarr = X.DATA['userarr'];
|
||||
var adduadaserarr;
|
||||
|
||||
var userinfo = X.DATA.userinfo;
|
||||
$(".gly-firs").html(userinfo.name.substring(0,1));
|
||||
$(".gly-name").html(userinfo.name);
|
||||
|
||||
if(id){
|
||||
|
||||
X.api('space/detail','post',{space_id:id},'false',function(d){
|
||||
$(".editkongjian").show();
|
||||
X.api('space/detail','post',{space_id:id},function(d){
|
||||
$('.kongjian-mc-box-txt').val(d.name);
|
||||
for(let i in d.members){
|
||||
d.members[i]["firs"] = d.members[i]['name'].substring(0,1);
|
||||
}
|
||||
X.DATA['adduadaserarr'] = d.members;
|
||||
adduadaserarr = d.members;
|
||||
me.postuserlist();
|
||||
})
|
||||
|
||||
var listarr = [
|
||||
@ -6282,21 +6289,12 @@ var X = window.X || {
|
||||
}
|
||||
})
|
||||
}else {
|
||||
$(".addkongjian").show();
|
||||
adduadaserarr = [];
|
||||
X.DATA['adduadaserarr'] = [];
|
||||
me.postuserlist();
|
||||
}
|
||||
X.api('user/all_account',"get",{},'false',function(d){
|
||||
for(let i in d){
|
||||
d[i]["firs"] = d[i]['name'].substring(0,1);
|
||||
d[i]["authority"] = "r";
|
||||
}
|
||||
userarr = d;
|
||||
|
||||
X.DATA['userarr'] = d;
|
||||
me.updatauserarr();
|
||||
});
|
||||
|
||||
//添加用户数据
|
||||
|
||||
//筛选用户
|
||||
$(".member-top-box #membertxt").bind("input propertychange",function(){
|
||||
@ -6321,7 +6319,7 @@ var X = window.X || {
|
||||
$(document).on("click",".kongjian-renyuan .kongjian-renyuan-jurisdiction",function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
X.querycriteriapop(obj.attr('data-type'),'jurisdiction',offset.left-160,offset.top+obj.height(),function(val){
|
||||
X.parametersopen(obj.attr('data-type'),'jurisdiction',[offset.top+obj.height(),offset.left-160],function(val){
|
||||
console.log(val)
|
||||
var index = obj.attr("data-index");
|
||||
adduadaserarr[index]['authority'] = val;
|
||||
@ -6387,18 +6385,24 @@ var X = window.X || {
|
||||
}
|
||||
}
|
||||
|
||||
if(id){
|
||||
X.api('space/rename','post',{space_id:id,new_name:tit},function(d){
|
||||
console.log(d);
|
||||
})
|
||||
}else{
|
||||
X.api('space/create',"post",data,function(d){
|
||||
// if(d.code == "ok"){
|
||||
layer.msg(d, function(){
|
||||
//do something
|
||||
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
|
||||
//关闭对应弹窗
|
||||
layer.closeAll();
|
||||
});
|
||||
// }
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
X.api('space/create',"post",data,function(d){
|
||||
// if(d.code == "ok"){
|
||||
layer.msg(d, function(){
|
||||
//do something
|
||||
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
|
||||
//关闭对应弹窗
|
||||
layer.closeAll();
|
||||
});
|
||||
// }
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
@ -6415,6 +6419,16 @@ var X = window.X || {
|
||||
X.laytpldata("#kongjian-renyuan-box-dot",adduadaserarr,".kongjian-renyuan-box2");
|
||||
//未添加的用户
|
||||
X.laytpldata("#member-user-con-box-dot",userarr,".member-user-con-box");
|
||||
},
|
||||
postuserlist:function(){
|
||||
X.api('user/all_account',"get",{},function(d){
|
||||
for(let i in d){
|
||||
d[i]["firs"] = d[i]['name'].substring(0,1);
|
||||
d[i]["authority"] = "r";
|
||||
}
|
||||
X.DATA['userarr'] = d;
|
||||
X.pageLogic.kongjianshezhi.updatauserarr();
|
||||
});
|
||||
}
|
||||
};
|
||||
})();
|
||||
|
@ -106,8 +106,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){
|
||||
|
@ -447,7 +447,9 @@
|
||||
// $('.layui-row').dad({
|
||||
// draggable: '.layui-card'
|
||||
// });
|
||||
// $('.layui-row').dad();
|
||||
// $('.layui-row').dad({
|
||||
// draggable:'table'
|
||||
// });
|
||||
})
|
||||
},
|
||||
|
||||
@ -574,7 +576,7 @@
|
||||
})
|
||||
},
|
||||
|
||||
//定义一个比较器--降序排列
|
||||
//定义一个比较器--升序排列
|
||||
compare:function(propertyName) {
|
||||
// console.log(propertyName)
|
||||
return function(object1, object2) {
|
||||
|
@ -13,18 +13,23 @@
|
||||
$(".member-top-box .member-cha").click(function(){
|
||||
$(".kongjian-box .member-box").hide();
|
||||
});
|
||||
var userarr,adduadaserarr;
|
||||
var userarr = X.DATA['userarr'];
|
||||
var adduadaserarr;
|
||||
|
||||
var userinfo = X.DATA.userinfo;
|
||||
$(".gly-firs").html(userinfo.name.substring(0,1));
|
||||
$(".gly-name").html(userinfo.name);
|
||||
|
||||
if(id){
|
||||
|
||||
$(".editkongjian").show();
|
||||
X.api('space/detail','post',{space_id:id},function(d){
|
||||
$('.kongjian-mc-box-txt').val(d.name);
|
||||
for(let i in d.members){
|
||||
d.members[i]["firs"] = d.members[i]['name'].substring(0,1);
|
||||
}
|
||||
X.DATA['adduadaserarr'] = d.members;
|
||||
adduadaserarr = d.members;
|
||||
me.postuserlist();
|
||||
})
|
||||
|
||||
var listarr = [
|
||||
@ -51,21 +56,12 @@
|
||||
}
|
||||
})
|
||||
}else {
|
||||
$(".addkongjian").show();
|
||||
adduadaserarr = [];
|
||||
X.DATA['adduadaserarr'] = [];
|
||||
me.postuserlist();
|
||||
}
|
||||
X.api('user/all_account',"get",{},function(d){
|
||||
for(let i in d){
|
||||
d[i]["firs"] = d[i]['name'].substring(0,1);
|
||||
d[i]["authority"] = "r";
|
||||
}
|
||||
userarr = d;
|
||||
|
||||
X.DATA['userarr'] = d;
|
||||
me.updatauserarr();
|
||||
});
|
||||
|
||||
//添加用户数据
|
||||
|
||||
//筛选用户
|
||||
$(".member-top-box #membertxt").bind("input propertychange",function(){
|
||||
@ -90,7 +86,7 @@
|
||||
$(document).on("click",".kongjian-renyuan .kongjian-renyuan-jurisdiction",function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
X.querycriteriapop(obj.attr('data-type'),'jurisdiction',offset.left-160,offset.top+obj.height(),function(val){
|
||||
X.parametersopen(obj.attr('data-type'),'jurisdiction',[offset.top+obj.height(),offset.left-160],function(val){
|
||||
console.log(val)
|
||||
var index = obj.attr("data-index");
|
||||
adduadaserarr[index]['authority'] = val;
|
||||
@ -156,18 +152,24 @@
|
||||
}
|
||||
}
|
||||
|
||||
if(id){
|
||||
X.api('space/rename','post',{space_id:id,new_name:tit},function(d){
|
||||
console.log(d);
|
||||
})
|
||||
}else{
|
||||
X.api('space/create',"post",data,function(d){
|
||||
// if(d.code == "ok"){
|
||||
layer.msg(d, function(){
|
||||
//do something
|
||||
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
|
||||
//关闭对应弹窗
|
||||
layer.closeAll();
|
||||
});
|
||||
// }
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
X.api('space/create',"post",data,function(d){
|
||||
// if(d.code == "ok"){
|
||||
layer.msg(d, function(){
|
||||
//do something
|
||||
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
|
||||
//关闭对应弹窗
|
||||
layer.closeAll();
|
||||
});
|
||||
// }
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
@ -184,6 +186,16 @@
|
||||
X.laytpldata("#kongjian-renyuan-box-dot",adduadaserarr,".kongjian-renyuan-box2");
|
||||
//未添加的用户
|
||||
X.laytpldata("#member-user-con-box-dot",userarr,".member-user-con-box");
|
||||
},
|
||||
postuserlist:function(){
|
||||
X.api('user/all_account',"get",{},function(d){
|
||||
for(let i in d){
|
||||
d[i]["firs"] = d[i]['name'].substring(0,1);
|
||||
d[i]["authority"] = "r";
|
||||
}
|
||||
X.DATA['userarr'] = d;
|
||||
X.pageLogic.kongjianshezhi.updatauserarr();
|
||||
});
|
||||
}
|
||||
};
|
||||
})();
|
||||
|
Loading…
Reference in New Issue
Block a user