整体优化

develop
Jmysy 2020-05-29 23:45:34 +08:00
parent 760615cd64
commit 19f44a4739
5 changed files with 473 additions and 97 deletions

View File

@ -222,7 +222,15 @@
"type": 0,
"href": "",
"spread": true,
"children": [
"children": [{
"id": 301,
"title": "任务列表",
"icon": "layui-icon layui-icon-face-smile",
"type": 1,
"openType": "_iframe",
"href": "view/page/task.html",
"spread": true
}
]
},
{

View File

@ -0,0 +1,81 @@
{
"createTime": null,
"createBy": null,
"updateTime": null,
"updateBy": null,
"remark": null,
"code": 0,
"msg": "...",
"count": 3,
"data": [{
"taskName": "登录任务",
"process": "30%",
"priority": 0,
"taskInfo": "任务描述",
"createDate": "2019-03-04 20:00:19",
"type": 1,
"realName": "就眠仪式"
}, {
"taskName": "登录任务",
"process": "60%",
"priority": 1,
"createDate": "2019-03-04 20:00:19",
"type": 0,
"taskInfo": "任务描述",
"realName": "就眠仪式"
}, {
"taskName": "登录任务",
"process": "20%",
"priority": 1,
"createDate": "2019-03-04 20:00:19",
"type": 1,
"taskInfo": "任务描述",
"realName": "就眠仪式"
},{
"taskName": "登录任务",
"process": "80%",
"priority": 0,
"createDate": "2019-03-04 20:00:19",
"type": 2,
"taskInfo": "任务描述",
"realName": "就眠仪式"
}, {
"taskName": "登录任务",
"process": "10%",
"priority": 0,
"createDate": "2019-03-04 20:00:19",
"type": 2,
"taskInfo": "任务描述",
"realName": "就眠仪式"
}, {
"taskName": "登录任务",
"process": "50%",
"priority": 2,
"createDate": "2019-03-04 20:00:19",
"type": 1,
"taskInfo": "任务描述",
"realName": "就眠仪式"
}, {
"taskName": "登录任务",
"process": "90%",
"priority": 2,
"createDate": "2019-03-04 20:00:19",
"taskInfo": "任务描述",
"realName": "就眠仪式"
}, {
"taskName": "登录任务",
"process": "20%",
"priority": 2,
"type": 1,
"createDate": "2019-03-04 20:00:19",
"taskInfo": "任务描述",
"realName": "就眠仪式"
}, {
"taskName": "登录任务",
"process": "10%",
"priority": 0,
"createDate": "2019-03-04 20:00:19",
"taskInfo": "任务描述",
"realName": "就眠仪式"
}]
}

View File

@ -111,6 +111,41 @@
font-size: 33px;
}
.layuiadmin-card-status {
padding: 0 10px 10px;
}
.layuiadmin-card-status dd {
padding: 15px 0;
border-bottom: 1px solid #EEE;
display: -webkit-flex;
display: flex;
}
.layuiadmin-card-status dd div.layui-status-img,
.layuiadmin-card-team .layui-team-img {
width: 32px;
height: 32px;
border-radius: 50%;
background-color: #009688;
margin-right: 15px;
}
.layuiadmin-card-status dd div.layui-status-img a {
width: 100%;
height: 100%;
display: inline-block;
text-align: center;
line-height: 32px;
}
.layuiadmin-card-status dd div span {
color: #BBB;
}
.layuiadmin-card-status dd div a{
color: #01AAED;
}
</style>
</head>
<body class="pear-container">
@ -187,18 +222,52 @@
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">开源动态</div>
<div class="layui-card-header">动态</div>
<div class="layui-card-body">
<script src='https://gitee.com/Jmysy/Pear-Admin-Layui/widget_preview' async defer></script>
<div id="osc-gitee-widget-tag"></div>
<style>
.osc_pro_color {color: #4183c4 !important;}
.osc_panel_color {background-color: #ffffff !important;}
.osc_background_color {background-color: #ffffff !important;}
.osc_border_color {border-color: #e3e9ed !important;}
.osc_desc_color {color: #666666 !important;}
.osc_link_color * {color: #9b9b9b !important;}
</style>
<dl class="layuiadmin-card-status">
<dd>
<div class="layui-status-img"><a href="javascript:;"><img style="width: 32px;height: 32px;border-radius: 50px;" src="../../../Pear%20Admin%20v%201.0/assets/images/avatar.jpg"></a></div>
<div>
<p>七彩枫叶 在 <a lay-href="https://gitee.com/Jmysy/Pear-Admin-Layui">Pear Admin 专区</a> 回答问题</p>
<span>几秒前</span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img style="width: 32px;height: 32px;border-radius: 50px;" src="../../../Pear%20Admin%20v%201.0/assets/images/avatar.jpg"></a></div>
<div>
<p>简 在 <a lay-href="https://gitee.com/Jmysy/Pear-Admin-Layui">Pear Admin 专区</a> 进行了 <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/column/quiz/">提问</a></p>
<span>2天前</span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img style="width: 32px;height: 32px;border-radius: 50px;" src="../../../Pear%20Admin%20v%201.0/assets/images/avatar.jpg"></a></div>
<div>
<p>恒宇少年 将 <a lay-href="https://gitee.com/Jmysy/Pear-Admin-Layui">Pear Admin </a> 更新至 2.3.0 版本</p>
<span>7天前</span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img style="width: 32px;height: 32px;border-radius: 50px;" src="../../../Pear%20Admin%20v%201.0/assets/images/avatar.jpg"></a></div>
<div>
<p>如花 在 <a lay-href="https://gitee.com/Jmysy/Pear-Admin-Layui">Pear Admin 社区</a> 发布了 <a lay-href="http://fly.layui.com/column/suggest/">建议</a></p>
<span>7天前</span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img style="width: 32px;height: 32px;border-radius: 50px;" src="../../../Pear%20Admin%20v%201.0/assets/images/avatar.jpg"></a></div>
<div>
<p>就眠仪式 在 <a lay-href="https://gitee.com/Jmysy/Pear-Admin-Layui">Pear Admin 社区</a> 发布了 <a lay-href="http://fly.layui.com/column/suggest/">建议</a></p>
<span>8天前</span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img style="width: 32px;height: 32px;border-radius: 50px;" src="../../../Pear%20Admin%20v%201.0/assets/images/avatar.jpg"></a></div>
<div>
<p>贤心 在 <a lay-href="https://gitee.com/Jmysy/Pear-Admin-Layui">Pear Admin 专区</a> 进行了 <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/column/quiz/">提问</a></p>
<span>8天前</span>
</div>
</dd>
</dl>
</div>
</div>
</div>
@ -214,7 +283,8 @@
<li class="list-item"><span class="title">兼容多标签页切换</span><span class="footer">2019-12-9 14:58</span></li>
<li class="list-item"><span class="title">扩展下拉组件</span><span class="footer">2019-12-7 9:06</span></li>
<li class="list-item"><span class="title">扩展卡片样式</span><span class="footer">2019-12-1 10:26</span></li>
<li class="list-item" style="height: 37px;"><button style="border-radius: 8px!important;" class="layui-btn layui-btn-normal layui-btn-fluid">查 看 更 多</button></li>
<li class="list-item" style="height: 37px;"><button style="border-radius: 8px!important;" class="layui-btn layui-btn-normal layui-btn-fluid">
看 更 多</button></li>
</ul>
</div>
</div>
@ -292,75 +362,75 @@
var echartsRecords = echarts.init(document.getElementById('echarts-records'), 'walden');
var option = {
tooltip: {
trigger: 'axis'
},
xAxis: [{
type: 'category',
data: ['2019-01','2019-02','2019-03','2019-04','2019-05','2019-06'],
axisLine: {
lineStyle: {
color: "#999"
}
}
}],
yAxis: [{
type: 'value',
splitNumber: 4,
splitLine: {
lineStyle: {
type: 'dashed',
color: '#DDD'
}
},
axisLine: {
show: false,
lineStyle: {
color: "#333"
},
},
nameTextStyle: {
color: "#999"
},
splitArea: {
show: false
}
}],
series: [{
name: '课时',
type: 'line',
data: [23,60,20,36,23,85],
lineStyle: {
normal: {
width: 8,
color: {
type: 'linear',
colorStops: [{
offset: 0,
color: '#A9F387' // 0% 处的颜色
}, {
offset: 1,
color: '#48D8BF' // 100% 处的颜色
}],
globalCoord: false // 缺省为 false
},
shadowColor: 'rgba(72,216,191, 0.3)',
shadowBlur: 10,
shadowOffsetY: 20
}
},
itemStyle: {
normal: {
color: '#fff',
borderWidth: 10,
/*shadowColor: 'rgba(72,216,191, 0.3)',
shadowBlur: 100,*/
borderColor: "#A9F387"
}
},
smooth: true
}]
tooltip: {
trigger: 'axis'
},
xAxis: [{
type: 'category',
data: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06'],
axisLine: {
lineStyle: {
color: "#999"
}
}
}],
yAxis: [{
type: 'value',
splitNumber: 4,
splitLine: {
lineStyle: {
type: 'dashed',
color: '#DDD'
}
},
axisLine: {
show: false,
lineStyle: {
color: "#333"
},
},
nameTextStyle: {
color: "#999"
},
splitArea: {
show: false
}
}],
series: [{
name: '课时',
type: 'line',
data: [23, 60, 20, 36, 23, 85],
lineStyle: {
normal: {
width: 8,
color: {
type: 'linear',
colorStops: [{
offset: 0,
color: '#A9F387' // 0% 处的颜色
}, {
offset: 1,
color: '#48D8BF' // 100% 处的颜色
}],
globalCoord: false // 缺省为 false
},
shadowColor: 'rgba(72,216,191, 0.3)',
shadowBlur: 10,
shadowOffsetY: 20
}
},
itemStyle: {
normal: {
color: '#fff',
borderWidth: 10,
/*shadowColor: 'rgba(72,216,191, 0.3)',
shadowBlur: 100,*/
borderColor: "#A9F387"
}
},
smooth: true
}]
};
echartsRecords.setOption(option);

View File

@ -231,30 +231,30 @@
<div>
<div class="process-title" style="position: absolute;margin-top: -6px;">
&nbsp;&nbsp;完 成 度 :
&nbsp;&nbsp;完 成 度 30% :
</div>
<div style="margin-top: 28px;width: 80%;margin-left: 80px;" class="layui-progress">
<div style="margin-top: 28px;width: 65%;margin-left: 120px;" class="layui-progress">
<div class="layui-progress-bar layui-bg-orange" lay-percent="30%"></div>
</div>
<br>
<div class="process-title" style="position: absolute;margin-top: 7px;">
&nbsp;&nbsp;容 错 率 :
&nbsp;&nbsp;容 错 率 50% :
</div>
<div class="layui-progress" style="margin-top: 15px;width: 80%;margin-left: 80px;">
<div class="layui-progress-bar layui-bg-green" lay-percent="60%"></div>
<div class="layui-progress" style="margin-top: 15px;width: 65%;margin-left: 120px;">
<div class="layui-progress-bar layui-bg-green" lay-percent="50%"></div>
</div>
<br>
<div class="process-title" style="position: absolute;margin-top: 7px;">
&nbsp;&nbsp;康 复 率 :
&nbsp;&nbsp;康 复 率 60% :
</div>
<div class="layui-progress" style="margin-top: 15px;width: 80%;margin-left: 80px;">
<div class="layui-progress" style="margin-top: 15px;width: 65%;margin-left: 120px;">
<div class="layui-progress-bar layui-bg-blue" lay-percent="60%"></div>
</div>
<br>
<div class="process-title" style="position: absolute;margin-top: 7px;">
&nbsp;&nbsp;回 调 率 :
&nbsp;&nbsp;回 调 率 30% :
</div>
<div class="layui-progress" style="margin-top: 15px;width: 80%;margin-left: 80px;">
<div class="layui-progress" style="margin-top: 15px;width: 65%;margin-left: 120px;">
<div class="layui-progress-bar layui-bg-red" lay-percent="30%"></div>
</div>
</div>
@ -271,12 +271,6 @@
</div>
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">动态</div>
<div class="layui-card-body">
</div>
</div>
</div>
<div class="layui-col-md4">
<div class="layui-card">

View File

@ -0,0 +1,223 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<link href="../../component/layui/css/layui.css" rel="stylesheet" />
<link href="../../admin/css/pearCommon.css" rel="stylesheet" />
</head>
<body>
<body class="pear-container">
<div class="layui-card">
<div class="layui-card-body">
<form class="layui-form" action="">
<div class="layui-form-item">
<label class="layui-form-label">任务名称</label>
<div class="layui-input-inline">
<input type="text" name="realName" placeholder="" class="layui-input">
</div>
<label class="layui-form-label">执行人</label>
<div class="layui-input-inline">
<input type="text" name="username" placeholder="" class="layui-input">
</div>
<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
<i class="layui-icon layui-icon-search"></i>
查询
</button>
<button type="reset" class="pear-btn pear-btn-md">
<i class="layui-icon layui-icon-refresh"></i>
重置
</button>
</div>
</form>
</div>
</div>
<div class="layui-card">
<div class="layui-card-body">
<table id="user-table" lay-filter="user-table"></table>
</div>
</div>
</body>
<script type="text/html" id="user-toolbar">
<button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add">
<i class="layui-icon layui-icon-add-1"></i>
新增
</button>
<button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove">
<i class="layui-icon layui-icon-delete"></i>
删除
</button>
</script>
<script type="text/html" id="user-bar">
<button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit"><i class="layui-icon layui-icon-edit"></i></button>
<button class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove"><i class="layui-icon layui-icon-delete"></i></button>
</script>
<script type="text/html" id="user-enable">
<input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="user-enable" checked = "{{ d.enable == 0 ? 'true' : 'false' }}">
</script>
<script type="text/html" id="task-process">
<div class="layui-progress-bar layui-bg-green" style="width: {{d.process}};margin-top: 15px;"></div>
</script>
<script type="text/html" id="task-priority">
{{#if (d.priority == 0) { }}
<button class="pear-btn pear-btn-danger pear-btn-sm" plain>紧急</button>
{{# }else if(d.priority == 1){ }}
<button class="pear-btn pear-btn-warming pear-btn-sm" plain>警告</button>
{{# }else if(d.priority == 2){ }}
<button class="pear-btn pear-btn-success pear-btn-sm" plain>正常</button>
{{# } }}
</script>
<script type="text/html" id="task-createTime">
{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd')}}
</script>
<script src="../../component/layui/layui.js"></script>
<script>
layui.use(['table','form','jquery','element'],function () {
let table = layui.table;
let form = layui.form;
let $ = layui.jquery;
let element = layui.element;
let MODULE_PATH = "../system/operate/";
let cols = [
[
{type:'checkbox'},
{title: '任务名称', field: 'taskName', align:'center', width:100},
{title: '任务描述', field: 'taskInfo', align:'center'},
{title: '进度', field: 'process', align:'center', width:350, templet:'#task-process'},
{title: '优先级', field: 'priority', align:'center', width:150,templet:"#task-priority"},
{title: '执行人', field: 'realName', align:'center',width:150},
{title: '发布时间', field: 'createTime', align:'center',width:200, templet:"#task-createTime"},
]
]
table.render({
elem: '#user-table',
url: '../../admin/data/task.json',
page: true ,
cols: cols ,
skin: 'line',
toolbar: '#user-toolbar',
defaultToolbar: [{
layEvent: 'refresh',
icon: 'layui-icon-refresh',
}, 'filter', 'print', 'exports']
});
table.on('tool(user-table)', function(obj){
if(obj.event === 'remove'){
window.remove(obj);
} else if(obj.event === 'edit'){
window .edit(obj);
}
});
table.on('toolbar(user-table)', function(obj){
if(obj.event === 'add'){
window.add();
} else if(obj.event === 'refresh'){
window.refresh();
} else if(obj.event === 'batchRemove'){
window.batchRemove(obj);
}
});
form.on('submit(user-query)', function(data){
table.reload('user-table',{where:data.field})
return false;
});
form.on('switch(user-enable)', function(obj){
layer.tips(this.value + ' ' + this.name + ''+ obj.elem.checked, obj.othis);
});
window.add = function(){
layer.open({
type: 2,
title: '新增',
shade: 0.1,
area: ['500px', '400px'],
content: MODULE_PATH + 'add.html'
});
}
window.edit = function(obj){
layer.open({
type: 2,
title: '修改',
shade: 0.1,
area: ['500px', '400px'],
content: MODULE_PATH + 'edit.html'
});
}
window.remove = function(obj){
layer.confirm('确定要删除该用户', {icon: 3, title:'提示'}, function(index){
layer.close(index);
let loading = layer.load();
$.ajax({
url: MODULE_PATH+"remove/"+obj.data['userId'],
dataType:'json',
type:'delete',
success:function(result){
layer.close(loading);
if(result.success){
layer.msg(result.msg,{icon:1,time:1000},function(){
obj.del();
});
}else{
layer.msg(result.msg,{icon:2,time:1000});
}
}
})
});
}
window.batchRemove = function(obj){
let data = table.checkStatus(obj.config.id).data;
if(data.length === 0){
layer.msg("未选中数据",{icon:3,time:1000});
return false;
}
let ids = "";
for(let i = 0;i<data.length;i++){
ids += data[i].userId+",";
}
ids = ids.substr(0,ids.length-1);
layer.confirm('确定要删除这些用户', {icon: 3, title:'提示'}, function(index){
layer.close(index);
let loading = layer.load();
$.ajax({
url: MODULE_PATH+"batchRemove/"+ids,
dataType:'json',
type:'delete',
success:function(result){
layer.close(loading);
if(result.success){
layer.msg(result.msg,{icon:1,time:1000},function(){
table.reload('user-table');
});
}else{
layer.msg(result.msg,{icon:2,time:1000});
}
}
})
});
}
window.refresh = function(param){
table.reload('user-table');
}
})
</script>
</body>
</html>