leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
This commit is contained in:
罗松柏 2021-09-07 20:07:50 +08:00
parent eb8c166ecf
commit 53d833b9e6
5 changed files with 72 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/main.html
View File

@ -28,6 +28,9 @@
<script src="./src/comboTreePlugin.js" type="text/javascript"></script>
<script src="./src/jquery.dad.min.js" type="text/javascript"></script>
<!-- 拖动插件 -->
<script src="./src/jquery.nestable.js" type="text/javascript"></script>
<!-- table -->
<script src="./src/FixedTable.js" type="text/javascript"></script>

14
web/pages/dashboard.html
View File

@ -130,7 +130,7 @@
</li>
<li class="layui-nav-item modify-layui-nav-item">
<a href="javascript:;" class="fontcolor">项目空间</a>
<dl class="layui-nav-child modeify-layui-nav-child" id="kongjian">
<dl class="layui-nav-child modeify-layui-nav-" id="kongjian">
</dl>
</li>
@ -567,7 +567,7 @@
<a href="javascript:;" class="fontcolor mykanban category xiangmukongjian" data-id="{{item._id}}">
<i class="layui-icon layui-icon-template-1"></i> {{item.name}}
<img src="./static/img/renyuan.png" class="nav-space-bar" data-id="{{item._id}}"/></a>
<dl class="layui-nav-child modeify-layui-nav-child">
<dl class="layui-nav-child modeify-layui-nav-child sidebar-box">
{{# layui.each(item.children, function(indexs, items){ }}
{{# if(items.isFolder === true){ }}
@ -596,7 +596,7 @@
</script>
<!-- 看板模板 -->
<script id="kanban-model-table-dot" type="text/html">
<!-- <script id="kanban-model-table-dot" type="text/html">
{{# if(d.modelsize === "small"){ }}
@ -655,7 +655,7 @@
{{# } else { }}
<div class="layui-col-md6" id="model{{d.id}}">
{{# } }}
<!-- <div class="layui-col-md6" style="float: none;"> -->
<div class="layui-col-md6" style="float: none;">
<div class="layui-card">
<div class="row-top">
<div class="row-tit">
@ -786,8 +786,8 @@
<div style="display: flex; align-items: center;">
<div class="data-num">{{d.sameday}}<span></span></div>
<div class="proportion">
<!-- <div class="proportion-data">较环比 <div class="sanjiao"></div><span>5.4%</span></div>
<div class="proportion-data">较同比 <div class="sanjiao"></div><span>5.4%</span></div> -->
<div class="proportion-data">较环比 <div class="sanjiao"></div><span>5.4%</span></div>
<div class="proportion-data">较同比 <div class="sanjiao"></div><span>5.4%</span></div>
</div>
</div>
@ -811,7 +811,7 @@
{{# } }}
</script>
</script> -->
<!-- 看板模板外框 -->
<script id="kanban-model-box-dot" type="text/html">

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

@ -627,7 +627,8 @@ var X = window.X || {
for(let j in data[i]['values']){
var arr;
arr = $.extend(true,[],data[i].values[j])
arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
arr.unshift(data[i]['event_name']);
// ,data[i]['sum'][j]
condata.push(arr);
}
@ -643,6 +644,8 @@ var X = window.X || {
}
}
date = data[0]['start_date'] + " - " + data[0]['end_date'];
console.log(titledata);
console.log(condata);
var dataArr = {
titledata:titledata,
condata:condata,
@ -4346,6 +4349,29 @@ var X = window.X || {
X.DATA['ProjectData'] = d.spaces;
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
// var updateOutput = function(e){
// var list = e.length ? e : $(e.target),
// output = list.data('output');
// if (window.JSON) {
// output.val(window.JSON.stringify(list.nestable('serialize')));//, null, 2));
// console.log(list.nestable('serialize'));
// } else {
// output.val('JSON browser support required for this demo.');
// console.log(222);
// }
// };
// $('#kongjian').nestable({group: 1}).on('change', updateOutput);
// updateOutput($('#kongjian').data('output', $('#nestable-output')));
});
},
@ -4416,7 +4442,8 @@ var X = window.X || {
data['timeParticleSize'] = granularity;
data['modelswitch'] = d['modelswitch'];
eventdata.push(data);
console.log(eventdata);
// return;
if(d['modelswitch']){
var originaldata;//原始数据
originaldata= $.extend(true,[],eventdata[0]['condata']);
@ -4432,7 +4459,8 @@ var X = window.X || {
}
}
var titledata = dataarr[0];
var condata = dataarr.slice(1, dataarr.length - 1);
var condata = dataarr.slice(1, dataarr.length);
eventdata[0]['titledata'] = titledata;
eventdata[0]['condata'] = condata;
}

5
web/srczip/common.js
View File

@ -626,7 +626,8 @@ var X = window.X || {
for(let j in data[i]['values']){
var arr;
arr = $.extend(true,[],data[i].values[j])
arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
arr.unshift(data[i]['event_name']);
// ,data[i]['sum'][j]
condata.push(arr);
}
@ -642,6 +643,8 @@ var X = window.X || {
}
}
date = data[0]['start_date'] + " - " + data[0]['end_date'];
console.log(titledata);
console.log(condata);
var dataArr = {
titledata:titledata,
condata:condata,

29
web/srczip/logic/dashboard.js
View File

@ -500,6 +500,29 @@
X.DATA['ProjectData'] = d.spaces;
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
// var updateOutput = function(e){
// var list = e.length ? e : $(e.target),
// output = list.data('output');
// if (window.JSON) {
// output.val(window.JSON.stringify(list.nestable('serialize')));//, null, 2));
// console.log(list.nestable('serialize'));
// } else {
// output.val('JSON browser support required for this demo.');
// console.log(222);
// }
// };
// $('#kongjian').nestable({group: 1}).on('change', updateOutput);
// updateOutput($('#kongjian').data('output', $('#nestable-output')));
});
},
@ -570,7 +593,8 @@
data['timeParticleSize'] = granularity;
data['modelswitch'] = d['modelswitch'];
eventdata.push(data);
console.log(eventdata);
// return;
if(d['modelswitch']){
var originaldata;//原始数据
originaldata= $.extend(true,[],eventdata[0]['condata']);
@ -586,7 +610,8 @@
}
}
var titledata = dataarr[0];
var condata = dataarr.slice(1, dataarr.length - 1);
var condata = dataarr.slice(1, dataarr.length);
eventdata[0]['titledata'] = titledata;
eventdata[0]['condata'] = condata;
}