This commit is contained in:
罗松柏 2021-09-22 11:27:19 +08:00
parent 31e4e11343
commit 687a29374b
9 changed files with 801 additions and 156 deletions

View File

@ -10,6 +10,8 @@
<link rel="stylesheet" href="./static/css/event.css" >
<link rel="stylesheet" href="./static/css/basics.css" >
<link rel="stylesheet" href="./static/css/daterangepicker.css"><!-- 时间选择控件样式 -->
<link rel="stylesheet" href="./static/css/fixed-table.css"> <!-- table -->
<!-- <link rel="stylesheet" href="./static/img/iconfont/iconfont.css"> -->
<script src="./src/jquery.min.js"></script>
<script src="./src/echarts.min.js"></script><!-- 图标控件 -->

View File

@ -13,18 +13,18 @@
<div class="time-cond">
{{# if(d.cat != "user_property"){ }}
{{# if(d.date != ""){ }}
<span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}">{{d.date}} <img src="./static/img/xiajiantou.png"> </span>
<span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}">{{d.date}}</span><img src="./static/img/xiajiantou.png">
{{# } }}
{{# if(d.cat != "scatter"){ }}
<div class="xian"></div>
<span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.timeParticleSize}} <img src="./static/img/xiajiantou.png"> </span>
<span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.timeParticleSize}}</span><img src="./static/img/xiajiantou.png">
{{# } }}
{{# if(d.cat === "retention"){ }}
<div class="xian"></div>
{{# if(d.retentiontype === 0){ }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存 <img src="./static/img/xiajiantou.png"> </span>
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span><img src="./static/img/xiajiantou.png">
{{# } else { }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失 <img src="./static/img/xiajiantou.png"> </span>
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span><img src="./static/img/xiajiantou.png">
{{# } }}
{{# } }}
{{# } }}
@ -42,17 +42,17 @@
<div class="condition-box controlhover">
<div class="time-cond">
{{# if(d.cat != "user_property"){ }}
<span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" >{{d.date}} <img src="./static/img/xiajiantou.png"> </span>
<span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" >{{d.date}}</span><img src="./static/img/xiajiantou.png">
<div class="xian"></div>
{{# if(d.date != "" && d.cat != "scatter"){ }}
<span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}" >{{d.timeParticleSize}} <img src="./static/img/xiajiantou.png"> </span>
<span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}" >{{d.timeParticleSize}}</span><img src="./static/img/xiajiantou.png">
{{# } }}
{{# if(d.cat === "retention"){ }}
<div class="xian"></div>
{{# if(d.retentiontype === 0){ }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存 <img src="./static/img/xiajiantou.png"> </span>
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span><img src="./static/img/xiajiantou.png">
{{# } else { }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失 <img src="./static/img/xiajiantou.png"> </span>
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span><img src="./static/img/xiajiantou.png">
{{# } }}
{{# } }}
{{# } }}

View File

@ -22,9 +22,591 @@
</div>
<div class="eventattradmin-table-box">
<table class="layui-hide" id="eventattradmin-table" lay-filter="eventattradmintest"></table>
<!-- <div id="eventattradmin-table" style="width: 800px;"></div> -->
<!-- <table class="layui-hide" id="eventattradmin-table" lay-filter="eventattradmintest"></table> -->
<div id="eventattradmin-table" style="width: 800px;">
<div class="fixed-table-box row-col-fixed" id="Lyn_FixedTable_1">
<div class="fixed-table_header-wraper" data-parentid="Lyn_FixedTable_1">
<table class="fixed-table_header" cellspacing="0" cellpadding="0" border="0" style="width: 900px;">
<thead>
<tr>
<th style="width: 100px;" data-fixed="true" data-fixeddirection="left">
<div class="table-cell">日期</div>
</th>
<th style="width: 100px;">
<div class="table-cell">姓名</div>
</th>
<th style="width: 100px;">
<div class="table-cell">省份</div>
</th>
<th style="width: 100px;">
<div class="table-cell">市区</div>
</th>
<th style="width: 100px;">
<div class="table-cell">地址</div>
</th>
<th style="width: 100px;">
<div class="table-cell">邮编</div>
</th>
<th style="width: 100px;">
<div class="table-cell">邮编</div>
</th>
<th style="width: 100px;">
<div class="table-cell">邮编</div>
</th>
<th style="width: 100px;">
<div class="table-cell">邮编</div>
</th>
</tr>
</thead>
</table>
</div>
<div class="fixed-table_body-wraper" data-parentid="Lyn_FixedTable_1">
<table class="fixed-table_body" cellspacing="0" cellpadding="0" border="0" style="width: 900px;">
<tbody>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎0</div>
</td>
<td class="ws-100">
<div class="table-cell">上海0</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区0</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市普0</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎1</div>
</td>
<td class="ws-100">
<div class="table-cell">上海1</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区1</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市普1</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎2</div>
</td>
<td class="ws-100">
<div class="table-cell">上海2</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区2</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市普2</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎3</div>
</td>
<td class="ws-100">
<div class="table-cell">上海3</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区3</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市普3</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎4</div>
</td>
<td class="ws-100">
<div class="table-cell">上海4</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区4</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市普4</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎0-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海0-a</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区0-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市0</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330-a</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎1-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海1-a</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区1-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市1</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331-a</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎2-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海2-a</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区2-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市2</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332-a</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎3-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海3-a</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区3-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市3</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333-a</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎4-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海4-a</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区4-a</div>
</td>
<td class="ws-100">
<div class="table-cell">上海市4</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334-a</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎0-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海0-b</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区0-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海0</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330-b</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
<td class="ws-100">
<div class="table-cell">2003330</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎1-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海1-b</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区1-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海1</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331-b</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
<td class="ws-100">
<div class="table-cell">2003331</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎2-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海2-b</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区2-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海2</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332-b</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
<td class="ws-100">
<div class="table-cell">2003332</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎3-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海3-b</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区3-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海3</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333-b</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
<td class="ws-100">
<div class="table-cell">2003333</div>
</td>
</tr>
<tr>
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
<td class="ws-100">
<div class="table-cell">王小虎4-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海4-b</div>
</td>
<td class="ws-100">
<div class="table-cell">普陀区4-b</div>
</td>
<td class="ws-100">
<div class="table-cell">上海4</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334-b</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
<td class="ws-100">
<div class="table-cell">2003334</div>
</td>
</tr>
</tbody>
</table>
</div>
<div class="fixed-table_fixed fixed-table_fixed-left" style="height: 286px;">
<div class="fixed-table_header-wraper">
<table class="fixed-table_header" cellspacing="0" cellpadding="0" border="0">
<thead>
<tr>
<th style="width: 100px;" data-fixed="true" data-fixeddirection="left">
<div class="table-cell">日期</div>
</th>
</tr>
</thead>
</table>
</div>
<div class="fixed-table_body-wraper">
<table class="fixed-table_body" cellspacing="0" cellpadding="0" border="0">
<tbody>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr class="">
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
<tr>
<td class="ws-100">
<div class="table-cell">2016-05-03</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

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

@ -117,7 +117,7 @@ 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://139.159.159.3:7889/api/v1/";
@ -1254,6 +1254,8 @@ var X = window.X || {
}else {
if(!fillTo)fillTo=$('#'+id);
}
X.DATA['page'] = url;
// console.log(url);
$.get('pages/'+ url + '.html',function(content){
// fillTo.empty();
fillTo.html(content);
@ -1323,28 +1325,28 @@ var X = window.X || {
// console.log( getHashParms() );
var page = X.DATA['page'];
var urlinfo = getHashParms();
// if(urlinfo.page == 'dashboard'){
// for(let i in X.DATA['ProjectData']){
// for(let j in X.DATA['ProjectData'][i]['children']){
// if(X.DATA['ProjectData'][i]['children'][j]['_id'] == urlinfo.menu){
// $(".tab-tit-box .tab-tit").html(X.DATA['ProjectData'][i]['children'][j]['name']);
// X.DATA['ProjectData'][i]['children'][j]['onclick'] = 1;
// }else{
// X.DATA['ProjectData'][i]['children'][j]['onclick'] = 0;
// }
// }
// }
if(urlinfo.page == 'dashboard'){
for(let i in X.DATA['ProjectData']){
for(let j in X.DATA['ProjectData'][i]['children']){
if(X.DATA['ProjectData'][i]['children'][j]['_id'] == urlinfo.menu){
$(".tab-tit-box .tab-tit").html(X.DATA['ProjectData'][i]['children'][j]['name']);
X.DATA['ProjectData'][i]['children'][j]['onclick'] = 1;
}else{
X.DATA['ProjectData'][i]['children'][j]['onclick'] = 0;
}
}
}
// X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian');
// X.DATA['page'] = urlinfo.page;
// console.log(urlinfo.page);
// console.log(urlinfo.menu);
// if(page != urlinfo.page){
// X.gourl(urlinfo.page,'conetnt');
// }
// X.DATA['dashboard_id'] = urlinfo.menu;
// X.pageLogic['dashboard'].gettabledata();
// }
X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian');
X.DATA['page'] = urlinfo.page;
console.log(urlinfo.page);
console.log(urlinfo.menu);
if(page != urlinfo.page){
X.gourl(urlinfo.page,'conetnt');
}
X.DATA['dashboard_id'] = urlinfo.menu;
X.pageLogic['dashboard'].gettabledata();
}
};
//})();
@ -4173,11 +4175,11 @@ var X = window.X || {
// 修改面板名
$(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
$(".tab-tit-box .tab-tit").html($(this).find("span").html());
// setHashParms("menu",$(this).attr('data-id'));
$("#model-box").html("");
X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
setHashParms("menu",$(this).attr('data-id'));
// $("#model-box").html("");
// X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
// 获取报表数据
me.gettabledata();
// me.gettabledata();
});
// 渲染添加按钮侧边栏下拉框
@ -4468,7 +4470,7 @@ var X = window.X || {
if(d.click != 'del'){
X.parametersopen(arr,d.click,'auto',function(){
// me.updata(X.DATA['projectid']);
me.freshMenu();
me.freshMenu(X.DATA['projectid']);
})
}else {
layer.confirm('确认删除选中的看板吗?该操作不可恢复', {
@ -4512,11 +4514,11 @@ var X = window.X || {
// }
// }
// })
X.api("report/read_report",'post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
console.log(val);
X.api("report/read_report",'post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
console.log(q);
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
};
//获取修改的时间
var dateid = "times"+id;
@ -4543,7 +4545,9 @@ var X = window.X || {
model:cat,
name:name,
report_id:id,
query:query
query:query,
modelswitch:q[0].show_config.modelswitch,
ascending:q[0].show_config.ascending
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val,retentiontype);
@ -4578,10 +4582,10 @@ var X = window.X || {
obj.html(d.title);
var reportid = [];
reportid.push(id);
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
};
if(cat == "retention"){
query['eventView']['unitNum'] = parseInt(d.id);
@ -4603,7 +4607,9 @@ var X = window.X || {
model:cat,
name:name,
report_id:id,
query:val[0]['query']
query:val[0]['query'],
modelswitch:q[0].show_config.modelswitch,
ascending:q[0].show_config.ascending
}
// debugger;
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
@ -4727,9 +4733,9 @@ var X = window.X || {
}
}
console.log(d.spaces[i]['children'][0]['_id']);
// setHashParms("menu",d.spaces[i]['children'][0]['_id']);
$(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
setHashParms("menu",d.spaces[i]['children'][0]['_id']);
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
}else {
for(let q in d.spaces){
for(let j in d.spaces[q]['children']){
@ -5106,11 +5112,11 @@ var X = window.X || {
$("#"+id).html(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
var reportid = [];
reportid.push(oclickarr.id);
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
if(val.length > 0){
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
if(q.length > 0){
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
};
query['eventView']['startTime'] = startTime;
query['eventView']['endTime'] = endTime;
@ -5138,13 +5144,16 @@ var X = window.X || {
// query['eventView']['timeParticleSize'] = timeParticleSize;
X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){
if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){
console.log(q);
var bbsetdata = {
graph_size:oclickarr['modelsize'],
graph_type:oclickarr['modeltype'],
model:oclickarr['cat'],
name:oclickarr['name'],
report_id:oclickarr['id'],
query:query
query:query,
modelswitch:q[0].show_config.modelswitch,
ascending:q[0].show_config.ascending
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val);
@ -5257,39 +5266,41 @@ var X = window.X || {
//获取表格数据
//先渲染外框大小位置和标题
gettabledata:function(){
X.modelapi('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
X['DATA']['kanbanlist'] = d;
var modellist=[];
for(let i in d){
var arr = {
sort:d[i]['sort'],
report_id:d[i]['report_id']
if(X.DATA['dashboard_id'] && X.DATA['dashboard_id'] != ""){
X.modelapi('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
X['DATA']['kanbanlist'] = d;
var modellist=[];
for(let i in d){
var arr = {
sort:d[i]['sort'],
report_id:d[i]['report_id']
}
modellist.push(arr);
}
modellist.push(arr);
}
modellist.sort( X.compare("sort") );
var num = 0;
$("#model-box").html("");//清空表格数据
for(let i in modellist){
for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html);
num ++;
// X.pageLogic['dashboard'].fillmodeldata(d[z]);
});
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
X.pageLogic['dashboard'].fillmodeldata(d[q]);
modellist.sort( X.compare("sort") );
var num = 0;
$("#model-box").html("");//清空表格数据
for(let i in modellist){
for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html);
num ++;
// X.pageLogic['dashboard'].fillmodeldata(d[z]);
});
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
X.pageLogic['dashboard'].fillmodeldata(d[q]);
}
}
}
}
}
}
})
})
}
},
};
@ -11476,7 +11487,7 @@ var X = window.X || {
X.pageLogic['usergroup'] = {
init : function(parms){
}
};

View File

@ -31,6 +31,8 @@
}else {
if(!fillTo)fillTo=$('#'+id);
}
X.DATA['page'] = url;
// console.log(url);
$.get('pages/'+ url + '.html',function(content){
// fillTo.empty();
fillTo.html(content);
@ -100,28 +102,28 @@
// console.log( getHashParms() );
var page = X.DATA['page'];
var urlinfo = getHashParms();
// if(urlinfo.page == 'dashboard'){
// for(let i in X.DATA['ProjectData']){
// for(let j in X.DATA['ProjectData'][i]['children']){
// if(X.DATA['ProjectData'][i]['children'][j]['_id'] == urlinfo.menu){
// $(".tab-tit-box .tab-tit").html(X.DATA['ProjectData'][i]['children'][j]['name']);
// X.DATA['ProjectData'][i]['children'][j]['onclick'] = 1;
// }else{
// X.DATA['ProjectData'][i]['children'][j]['onclick'] = 0;
// }
// }
// }
if(urlinfo.page == 'dashboard'){
for(let i in X.DATA['ProjectData']){
for(let j in X.DATA['ProjectData'][i]['children']){
if(X.DATA['ProjectData'][i]['children'][j]['_id'] == urlinfo.menu){
$(".tab-tit-box .tab-tit").html(X.DATA['ProjectData'][i]['children'][j]['name']);
X.DATA['ProjectData'][i]['children'][j]['onclick'] = 1;
}else{
X.DATA['ProjectData'][i]['children'][j]['onclick'] = 0;
}
}
}
// X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian');
// X.DATA['page'] = urlinfo.page;
// console.log(urlinfo.page);
// console.log(urlinfo.menu);
// if(page != urlinfo.page){
// X.gourl(urlinfo.page,'conetnt');
// }
// X.DATA['dashboard_id'] = urlinfo.menu;
// X.pageLogic['dashboard'].gettabledata();
// }
X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian');
X.DATA['page'] = urlinfo.page;
console.log(urlinfo.page);
console.log(urlinfo.menu);
if(page != urlinfo.page){
X.gourl(urlinfo.page,'conetnt');
}
X.DATA['dashboard_id'] = urlinfo.menu;
X.pageLogic['dashboard'].gettabledata();
}
};
//})();

View File

@ -116,7 +116,7 @@ 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://139.159.159.3:7889/api/v1/";

View File

@ -65,11 +65,11 @@
// 修改面板名
$(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
$(".tab-tit-box .tab-tit").html($(this).find("span").html());
// setHashParms("menu",$(this).attr('data-id'));
$("#model-box").html("");
X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
setHashParms("menu",$(this).attr('data-id'));
// $("#model-box").html("");
// X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
// 获取报表数据
me.gettabledata();
// me.gettabledata();
});
// 渲染添加按钮侧边栏下拉框
@ -360,7 +360,7 @@
if(d.click != 'del'){
X.parametersopen(arr,d.click,'auto',function(){
// me.updata(X.DATA['projectid']);
me.freshMenu();
me.freshMenu(X.DATA['projectid']);
})
}else {
layer.confirm('确认删除选中的看板吗?该操作不可恢复', {
@ -404,11 +404,11 @@
// }
// }
// })
X.api("report/read_report",'post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
console.log(val);
X.api("report/read_report",'post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
console.log(q);
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
};
//获取修改的时间
var dateid = "times"+id;
@ -435,7 +435,9 @@
model:cat,
name:name,
report_id:id,
query:query
query:query,
modelswitch:q[0].show_config.modelswitch,
ascending:q[0].show_config.ascending
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val,retentiontype);
@ -470,10 +472,10 @@
obj.html(d.title);
var reportid = [];
reportid.push(id);
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
};
if(cat == "retention"){
query['eventView']['unitNum'] = parseInt(d.id);
@ -495,7 +497,9 @@
model:cat,
name:name,
report_id:id,
query:val[0]['query']
query:val[0]['query'],
modelswitch:q[0].show_config.modelswitch,
ascending:q[0].show_config.ascending
}
// debugger;
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
@ -619,9 +623,9 @@
}
}
console.log(d.spaces[i]['children'][0]['_id']);
// setHashParms("menu",d.spaces[i]['children'][0]['_id']);
$(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
setHashParms("menu",d.spaces[i]['children'][0]['_id']);
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
}else {
for(let q in d.spaces){
for(let j in d.spaces[q]['children']){
@ -998,11 +1002,11 @@
$("#"+id).html(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
var reportid = [];
reportid.push(oclickarr.id);
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
if(val.length > 0){
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid,dashboard_id:X.DATA.dashboard_id},function(q){
if(q.length > 0){
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
eventView:q[0]['query']['eventView'],
events:q[0]['query']['events'],
};
query['eventView']['startTime'] = startTime;
query['eventView']['endTime'] = endTime;
@ -1030,13 +1034,16 @@
// query['eventView']['timeParticleSize'] = timeParticleSize;
X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){
if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){
console.log(q);
var bbsetdata = {
graph_size:oclickarr['modelsize'],
graph_type:oclickarr['modeltype'],
model:oclickarr['cat'],
name:oclickarr['name'],
report_id:oclickarr['id'],
query:query
query:query,
modelswitch:q[0].show_config.modelswitch,
ascending:q[0].show_config.ascending
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val);
@ -1149,39 +1156,41 @@
//获取表格数据
//先渲染外框大小位置和标题
gettabledata:function(){
X.modelapi('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
X['DATA']['kanbanlist'] = d;
var modellist=[];
for(let i in d){
var arr = {
sort:d[i]['sort'],
report_id:d[i]['report_id']
if(X.DATA['dashboard_id'] && X.DATA['dashboard_id'] != ""){
X.modelapi('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
X['DATA']['kanbanlist'] = d;
var modellist=[];
for(let i in d){
var arr = {
sort:d[i]['sort'],
report_id:d[i]['report_id']
}
modellist.push(arr);
}
modellist.push(arr);
}
modellist.sort( X.compare("sort") );
var num = 0;
$("#model-box").html("");//清空表格数据
for(let i in modellist){
for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html);
num ++;
// X.pageLogic['dashboard'].fillmodeldata(d[z]);
});
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
X.pageLogic['dashboard'].fillmodeldata(d[q]);
modellist.sort( X.compare("sort") );
var num = 0;
$("#model-box").html("");//清空表格数据
for(let i in modellist){
for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html);
num ++;
// X.pageLogic['dashboard'].fillmodeldata(d[z]);
});
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
X.pageLogic['dashboard'].fillmodeldata(d[q]);
}
}
}
}
}
}
})
})
}
},
};

View File

@ -2,7 +2,7 @@
X.pageLogic['usergroup'] = {
init : function(parms){
}
};

View File

@ -603,3 +603,42 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
.setupbaobiao-left-from-list-radio-box input { position: relative; top: 2px; margin-right: 5px; }
.setupbaobiao-zs { color: #42546d; font-size: 12px; line-height: 20px; margin-bottom: 10px; padding: 0 10px 0 20px; }
.fixed-table-box{/*当表格的宽度大于.fixed-table-box的宽度时才会有横向滚动条*/
width: 800px;
margin: 50px auto;
}
.test-fixedTable{
margin: 0 auto;
background-color: #ccc;
}
.fixed-table_body-wraper{/*如果数据过多并且想表格有纵向滚动条时,必须给该元素设置一个高度*/
max-height: 260px;
}
.test-fixedTable .fixed-table_body-wraper{
width: 100%;
}
.w-150{
width: 150px;
}
.w-120{
width: 120px;
}
.w-300{
width: 300px;
}
.w-100{
width: 100px;
}
.ws-100 { width: 100px; }
.btns{
text-align: center;
}
.btns button{
padding: 10px 20px;
}