This commit is contained in:
罗松柏 2021-08-30 11:47:29 +08:00
parent 72f9ac5401
commit e0fe4298d8
11 changed files with 63 additions and 36 deletions

View File

@ -40,7 +40,7 @@
<script id="addrole-info-table-con-dot" type="text/html">
{{# layui.each(d, function(index, item){ }}
<div class="projectadmin-info-table-left">
<input type="checkbox" name="{{item._id}}" lay-skin="primary" title="{{item.name}}" data-api="{{item.path}}">
<input type="checkbox" name="{{item.path}}" lay-skin="primary" title="{{item.name}}" data-api="{{item.path}}">
</div>
<!-- <div class="projectadmin-info-table-con">
<div class="projectadmin-info-table-left">

View File

@ -4,7 +4,7 @@
{{# if(d.modelsize === "small"){ }}
<!-- <div class="layui-col-md3" id="model{{d.id}}"> -->
<div class="layui-card">
<div class="layui-card modify-layui-card-small">
<div class="row-top controlhover">
<div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
@ -58,7 +58,7 @@
{{# if(d.modeltype === "table"){ }}
<!-- <div class="layui-col-md6" style="float: none;"> -->
<div class="layui-card">
<div class="layui-card modify-layui-card">
<div class="row-top controlhover">
<div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
@ -202,7 +202,7 @@
</div>
{{# } else { }}
<div class="layui-card">
<div class="layui-card modify-layui-card">
<div class="row-top controlhover">
<div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.name}}</a></p>
@ -242,6 +242,11 @@
{{# } }}
{{# } }}
{{# } }}
<div class="xian"></div>
<span class="model-screen" >指标</span>
</div>
<div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
<img src="./static/img/qvshitu.png" /> <span>趋势图</span>

View File

@ -50,7 +50,7 @@
<div class="projectadmin-con-hz-right-box">
<div class="projectadmin-con-hz-right-box-top">
<p class="projectadmin-list-name">xxx</p>
<div class="projectadmin-con-hz-right-box-top-right">
<div class="projectadmin-con-hz-right-box-top-right" style="display: flex; align-items: center;">
<span>最近更新2021-05-07 13:57:30</span>
<div><a class="ajax-content" href="addrole" data-id="projectadmin-con-box"> <i class="layui-icon layui-icon-addition" style="position: relative; top: 1px;"></i> 创建角色 </a> </div>
</div>
@ -92,9 +92,9 @@
</div>
<div class="projectadmin-info-table-right">
{{# if(item.is_authz === true){ }}
<div class="projectadmin-del" data-index="{{index}}" data-path="{{item.path}}" data-id="{{item._id}}" >删除</div>
<div class="projectadmin-del" data-index="{{index}}" data-path="{{item.path}}" data-path="{{item.path}}" >删除</div>
{{# } else { }}
<div class="projectadmin-edit" data-index="{{index}}" data-id="{{item._id}}" >添加</div>
<div class="projectadmin-edit" data-index="{{index}}" data-path="{{item.path}}" >添加</div>
{{# } }}
</div>
</div>

View File

@ -33,6 +33,15 @@
</div>
</div>
<div class="setupbaobiao-left-from-list-box">
<span class="setupbaobiao-left-from-list-title">x轴y轴切换</span>
<div class="setupbaobiao-left-from-list-radio-box">
<div>
<input type="radio" name="xyswitch" value="true" id="xyswitch">开启
</div>
</div>
</div>
<div class="setupbaobiao-left-from-list-box">
<span class="setupbaobiao-left-from-list-title">报表备注</span>
<div class="setupbaobiao-left-from-list-input">

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

@ -115,8 +115,9 @@ var X = window.X || {
};
(function(){
// var ipurl = "http://10.0.0.77:7889/api/v1/";
//本地
// var ipurl = "http://10.0.0.77:7889/api/v1/";
//线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
//设置或读取登录缓存需要保存到localStorage防止刷新时候登录数据丢失
@ -1314,11 +1315,13 @@ var X = window.X || {
$(".addrole-qd").click(function(){
var tit = $(".addrole-tit").val();
var addroledata = layui.form.val("addroleexample");
console.log(addroledata);
var dataArr =[];
for(let i in addroledata){
dataArr.push(i);
}
// console.log(addroledata);
// console.log(dataArr);
if(passdata){
// X.api("authz/add_roles","post",{name:tit,game:X['DATA']['game'],desc:'111'},function(d){
@ -6853,6 +6856,7 @@ var X = window.X || {
for(let i in d){
d[i]["firs"] = d[i]['name'].substring(0,1);
d[i]["authority"] = "r";
d[i]['user_id'] = d[i]['_id']
}
for(let i in adduadaserarr){
for(let j in d){
@ -6901,7 +6905,11 @@ var X = window.X || {
d[i]["authority"] = "r";
}
userarr = d;
X.DATA['userarr'] = d;
for(let i in userarr){
userarr[i]['user_id'] = userarr[i]['_id']
}
console.log(userarr);
X.DATA['userarr'] = userarr;
me.updatauserarr();
});
}
@ -6949,12 +6957,12 @@ var X = window.X || {
var userid = $(this).attr('data-id');
for(let i in userarr){
if(userarr[i]["_id"] == userid){
// userarr[i]
adduadaserarr.push(userarr[i]);
// adduadaserarr.push({'user_id':userid});
userarr.splice(i,1);
}
}
console.log(adduadaserarr);
X.DATA['adduadaserarr'] = adduadaserarr;
X.DATA['userarr'] = userarr;
me.updatauserarr();
@ -7858,7 +7866,7 @@ var X = window.X || {
$(document).off('click','.projectadmin-del').on('click','.projectadmin-del',function(){
var index = $(this).attr('data-index');
var id = $(this).attr('data-id');
var path = $(this).attr('data-path');
layer.confirm('确认删除当前api吗', {
btn: ['取消','删除 '] //按钮
}, function(){
@ -7866,7 +7874,7 @@ var X = window.X || {
layer.close(layer.index);
}, function(){
//删除
X.api("authz/del_policy",'post',{role_id:role_id,game:X['DATA']['game'],path:id,act:"*"},function(d){
X.api("authz/del_policy",'post',{role_id:role_id,game:X['DATA']['game'],path:path,act:"*"},function(d){
layer.msg('删除成功');
layer.close(layer.index);
updataapiinfo(role_id);
@ -7875,9 +7883,9 @@ var X = window.X || {
});
$(document).off('click','.projectadmin-edit').on('click','.projectadmin-edit',function(params){
var id = $(this).attr('data-id');
var path = $(this).attr('data-path');
var arr = [];
arr.push(id);
arr.push(path);
X.api("authz/add_policy",'post',{role_id:role_id,game:X['DATA']['game'],path_list:arr,act:"*"},function(d){
layer.close(layer.index);
layer.msg('添加成功');
@ -10068,9 +10076,6 @@ var X = window.X || {
var startmonth = Date.parse(startdate)/1000;
postdata[0]['query']['e_days'] = parseInt((sameday - endmonth)/86400);
postdata[0]['query']['s_days'] = parseInt((sameday - startmonth)/86400);
console.log(startTime);
console.log(endTime);
});
// 分析时间粒度
@ -10103,7 +10108,7 @@ var X = window.X || {
graph_size:modelsize
}
}
console.log(arr);
X.api('dashboard/edit_report','post',arr,function(d){
console.log(d);
var reportedit = {

View File

@ -114,8 +114,9 @@ var X = window.X || {
};
(function(){
// var ipurl = "http://10.0.0.77:7889/api/v1/";
//本地
// var ipurl = "http://10.0.0.77:7889/api/v1/";
//线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
//设置或读取登录缓存需要保存到localStorage防止刷新时候登录数据丢失

View File

@ -28,11 +28,13 @@
$(".addrole-qd").click(function(){
var tit = $(".addrole-tit").val();
var addroledata = layui.form.val("addroleexample");
console.log(addroledata);
var dataArr =[];
for(let i in addroledata){
dataArr.push(i);
}
// console.log(addroledata);
// console.log(dataArr);
if(passdata){
// X.api("authz/add_roles","post",{name:tit,game:X['DATA']['game'],desc:'111'},function(d){

View File

@ -34,6 +34,7 @@
for(let i in d){
d[i]["firs"] = d[i]['name'].substring(0,1);
d[i]["authority"] = "r";
d[i]['user_id'] = d[i]['_id']
}
for(let i in adduadaserarr){
for(let j in d){
@ -82,7 +83,11 @@
d[i]["authority"] = "r";
}
userarr = d;
X.DATA['userarr'] = d;
for(let i in userarr){
userarr[i]['user_id'] = userarr[i]['_id']
}
console.log(userarr);
X.DATA['userarr'] = userarr;
me.updatauserarr();
});
}
@ -130,12 +135,12 @@
var userid = $(this).attr('data-id');
for(let i in userarr){
if(userarr[i]["_id"] == userid){
// userarr[i]
adduadaserarr.push(userarr[i]);
// adduadaserarr.push({'user_id':userid});
userarr.splice(i,1);
}
}
console.log(adduadaserarr);
X.DATA['adduadaserarr'] = adduadaserarr;
X.DATA['userarr'] = userarr;
me.updatauserarr();

View File

@ -44,7 +44,7 @@
$(document).off('click','.projectadmin-del').on('click','.projectadmin-del',function(){
var index = $(this).attr('data-index');
var id = $(this).attr('data-id');
var path = $(this).attr('data-path');
layer.confirm('确认删除当前api吗', {
btn: ['取消','删除 '] //按钮
}, function(){
@ -52,7 +52,7 @@
layer.close(layer.index);
}, function(){
//删除
X.api("authz/del_policy",'post',{role_id:role_id,game:X['DATA']['game'],path:id,act:"*"},function(d){
X.api("authz/del_policy",'post',{role_id:role_id,game:X['DATA']['game'],path:path,act:"*"},function(d){
layer.msg('删除成功');
layer.close(layer.index);
updataapiinfo(role_id);
@ -61,9 +61,9 @@
});
$(document).off('click','.projectadmin-edit').on('click','.projectadmin-edit',function(params){
var id = $(this).attr('data-id');
var path = $(this).attr('data-path');
var arr = [];
arr.push(id);
arr.push(path);
X.api("authz/add_policy",'post',{role_id:role_id,game:X['DATA']['game'],path_list:arr,act:"*"},function(d){
layer.close(layer.index);
layer.msg('添加成功');

View File

@ -48,9 +48,6 @@
var startmonth = Date.parse(startdate)/1000;
postdata[0]['query']['e_days'] = parseInt((sameday - endmonth)/86400);
postdata[0]['query']['s_days'] = parseInt((sameday - startmonth)/86400);
console.log(startTime);
console.log(endTime);
});
// 分析时间粒度
@ -83,7 +80,7 @@
graph_size:modelsize
}
}
console.log(arr);
X.api('dashboard/edit_report','post',arr,function(d){
console.log(d);
var reportedit = {

View File

@ -22,6 +22,9 @@
.layui-anim-downbit { max-height: 350px; overflow-y: auto; overflow-x: hidden; }
/* .layui-nav .layui-nav-child dd.layui-this a, .layui-nav-child dd.layui-this { background-color: #f6f8fa !important; } */
.controlhover:hover > .control { display: block; }
/* .layui-card { min-height: 388px; } */
.modify-layui-card-small { height: 186px; }
.modify-layui-card { height: 388px; }
::-webkit-scrollbar {
width:5px;
@ -158,7 +161,7 @@
.thesum { margin-right: 24px; }
.echarts-box { padding: 0 24px; margin-top: 10px; height: 204px; }
.layui-card:last-child { padding-bottom: 12px; }
.echarts { width: 100%; height: 204px; }
.echarts { width: 100%; height: 250px; }
.control { height: 21px; display: block; }
.tool-show .control { display: block; }