diff --git a/web/pages/kongjianshezhi.html b/web/pages/kongjianshezhi.html index 65b7aa7..ff2f5b7 100644 --- a/web/pages/kongjianshezhi.html +++ b/web/pages/kongjianshezhi.html @@ -8,10 +8,14 @@ --> -
+ +
空间名称 diff --git a/web/src/x.min.js b/web/src/x.min.js index 44e4349..5b42d32 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -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' + // }); }) }, @@ -3991,7 +3993,7 @@ var X = window.X || { modellist.sort( X.pageLogic['dashboard'].compare("sort")); for(let i in modellist){ - for(let z in d){ + for(let z in d){ if(modellist[i]['sort'] == d[z]['sort']){ //渲染模板和数据 console.log(d[z]); @@ -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(); + }); } }; })(); diff --git a/web/srczip/common.js b/web/srczip/common.js index c73bdfe..3a69405 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -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){ diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 3a9d648..05b72b8 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -447,7 +447,9 @@ // $('.layui-row').dad({ // draggable: '.layui-card' // }); - // $('.layui-row').dad(); + // $('.layui-row').dad({ + // draggable:'table' + // }); }) }, @@ -559,7 +561,7 @@ modellist.sort( X.pageLogic['dashboard'].compare("sort")); for(let i in modellist){ - for(let z in d){ + for(let z in d){ if(modellist[i]['sort'] == d[z]['sort']){ //渲染模板和数据 console.log(d[z]); @@ -574,7 +576,7 @@ }) }, - //定义一个比较器--降序排列 + //定义一个比较器--升序排列 compare:function(propertyName) { // console.log(propertyName) return function(object1, object2) { diff --git a/web/srczip/logic/kongjianshezhi.js b/web/srczip/logic/kongjianshezhi.js index 8f2af3d..969753d 100644 --- a/web/srczip/logic/kongjianshezhi.js +++ b/web/srczip/logic/kongjianshezhi.js @@ -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(); + }); } }; })();