{{item.name}}
{{item.nickname}}
- {{item.projectroletit}}
- {{item.datarightstit}}
+ {{# if(item.role_tit != undefined){ }}
+ {{item.role_tit}}
+ {{# } else { }}
+ 无权限
+ {{# } }}
+
TA账号
- 项目角色
- 数据权限
+
操作
{{item.username}}
-
- {{item.role_name}}
+
{{# } }}
diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 6344dee..7f8f2a4 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -815,7 +815,7 @@
{{# if(d.graph_size === "small"){ }}
-
+
@@ -824,18 +824,18 @@
{{# if(d.graph_type === "table"){ }}
{{# if(d.graph_size === "large"){ }}
-
+
{{# } else { }}
-
+
{{# } }}
{{# } else { }}
{{# if(d.graph_size === "large"){ }}
-
+
{{# } else { }}
-
+ b1 || b2 Number($(arr_li[j]).attr("index"))){
+ var temp = arr_li[i];
+ arr_li[i] = arr_li[j];
+ arr_li[j] = temp;
+ }
+ }
+ }
+ return arr_li;
+ },
+ //点对点的方式换位
+ pointDrag: function(obj){
+ var self=this;
+ //先拍序
+ var oNear=self.findNearest(obj);
+ if (oNear) {
+ self.animation(obj,self.aPos[$(oNear).attr("index")]);
+ self.animation(oNear, self.aPos[$(obj).attr("index")]);
+ var tmp;
+ tmp = $(obj).attr("index");
+ $(obj).attr("index", $(oNear).attr("index"));
+ $(oNear).attr("index", tmp);
+ $(oNear).removeClass(self.options.moveClass);
+ } else if (self.options.changeWhen == "end") {
+ self.animation(obj, self.aPos[$(obj).attr("index")]);
+ }
+
+ },
+ //排序的方式换位
+ sortDrag: function(obj){
+ var self=this;
+ //先拍序
+ var arr_li=self.sort();
+ //换位置
+ var oNear=self.findNearest(obj);
+ if(oNear){
+ if(Number($(oNear).attr("index"))>Number($(obj).attr("index"))){
+ //前换后
+ var obj_tmp=Number($(obj).attr("index"));
+ $(obj).attr("index",Number($(oNear).attr("index"))+1);
+ for (var i = obj_tmp; i < Number($(oNear).attr("index"))+1; i++) {
+ self.animation(arr_li[i],self.aPos[i-1]);
+ self.animation(obj,self.aPos[$(oNear).attr("index")]);
+ $(arr_li[i]).removeClass(self.options.moveClass);
+ $(arr_li[i]).attr("index",Number($(arr_li[i]).attr("index"))-1);
+ }
+
+ }else if(Number($(obj).attr("index"))>Number($(oNear).attr("index"))){
+ //后换前
+ var obj_tmp=Number($(obj).attr("index"));
+ $(obj).attr("index",$(oNear).attr("index"));
+ for (var i = Number($(oNear).attr("index")); i < obj_tmp; i++) {
+ self.animation(arr_li[i],self.aPos[i+1]);
+ self.animation(obj,self.aPos[Number($(obj).attr("index"))]);
+ $(arr_li[i]).removeClass(self.options.moveClass);
+ $(arr_li[i]).attr("index",Number($(arr_li[i]).attr("index"))+1);
+ }
+ }
+ }else{
+ self.animation(obj,self.aPos[$(obj).attr("index")]);
+ }
+
+ },
+ //运动函数(后期再加参数)
+ animation: function(obj,json){
+ var self=this;
+ //考虑默认值
+ var options=self.options.animation_options; /*|| {};
+ options.duration=self.options.animation_options.duration || 800;
+ options.easing=options.easing.duration.easing || 'ease-out';*/
+ var self=this;
+ var count=Math.round(options.duration/30);
+ var start={};
+ var dis={};
+ for(var name in json){
+ start[name]=parseFloat(self.getStyle(obj,name));
+ if(isNaN(start[name])){
+ switch(name){
+ case 'left':
+ start[name]=obj.offsetLeft;
+ break;
+ case 'top':
+ start[name]=obj.offsetTop;
+ break;
+ case 'width':
+ start[name]=obj.offsetWidth;
+ break;
+ case 'height':
+ start[name]=obj.offsetHeight;
+ break;
+ case 'marginLeft':
+ start[name]=obj.offsetLeft;
+ break;
+ case 'borderWidth':
+ start[name]=0;
+ break;
+ //...
+ }
+ }
+ dis[name]=json[name]-start[name];
+ }
+
+ var n=0;
+
+ clearInterval(obj.timer);
+ obj.timer=setInterval(function(){
+ n++;
+ for(var name in json){
+ switch(options.easing){
+ case 'linear':
+ var a=n/count;
+ var cur=start[name]+dis[name]*a;
+ break;
+ case 'ease-in':
+ var a=n/count;
+ var cur=start[name]+dis[name]*a*a*a;
+ break;
+ case 'ease-out':
+ var a=1-n/count;
+ var cur=start[name]+dis[name]*(1-a*a*a);
+ break;
+ }
+
+ if(name=='opacity'){
+ obj.style.opacity=cur;
+ obj.style.filter='alpha(opacity:'+cur*100+')';
+ }else{
+ obj.style[name]=cur+'px';
+ }
+ }
+
+ if(n==count){
+ clearInterval(obj.timer);
+ options.complete && options.complete();
+ }
+ },30);
+ },
+ getStyle: function(obj,name){
+ return (obj.currentStyle || getComputedStyle(obj,false))[name];
+ },
+ //随机数
+ rnd: function(n,m){
+ return parseInt(Math.random()*(m-n)+n);
+ },
+ //在数组中找
+ finInArr: function(arr,n){
+ for(var i = 0 ; i < arr.length; i++){
+ if(arr[i] == n){//存在
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+ })
+})(jQuery,window,document);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 9e575e7..ab20d5c 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -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){
@@ -848,74 +848,38 @@ var X = window.X || {
var data = {
"authDataPowers":[
- {
- title: '全部事件'
- ,id: -1
- }
+
],
"authRoles":[
- {
- title:"管理员",
- id:0
- },
- {
- title:"分析师",
- id:1
- },
- {
- title:"普通成员",
- id:2
- },
+
],
"userlist":[
- {
- loginName: "aaa",
- status: 1,
- userId: 2,
- userName: "aaa",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- },
- {
- loginName: "bbb",
- status: 1,
- userId: 2,
- userName: "bbb",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- },
- {
- loginName: "ccc",
- status: 1,
- userId: 2,
- userName: "ccc",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- },{
- loginName: "csv",
- status: 1,
- userId: 2,
- userName: "c15",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- }
+
]
}
X.api("user/all_account","get",{},function(d){
- console.log(d)
+ data['userlist'] = d
X.laytpldata("#addexistuser-con-user-box-dot",d,".addexistuser-con-user-box");
- })
+ });
-
+ X.api("project/members","get",{},function(d){
+ console.log(d)
+ // X.laytpldata("#addexistuser-con-user-box-dot",d,".addexistuser-con-user-box");
+ });
+
+ X.api("authz/roles","get",{},function(d){
+ var projectrolearrlist = [];
+ for(let i in d){
+ var arr={
+ id:d[i]['_id'],
+ title:d[i]['name'],
+ game:d[i]['game']
+ }
+ projectrolearrlist.push(arr);
+ };
+ data['authRoles'] = projectrolearrlist;
+ })
$('.addexistuser-con-ss-box input').bind('input propertychange', function() {
var txt = $(this).val();
@@ -937,13 +901,13 @@ var X = window.X || {
X.laytpldata("#addexistuser-con-user-box-dot",data.userlist,".addexistuser-con-user-box");
$(".addexistuser-con-ss-cha").hide();
}
- })
+ });
$(".addexistuser-con-ss-cha").click(function(){
$(".addexistuser-con-ss-box input").val("");
$(".addexistuser-con-ss-cha").hide();
X.laytpldata("#addexistuser-con-user-box-dot",data.userlist,".addexistuser-con-user-box");
- })
+ });
var Addeddate = []; //以选中人员
$("body").on("click",".addexistuser-con-user-list-box img",function(){
@@ -975,12 +939,12 @@ var X = window.X || {
Addeddate.splice(i,1);
}
}
-
+ console.log(Addeddate)
X.laytpldata("#addexistuser-table-con-list-dot",Addeddate,".addexistuser-table-con-list");
addlaydropdown();
- })
+ });
$("body").on("click",".addexistuser-table-tit-cz img",function(){
var index = $(this).attr("data-index");
@@ -994,21 +958,21 @@ var X = window.X || {
}
X.laytpldata("#addexistuser-table-con-list-dot",Addeddate,".addexistuser-table-con-list");
addlaydropdown();
- })
+ });
var cprojectindex = '';//获取点击的项目角色的index
var cprojectdiv = '';//获取点击的项目角色的div
$("body").on("click",".addexistuser-role span",function(){
cprojectindex = $(this).attr("data-index");
cprojectdiv = $(this);
- })
+ });
var cdatarightsindex = "";//获取点击的数据权限index
var cdatarightsdiv = "";//获取点击的数据权限div
$("body").on("click",".addexistuser-attr span",function(){
cdatarightsindex = $(this).attr("data-index");
cdatarightsdiv = $(this);
- })
+ });
function usertxtdate(){
var userdata = data["userlist"];
@@ -1024,14 +988,14 @@ var X = window.X || {
}
arr.splice(index,1);
X.laytpldata("#addexistuser-con-user-box-dot",arr,".addexistuser-con-user-box");
- }
+ };
//给项目角色，数据权限添加下拉框
function addlaydropdown(){
X.laydropdown(".addexistuser-role",data["authRoles"],function(d){
cprojectdiv.html(d.title);
- Addeddate[cprojectindex]['projectroleid'] = d.id;
- Addeddate[cprojectindex]['projectroletit'] = d.title;
+ Addeddate[cprojectindex]['role_id'] = d.id;
+ Addeddate[cprojectindex]['role_tit'] = d.title;
})
X.laydropdown(".addexistuser-attr",data["authDataPowers"],function(d){
@@ -1039,21 +1003,34 @@ var X = window.X || {
Addeddate[cdatarightsindex]['datarightsid'] = d.id;
Addeddate[cdatarightsindex]['datarightstit'] = d.title;
})
- }
+ };
//叉图标
$(".addexistuser-top-box img").click(function(){
layer.closeAll();
- })
+ });
// 取消按钮
$(".addexistuser-btn-qx").click(function(){
layer.closeAll();
- })
+ });
//确定按钮
$(".addexistuser-btn-qd").click(function(){
console.log(Addeddate);
- // layer.closeAll();
- })
+ var ylist = [];
+ for(let i in Addeddate){
+ var arr = {
+ username:Addeddate[i]['name'],
+ role_id:Addeddate[i]['role_id'],
+ game:X.DATA.game
+ }
+ ylist.push(arr)
+ }
+ console.log(ylist);
+ X.api("authz/add_role_domain","post",{data:ylist},function(d){
+ console.log(d)
+ layer.closeAll();
+ });
+ });
}
};
@@ -1127,14 +1104,21 @@ var X = window.X || {
layer.closeAll();
})
- var projectrolearr;
- X.api("authority/all_role","get",{},function(d){
- projectrolearr = d.dom_role;
+ var projectrolearr,projectrolearrlist=[];
+ X.api("authz/roles","get",{},function(d){
+ projectrolearr = d;
+ for(let i in projectrolearr){
+ var arr={
+ id:projectrolearr[i]['_id'],
+ title:projectrolearr[i]['name'],
+ game:projectrolearr[i]['game']
+ }
+ projectrolearrlist.push(arr);
+ }
})
var datarightsarr;
X.api("data_auth/list","get",{},function(d){
datarightsarr = d;
- console.log(datarightsarr)
})
var adduserData =[]; //以创建账号
@@ -1144,13 +1128,12 @@ var X = window.X || {
for(let i in titarr){
var arr = {
"username": titarr[i],
- "role_name": projectrolearr[0]["title"],
+ "role_name": projectrolearr[0]["name"],
"data_authority":datarightsarr[0]["title"],
"data_auth_id":datarightsarr[0]["id"]
}
adduserData.push(arr);
}
- console.log(adduserData);
update();
$(".adduser-subject-add-box input").val("");
})
@@ -1180,19 +1163,20 @@ var X = window.X || {
function update(){
X.laytpldata("#adduser-table-con-box-dot",adduserData,".adduser-table-con-box");
// 项目角色修改
- console.log(projectrolearr);
- X.laydropdown(".adduser-role",projectrolearr,function(d){
- cprojectdiv.html(d.title);
+ // console.log(projectrolearrlist);
- adduserData[cprojectindex]['role_name'] = d.title;
- })
+ // X.laydropdown(".adduser-role",projectrolearrlist,function(d){
+ // cprojectdiv.html(d.title);
+
+ // adduserData[cprojectindex]['role_name'] = d.title;
+ // })
// 数据权限修改
- X.laydropdown(".adduser-attr",datarightsarr,function(d){
- cdatarightsdiv.html(d.title);
- console.log(d)
- adduserData[cdatarightsindex]['data_authority'] = d.title;
- adduserData[cdatarightsindex]['data_auth_id'] = d.id;
- })
+ // X.laydropdown(".adduser-attr",datarightsarr,function(d){
+ // cdatarightsdiv.html(d.title);
+ // console.log(d)
+ // adduserData[cdatarightsindex]['data_authority'] = d.title;
+ // adduserData[cdatarightsindex]['data_auth_id'] = d.id;
+ // })
}
$("body").on("click",".adduser-but-box .adduser-btn",function(){
@@ -1202,11 +1186,15 @@ var X = window.X || {
$("body").on("click",".adduser-but-box .adduser-btn2",function(){
console.log(adduserData);
- if(adduserData.length > 0){
- X.api("authority/add_account","post",{accounts:adduserData,project_id: X.DATA.projectid},function(d){
- layer.msg("创建成功");
+ var namearr = [];
+ for(let i in adduserData){
+ namearr.push(adduserData[i]['username']);
+ }
+ if(namearr.length > 0){
+ X.api("user/add_account","post",{account_list:namearr},function(d){
X.pageLogic.useradmin.useradmin();
layer.closeAll();
+ layer.msg("创建成功");
})
}else {
layer.msg("请先添加账号");
@@ -3468,13 +3456,19 @@ var X = window.X || {
});
// 时间控件渲染
- X.daterender(".tab-right-box .time");
+ X.daterender(".tab-right-box .time",function(start, end, label) {
+ var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
+ var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
+ // console.log(startTime);
+ // console.log(endTime);
+ });
// X.echartsdata("#charts");
//更新时间按钮
$(".updatetime").click(function(){
X.updatatime(".updatetime");
+ me.gettabledata();
});
//管理我创建的看板
@@ -3793,7 +3787,6 @@ var X = window.X || {
})
}
}
- console.log(eventdata);
if(eventdata.length > 0){
for(var z in eventdata){
if(id){
@@ -3925,6 +3918,11 @@ var X = window.X || {
}
}
}
+ // $(".layui-col").Tdrag({
+ // scope:".layui-row",
+ // pos:true,
+ // dragChange:true
+ // });
})
},
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 5bc02a7..4b4e452 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -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){
diff --git a/web/srczip/logic/addexistuser.js b/web/srczip/logic/addexistuser.js
index be04e3c..757a4cb 100644
--- a/web/srczip/logic/addexistuser.js
+++ b/web/srczip/logic/addexistuser.js
@@ -4,74 +4,38 @@
var data = {
"authDataPowers":[
- {
- title: '全部事件'
- ,id: -1
- }
+
],
"authRoles":[
- {
- title:"管理员",
- id:0
- },
- {
- title:"分析师",
- id:1
- },
- {
- title:"普通成员",
- id:2
- },
+
],
"userlist":[
- {
- loginName: "aaa",
- status: 1,
- userId: 2,
- userName: "aaa",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- },
- {
- loginName: "bbb",
- status: 1,
- userId: 2,
- userName: "bbb",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- },
- {
- loginName: "ccc",
- status: 1,
- userId: 2,
- userName: "ccc",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- },{
- loginName: "csv",
- status: 1,
- userId: 2,
- userName: "c15",
- projectroleid: 1,
- projectroletit: "管理员",
- datarightsid: -1,
- datarightstit: "全部事件"
- }
+
]
}
X.api("user/all_account","get",{},function(d){
- console.log(d)
+ data['userlist'] = d
X.laytpldata("#addexistuser-con-user-box-dot",d,".addexistuser-con-user-box");
- })
+ });
-
+ X.api("project/members","get",{},function(d){
+ console.log(d)
+ // X.laytpldata("#addexistuser-con-user-box-dot",d,".addexistuser-con-user-box");
+ });
+
+ X.api("authz/roles","get",{},function(d){
+ var projectrolearrlist = [];
+ for(let i in d){
+ var arr={
+ id:d[i]['_id'],
+ title:d[i]['name'],
+ game:d[i]['game']
+ }
+ projectrolearrlist.push(arr);
+ };
+ data['authRoles'] = projectrolearrlist;
+ })
$('.addexistuser-con-ss-box input').bind('input propertychange', function() {
var txt = $(this).val();
@@ -93,13 +57,13 @@
X.laytpldata("#addexistuser-con-user-box-dot",data.userlist,".addexistuser-con-user-box");
$(".addexistuser-con-ss-cha").hide();
}
- })
+ });
$(".addexistuser-con-ss-cha").click(function(){
$(".addexistuser-con-ss-box input").val("");
$(".addexistuser-con-ss-cha").hide();
X.laytpldata("#addexistuser-con-user-box-dot",data.userlist,".addexistuser-con-user-box");
- })
+ });
var Addeddate = []; //以选中人员
$("body").on("click",".addexistuser-con-user-list-box img",function(){
@@ -131,12 +95,12 @@
Addeddate.splice(i,1);
}
}
-
+ console.log(Addeddate)
X.laytpldata("#addexistuser-table-con-list-dot",Addeddate,".addexistuser-table-con-list");
addlaydropdown();
- })
+ });
$("body").on("click",".addexistuser-table-tit-cz img",function(){
var index = $(this).attr("data-index");
@@ -150,21 +114,21 @@
}
X.laytpldata("#addexistuser-table-con-list-dot",Addeddate,".addexistuser-table-con-list");
addlaydropdown();
- })
+ });
var cprojectindex = '';//获取点击的项目角色的index
var cprojectdiv = '';//获取点击的项目角色的div
$("body").on("click",".addexistuser-role span",function(){
cprojectindex = $(this).attr("data-index");
cprojectdiv = $(this);
- })
+ });
var cdatarightsindex = "";//获取点击的数据权限index
var cdatarightsdiv = "";//获取点击的数据权限div
$("body").on("click",".addexistuser-attr span",function(){
cdatarightsindex = $(this).attr("data-index");
cdatarightsdiv = $(this);
- })
+ });
function usertxtdate(){
var userdata = data["userlist"];
@@ -180,14 +144,14 @@
}
arr.splice(index,1);
X.laytpldata("#addexistuser-con-user-box-dot",arr,".addexistuser-con-user-box");
- }
+ };
//给项目角色，数据权限添加下拉框
function addlaydropdown(){
X.laydropdown(".addexistuser-role",data["authRoles"],function(d){
cprojectdiv.html(d.title);
- Addeddate[cprojectindex]['projectroleid'] = d.id;
- Addeddate[cprojectindex]['projectroletit'] = d.title;
+ Addeddate[cprojectindex]['role_id'] = d.id;
+ Addeddate[cprojectindex]['role_tit'] = d.title;
})
X.laydropdown(".addexistuser-attr",data["authDataPowers"],function(d){
@@ -195,21 +159,34 @@
Addeddate[cdatarightsindex]['datarightsid'] = d.id;
Addeddate[cdatarightsindex]['datarightstit'] = d.title;
})
- }
+ };
//叉图标
$(".addexistuser-top-box img").click(function(){
layer.closeAll();
- })
+ });
// 取消按钮
$(".addexistuser-btn-qx").click(function(){
layer.closeAll();
- })
+ });
//确定按钮
$(".addexistuser-btn-qd").click(function(){
console.log(Addeddate);
- // layer.closeAll();
- })
+ var ylist = [];
+ for(let i in Addeddate){
+ var arr = {
+ username:Addeddate[i]['name'],
+ role_id:Addeddate[i]['role_id'],
+ game:X.DATA.game
+ }
+ ylist.push(arr)
+ }
+ console.log(ylist);
+ X.api("authz/add_role_domain","post",{data:ylist},function(d){
+ console.log(d)
+ layer.closeAll();
+ });
+ });
}
};
diff --git a/web/srczip/logic/adduser.js b/web/srczip/logic/adduser.js
index c518436..cbb9dab 100644
--- a/web/srczip/logic/adduser.js
+++ b/web/srczip/logic/adduser.js
@@ -6,14 +6,21 @@
layer.closeAll();
})
- var projectrolearr;
- X.api("authority/all_role","get",{},function(d){
- projectrolearr = d.dom_role;
+ var projectrolearr,projectrolearrlist=[];
+ X.api("authz/roles","get",{},function(d){
+ projectrolearr = d;
+ for(let i in projectrolearr){
+ var arr={
+ id:projectrolearr[i]['_id'],
+ title:projectrolearr[i]['name'],
+ game:projectrolearr[i]['game']
+ }
+ projectrolearrlist.push(arr);
+ }
})
var datarightsarr;
X.api("data_auth/list","get",{},function(d){
datarightsarr = d;
- console.log(datarightsarr)
})
var adduserData =[]; //以创建账号
@@ -23,13 +30,12 @@
for(let i in titarr){
var arr = {
"username": titarr[i],
- "role_name": projectrolearr[0]["title"],
+ "role_name": projectrolearr[0]["name"],
"data_authority":datarightsarr[0]["title"],
"data_auth_id":datarightsarr[0]["id"]
}
adduserData.push(arr);
}
- console.log(adduserData);
update();
$(".adduser-subject-add-box input").val("");
})
@@ -59,19 +65,20 @@
function update(){
X.laytpldata("#adduser-table-con-box-dot",adduserData,".adduser-table-con-box");
// 项目角色修改
- console.log(projectrolearr);
- X.laydropdown(".adduser-role",projectrolearr,function(d){
- cprojectdiv.html(d.title);
+ // console.log(projectrolearrlist);
- adduserData[cprojectindex]['role_name'] = d.title;
- })
+ // X.laydropdown(".adduser-role",projectrolearrlist,function(d){
+ // cprojectdiv.html(d.title);
+
+ // adduserData[cprojectindex]['role_name'] = d.title;
+ // })
// 数据权限修改
- X.laydropdown(".adduser-attr",datarightsarr,function(d){
- cdatarightsdiv.html(d.title);
- console.log(d)
- adduserData[cdatarightsindex]['data_authority'] = d.title;
- adduserData[cdatarightsindex]['data_auth_id'] = d.id;
- })
+ // X.laydropdown(".adduser-attr",datarightsarr,function(d){
+ // cdatarightsdiv.html(d.title);
+ // console.log(d)
+ // adduserData[cdatarightsindex]['data_authority'] = d.title;
+ // adduserData[cdatarightsindex]['data_auth_id'] = d.id;
+ // })
}
$("body").on("click",".adduser-but-box .adduser-btn",function(){
@@ -81,11 +88,15 @@
$("body").on("click",".adduser-but-box .adduser-btn2",function(){
console.log(adduserData);
- if(adduserData.length > 0){
- X.api("authority/add_account","post",{accounts:adduserData,project_id: X.DATA.projectid},function(d){
- layer.msg("创建成功");
+ var namearr = [];
+ for(let i in adduserData){
+ namearr.push(adduserData[i]['username']);
+ }
+ if(namearr.length > 0){
+ X.api("user/add_account","post",{account_list:namearr},function(d){
X.pageLogic.useradmin.useradmin();
layer.closeAll();
+ layer.msg("创建成功");
})
}else {
layer.msg("请先添加账号");
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 0b8920c..afd3d23 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -70,13 +70,19 @@
});
// 时间控件渲染
- X.daterender(".tab-right-box .time");
+ X.daterender(".tab-right-box .time",function(start, end, label) {
+ var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
+ var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
+ // console.log(startTime);
+ // console.log(endTime);
+ });
// X.echartsdata("#charts");
//更新时间按钮
$(".updatetime").click(function(){
X.updatatime(".updatetime");
+ me.gettabledata();
});
//管理我创建的看板
@@ -395,7 +401,6 @@
})
}
}
- console.log(eventdata);
if(eventdata.length > 0){
for(var z in eventdata){
if(id){
@@ -527,6 +532,11 @@
}
}
}
+ // $(".layui-col").Tdrag({
+ // scope:".layui-row",
+ // pos:true,
+ // dragChange:true
+ // });
})
},
diff --git a/web/static/css/projectadmin.css b/web/static/css/projectadmin.css
index c260313..cc8e477 100644
--- a/web/static/css/projectadmin.css
+++ b/web/static/css/projectadmin.css
@@ -182,12 +182,12 @@
.adduser-subject-add-box div { cursor: pointer; height: 32px; line-height: 30px; padding: 0 16px; font-weight: 400; font-size: 14px; border-radius: 2px; background-color: #4fa1ff; color: #fff; }
.adduser-table-box { height: 320px; margin-top: 26px; }
.adduser-table-title { width: 100%; height: 48px; line-height: 48px; display: flex; background-color: #f7f7f7; border-bottom: 1px solid #f3f3f3; font-size: 12px; color: #202d3f;}
-.adduser-table-title div { width: 197px; text-indent: 12px; }
+.adduser-table-title div { width: 600px; text-indent: 12px; }
.adduser-table-title-cz { width: 65px !important; }
.adduser-table-con-box { height: 271px; overflow-y: auto;}
.adduser-table-con { width: 100%; height: 48px; line-height: 48px; display: flex; border-bottom: 1px solid #f3f3f3; font-size: 12px; color: #42546d; }
-.adduser-table-con div{ width: 197px; text-indent: 12px; }
+.adduser-table-con div{ width: 600px; text-indent: 12px; }
.adduser-table-title-cz img { cursor: pointer; }
.adduser-role { cursor: pointer; }
.adduser-role span { padding: 8px; border: 1px solid #f0f0f0;}
{{# } }}
diff --git a/web/src/Tdrag.js b/web/src/Tdrag.js
new file mode 100644
index 0000000..f0ab2c4
--- /dev/null
+++ b/web/src/Tdrag.js
@@ -0,0 +1,586 @@
+/*! Tdrag 0.0.1 */
+/**
+ * Created by Tezml on 2016/5/26
+ * You can modify my source code, if you have a good idea or a problem can be encountered by e-mail: tezml@tezml.com to find me.
+ * 如果你想在项目中使用该插件，请不要删除该注释。
+ */
+;(function($,window,document,undefined){
+ jQuery(function() {
+ //插件制作
+
+
+ $.fn.Tdrag = function (opt) {
+ var call = {
+ scope: null,//父级
+ grid: null,//网格
+ axis:"all",//上下或者左右
+ pos:false,//是否记住位置
+ handle:null,//手柄
+ moveClass:"tezml",//移动时不换位加的class
+ dragChange:false,//是否开启拖拽换位
+ changeMode:"point",//point & sort
+ cbStart:function(){},//移动前的回调函数
+ cbMove:function(){},//移动中的回调函数
+ cbEnd:function(){},//移动结束时候的回调函数
+ random:false,//是否自动随机排序
+ randomInput:null,//点击随机排序的按钮
+ animation_options:{//运动时的参数
+ duration:800,//每次运动的时间
+ easing:"ease-out"//移动时的特效，ease-out、ease-in、linear
+ },
+ disable:false,//禁止拖拽
+ disableInput:null//禁止拖拽的按钮
+ };
+ var dragfn = new Dragfn(this, opt);
+ if (opt && $.isEmptyObject(opt) == false) {
+ dragfn.options = $.extend(call, opt);
+ } else {
+ dragfn.options = call;
+ }
+ dragfn.firstRandom=true;
+ var ele = dragfn.$element;
+ dragfn.pack(ele,false);
+ if(dragfn.options.randomInput!=null){
+ $(dragfn.options.randomInput).bind("click",function(){
+ dragfn.pack(ele,true);
+ })
+ }
+ //加载拓展jquery的函数
+ dragfn.loadJqueryfn()
+ };
+
+ //依赖构造函数
+ var Dragfn = function (ele, opt) {
+ this.$element = ele;
+ this.options = opt;
+ };
+ //构造函数方法
+ Dragfn.prototype = {
+ init: function (obj) {
+ var self = this;
+ self.ele=self.$element;
+ self.handle=$(obj);//手柄
+ self.options = self.options;
+ self.disable = self.options.disable;
+ self._start = false;
+ self._move = false;
+ self._end = false;
+ self.disX = 0;
+ self.disY = 0;
+ self.zIndex=1000;
+ self.moving=false;
+ self.moves="";
+
+
+ //父级
+ self.box = $.type(self.options.scope)==="string" ? self.options.scope : null;
+ //手柄
+ if(self.options.handle!=null){
+ self.handle=$(obj).find(self.options.handle);
+ }
+
+ //三个事件
+ self.handle.on("mousedown", function (ev) {
+ self.start(ev, obj);
+ obj.setCapture && obj.setCapture();
+ return false;
+ });
+ if(self.options.dragChange) {
+ $(obj).on("mousemove", function (ev) {
+ self.move(ev, obj);
+ });
+ $(obj).on("mouseup", function (ev) {
+ self.end(ev, obj);
+ });
+ }else{
+ $(document).on("mousemove", function (ev) {
+ self.move(ev, obj);
+ });
+ $(document).on("mouseup", function (ev) {
+ self.end(ev, obj);
+ });
+ }
+ },
+ //jquery调取函数时候用
+ loadJqueryfn: function(){
+ var self=this;
+ $.extend({
+ //返回按照index排序的回调函数
+ sortBox:function(obj){
+ var arr=[];
+ for (var s = 0; s < $(obj).length; s++) {
+ arr.push($(obj).eq(s));
+ }
+ for ( var i = 0; i < arr.length; i++) {
+ for ( var j = i + 1; j < arr.length; j++) {
+ if(Number(arr[i].attr("index")) > Number(arr[j].attr("index"))){
+ var temp = arr[i];
+ arr[i] = arr[j];
+ arr[j] = temp;
+ }
+ }
+ }
+ return arr
+ },
+ //随机排序函数
+ randomfn:function(obj){
+ self.pack($(obj),true);
+ },
+ //开启拖拽
+ disable_open:function(){
+ self.disable=false;
+ },
+ //禁止拖拽
+ disable_cloose:function(){
+ self.disable=true;
+ }
+ });
+ },
+ toDisable: function(){
+ var self=this;
+ if(self.options.disableInput!=null){
+ $(self.options.disableInput).bind("click",function(){
+ if(self.disable==true){
+ self.disable=false
+ }else{
+ self.disable=true
+ }
+ })
+ }
+ },
+ start: function (ev, obj) {
+ var self = this;
+ self.moved=obj;
+ if (self.disable == true) {
+ return false
+ }
+ self._start = true;
+ var oEvent = ev || event;
+ self.disX = oEvent.clientX - obj.offsetLeft;
+ self.disY = oEvent.clientY - obj.offsetTop;
+ $(obj).css("zIndex",self.zIndex++);
+ self.options.cbStart();
+ },
+ move: function (ev, obj) {
+ var self = this;
+ if (self._start != true) {
+ return false
+ }
+ if(obj!=self.moved){
+ return false
+ }
+ self._move = true;
+ var oEvent = ev || event;
+ var l = oEvent.clientX - self.disX;
+ var t = oEvent.clientY - self.disY;
+ //有父级限制
+ if (self.box != null) {
+ var rule = self.collTestBox(obj,self.box);
+ if (l > rule.lmax) {
+ l = rule.lmax;
+ } else if (l < rule.lmin) {
+ l = rule.lmin;
+ }
+ if (t > rule.tmax) {
+ t = rule.tmax;
+ } else if (t < rule.tmin) {
+ t = rule.tmin;
+ }
+ }
+ if(self.options.axis=="all"){
+ obj.style.left = self.grid(obj, l, t).left + 'px';
+ obj.style.top = self.grid(obj, l, t).top + 'px';
+ }else if(self.options.axis=="y"){
+ obj.style.top = self.grid(obj, l, t).top + 'px';
+ }else if(self.options.axis=="x"){
+ obj.style.left = self.grid(obj, l, t).left + 'px';
+ }
+ /* if(self.options.changeWhen=="move") {
+ if (self.options.changeMode == "sort") {
+ self.sortDrag(obj);
+ } else if (self.options.changeMode == "point") {
+ self.pointmoveDrag(obj);
+ }
+ }else{
+ self.moveAddClass(obj);
+ }*/
+ if(self.options.pos==true){
+ self.moveAddClass(obj);
+ }
+ self.options.cbMove(obj,self);
+
+ },
+ end: function (ev, obj) {
+ var self = this;
+ if (self._start != true) {
+ return false
+ }
+ if(self.options.changeMode=="sort"&&self.options.pos==true){
+ self.sortDrag(obj);
+ }else if(self.options.changeMode=="point"&&self.options.pos==true){
+ self.pointDrag(obj);
+ }
+ if(self.options.pos==true){
+ self.animation(obj, self.aPos[$(obj).attr("index")]);
+ }
+ self.options.cbEnd();
+ if(self.options.handle!=null){
+ $(obj).find(self.options.handle).unbind("onmousemove");
+ $(obj).find(self.options.handle).unbind("onmouseup");
+ }else{
+ $(obj).unbind("onmousemove");
+ $(obj).unbind("onmouseup");
+ }
+ obj.releaseCapture && obj.releaseCapture();
+ self._start = false;
+
+ },
+ //算父级的宽高
+ collTestBox: function (obj, obj2) {
+ var self = this;
+ var l1 = 0;
+ var t1 = 0;
+ var l2 = $(obj2).innerWidth() - $(obj).outerWidth();
+ var t2 = $(obj2).innerHeight() - $(obj).outerHeight();
+ return {
+ lmin: l1,//取的l最小值
+ tmin: t1,//取的t最小值
+ lmax: l2,//取的l最大值
+ tmax: t2//取的t最大值
+ }
+
+ },
+ //算父级宽高时候干掉margin
+ grid: function (obj, l, t) {//cur:[width,height]
+ var self = this;
+ var json = {
+ left: l,
+ top: t
+ };
+ if ($.isArray(self.options.grid) && self.options.grid.length == 2) {
+ var gx = self.options.grid[0];
+ var gy = self.options.grid[1];
+ json.left = Math.floor((l + gx / 2) / gx) * gx;
+ json.top = Math.floor((t + gy / 2) / gy) * gy;
+ return json
+ } else if (self.options.grid == null) {
+ return json
+ } else {
+ console.log("grid参数传递格式错误");
+ return false
+ }
+ },
+ findNearest: function(obj){
+ var self=this;
+ var iMin=new Date().getTime();
+ var iMinIndex=-1;
+ var ele=self.ele;
+ for(var i=0;i