前端
This commit is contained in:
parent
5ca4d18580
commit
c045a7ee44
@ -809,3 +809,40 @@
|
||||
|
||||
{{# } }}
|
||||
</script>
|
||||
|
||||
<!-- 看板模板外框 -->
|
||||
<script id="kanban-model-box-dot" type="text/html">
|
||||
|
||||
{{# if(d.graph_size === "small"){ }}
|
||||
|
||||
<div class="layui-col-md3" id="model{{d.report_id}}">
|
||||
|
||||
</div>
|
||||
|
||||
{{# } else { }}
|
||||
|
||||
{{# if(d.graph_type === "table"){ }}
|
||||
|
||||
{{# if(d.graph_size === "large"){ }}
|
||||
<div class="layui-col-md12" id="model{{d.report_id}}">
|
||||
{{# } else { }}
|
||||
<div class="layui-col-md6" id="model{{d.report_id}}">
|
||||
{{# } }}
|
||||
|
||||
</div>
|
||||
|
||||
{{# } else { }}
|
||||
{{# if(d.graph_size === "large"){ }}
|
||||
<div class="layui-col-md12" id="model{{d.report_id}}">
|
||||
{{# } else { }}
|
||||
<div class="layui-col-md6" id="model{{d.report_id}}">
|
||||
{{# } }}
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
{{# } }}
|
||||
|
||||
|
||||
{{# } }}
|
||||
</script>
|
||||
|
||||
@ -24,6 +24,14 @@
|
||||
<input type="radio" name="graph_size" value="small" title="小图" lay-filter="graph_size">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">顺序</label>
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" name="sort" lay-verify="sort" autocomplete="off" placeholder="请输入显示顺序" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<div class="layui-card">
|
||||
<div class="row-top">
|
||||
<div class="row-tit">
|
||||
<p><a href="javascript:;" class="gobaobiaoinfo">{{d.name}}</a></p>
|
||||
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}">{{d.name}}</a></p>
|
||||
</div>
|
||||
<div class="control">
|
||||
<div class="action-box" >
|
||||
@ -57,7 +57,7 @@
|
||||
<div class="layui-card">
|
||||
<div class="row-top">
|
||||
<div class="row-tit">
|
||||
<p><a href="javascript:;" class="gobaobiaoinfo">{{d.name}}</a></p>
|
||||
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}">{{d.name}}</a></p>
|
||||
</div>
|
||||
<div class="control">
|
||||
<div class="action-box" >
|
||||
@ -143,14 +143,14 @@
|
||||
<div class="layui-card">
|
||||
<div class="row-top">
|
||||
<div class="row-tit">
|
||||
<p><a href="javascript:;" class="gobaobiaoinfo">{{d.name}}</a></p>
|
||||
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}">{{d.name}}</a></p>
|
||||
<div class="tishi" title="活跃用户可以通过“登录.触发用户数”来进行计算，即有登录行为的用户的去重数.">
|
||||
<img src="./static/img/tishi.png" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="control">
|
||||
<div class="action-box" >
|
||||
<div class="tishi model-gengx" title="更新">
|
||||
<div class="tishi model-gengx" data-id="{{d.id}}" title="更新">
|
||||
<img src="./static/img/gengxin.png" />
|
||||
</div>
|
||||
<div class="tishi" title="探索">
|
||||
|
||||
55
web/src/x.min.js
vendored
55
web/src/x.min.js
vendored
@ -103,8 +103,9 @@ 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/";
|
||||
// var ipurl = "10.0.0.77";
|
||||
|
||||
//设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
|
||||
X.loginCache = function(data){
|
||||
@ -3491,9 +3492,9 @@ var X = window.X || {
|
||||
//更新报表
|
||||
$(document).off('click','.model-gengx').on('click','.model-gengx',function(){
|
||||
var id = $(this).attr('data-id');
|
||||
|
||||
console.log(id);
|
||||
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
|
||||
return;
|
||||
X.pageLogic['dashboard'].fillmodeldata(d[id]);
|
||||
|
||||
})
|
||||
@ -3636,16 +3637,17 @@ var X = window.X || {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
console.log(eventdata);
|
||||
if(eventdata.length > 0){
|
||||
for(var z in eventdata){
|
||||
if(id){
|
||||
//当有id时更新对应id看板内的内容
|
||||
X.template("modeltable",id,eventdata[z],function(){
|
||||
X.pageLogic['dashboard'].morefeatures(eventdata[z]);
|
||||
});
|
||||
}else {
|
||||
X.laytpldata("#kanban-model-table-dot",eventdata[z],null,function(html){
|
||||
$('#model-box').append(html);
|
||||
//渲染模板和数据
|
||||
X.template("modeltable",'model'+eventdata[z]['id'],eventdata[z],function(){
|
||||
X.pageLogic['dashboard'].morefeatures(eventdata[z]);
|
||||
});
|
||||
}
|
||||
@ -3754,14 +3756,23 @@ var X = window.X || {
|
||||
$("#model-box").html("");//清空表格数据
|
||||
|
||||
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
|
||||
for(let z in d){
|
||||
|
||||
X.pageLogic['dashboard'].fillmodeldata(d[z]);
|
||||
|
||||
var modellist=[];
|
||||
for(let i in d){
|
||||
modellist.push(d[i]['sort']);
|
||||
}
|
||||
modellist.sort();
|
||||
for(let i in modellist){
|
||||
for(let z in d){
|
||||
if(modellist[i] == d[z]['sort']){
|
||||
//渲染模板和数据
|
||||
console.log(d[z]);
|
||||
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
|
||||
$('#model-box').append(html);
|
||||
X.pageLogic['dashboard'].fillmodeldata(d[z]);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
},
|
||||
|
||||
@ -5774,14 +5785,12 @@ var X = window.X || {
|
||||
configdata = submitdata[i];
|
||||
}
|
||||
}
|
||||
console.log(configdata);
|
||||
X.parametersopen(configdata,'kanbantypeset','auto',function(d){
|
||||
var graph_size = d['graph_size'];
|
||||
var graph_type = d['graph_type'];
|
||||
for(let i in submitdata){
|
||||
if(submitdata[i]['report_id'] == id){
|
||||
submitdata[i]['graph_type'] = graph_type;
|
||||
submitdata[i]['graph_size'] = graph_size;
|
||||
submitdata[i]['graph_type'] = d['graph_type'];
|
||||
submitdata[i]['graph_size'] = d['graph_size'];
|
||||
submitdata[i]['sort'] = d['sort'];
|
||||
}
|
||||
}
|
||||
})
|
||||
@ -5803,7 +5812,8 @@ var X = window.X || {
|
||||
graph_type: toadddata[i]['show_config']['graph_type'] || 'table',
|
||||
model:toadddata[i]['cat'],
|
||||
name:toadddata[i]['name'],
|
||||
graph_size:toadddata[i]['show_config']['graph_size'] || 'in'
|
||||
graph_size:toadddata[i]['show_config']['graph_size'] || 'in',
|
||||
sort: toadddata[i]['show_config']['sort']
|
||||
};
|
||||
submitdata.push(arr);
|
||||
}
|
||||
@ -5922,13 +5932,14 @@ var X = window.X || {
|
||||
this.parms = parms;
|
||||
this.callback = parms.callback;
|
||||
var listdata = parms.extData;
|
||||
|
||||
console.log(listdata);
|
||||
layui.form.render();
|
||||
|
||||
if(listdata){
|
||||
layui.form.val('kanbantypeexample',{
|
||||
graph_type: listdata.graph_type || 'table',
|
||||
graph_size: listdata.graph_size || 'in'
|
||||
graph_size: listdata.graph_size || 'in',
|
||||
sort: listdata.sort
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -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){
|
||||
|
||||
@ -228,9 +228,9 @@
|
||||
//更新报表
|
||||
$(document).off('click','.model-gengx').on('click','.model-gengx',function(){
|
||||
var id = $(this).attr('data-id');
|
||||
|
||||
console.log(id);
|
||||
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
|
||||
return;
|
||||
X.pageLogic['dashboard'].fillmodeldata(d[id]);
|
||||
|
||||
})
|
||||
@ -373,16 +373,17 @@
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
console.log(eventdata);
|
||||
if(eventdata.length > 0){
|
||||
for(var z in eventdata){
|
||||
if(id){
|
||||
//当有id时更新对应id看板内的内容
|
||||
X.template("modeltable",id,eventdata[z],function(){
|
||||
X.pageLogic['dashboard'].morefeatures(eventdata[z]);
|
||||
});
|
||||
}else {
|
||||
X.laytpldata("#kanban-model-table-dot",eventdata[z],null,function(html){
|
||||
$('#model-box').append(html);
|
||||
//渲染模板和数据
|
||||
X.template("modeltable",'model'+eventdata[z]['id'],eventdata[z],function(){
|
||||
X.pageLogic['dashboard'].morefeatures(eventdata[z]);
|
||||
});
|
||||
}
|
||||
@ -491,14 +492,23 @@
|
||||
$("#model-box").html("");//清空表格数据
|
||||
|
||||
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
|
||||
|
||||
for(let z in d){
|
||||
|
||||
X.pageLogic['dashboard'].fillmodeldata(d[z]);
|
||||
|
||||
var modellist=[];
|
||||
for(let i in d){
|
||||
modellist.push(d[i]['sort']);
|
||||
}
|
||||
modellist.sort();
|
||||
for(let i in modellist){
|
||||
for(let z in d){
|
||||
if(modellist[i] == d[z]['sort']){
|
||||
//渲染模板和数据
|
||||
console.log(d[z]);
|
||||
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
|
||||
$('#model-box').append(html);
|
||||
X.pageLogic['dashboard'].fillmodeldata(d[z]);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
@ -111,14 +111,12 @@
|
||||
configdata = submitdata[i];
|
||||
}
|
||||
}
|
||||
console.log(configdata);
|
||||
X.parametersopen(configdata,'kanbantypeset','auto',function(d){
|
||||
var graph_size = d['graph_size'];
|
||||
var graph_type = d['graph_type'];
|
||||
for(let i in submitdata){
|
||||
if(submitdata[i]['report_id'] == id){
|
||||
submitdata[i]['graph_type'] = graph_type;
|
||||
submitdata[i]['graph_size'] = graph_size;
|
||||
submitdata[i]['graph_type'] = d['graph_type'];
|
||||
submitdata[i]['graph_size'] = d['graph_size'];
|
||||
submitdata[i]['sort'] = d['sort'];
|
||||
}
|
||||
}
|
||||
})
|
||||
@ -140,7 +138,8 @@
|
||||
graph_type: toadddata[i]['show_config']['graph_type'] || 'table',
|
||||
model:toadddata[i]['cat'],
|
||||
name:toadddata[i]['name'],
|
||||
graph_size:toadddata[i]['show_config']['graph_size'] || 'in'
|
||||
graph_size:toadddata[i]['show_config']['graph_size'] || 'in',
|
||||
sort: toadddata[i]['show_config']['sort']
|
||||
};
|
||||
submitdata.push(arr);
|
||||
}
|
||||
|
||||
@ -5,13 +5,14 @@
|
||||
this.parms = parms;
|
||||
this.callback = parms.callback;
|
||||
var listdata = parms.extData;
|
||||
|
||||
console.log(listdata);
|
||||
layui.form.render();
|
||||
|
||||
if(listdata){
|
||||
layui.form.val('kanbantypeexample',{
|
||||
graph_type: listdata.graph_type || 'table',
|
||||
graph_size: listdata.graph_size || 'in'
|
||||
graph_size: listdata.graph_size || 'in',
|
||||
sort: listdata.sort
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user