diff --git a/Pear Admin v 2.0/admin/data/menu.json b/Pear Admin v 2.0/admin/data/menu.json index 05d36a1..f648df4 100644 --- a/Pear Admin v 2.0/admin/data/menu.json +++ b/Pear Admin v 2.0/admin/data/menu.json @@ -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 + } ] }, { diff --git a/Pear Admin v 2.0/admin/data/task.json b/Pear Admin v 2.0/admin/data/task.json new file mode 100644 index 0000000..dec9f34 --- /dev/null +++ b/Pear Admin v 2.0/admin/data/task.json @@ -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": "就眠仪式" + }] +} \ No newline at end of file diff --git a/Pear Admin v 2.0/view/console/console1.html b/Pear Admin v 2.0/view/console/console1.html index b2cd1e1..0584e9d 100644 --- a/Pear Admin v 2.0/view/console/console1.html +++ b/Pear Admin v 2.0/view/console/console1.html @@ -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; + } @@ -187,18 +222,52 @@
-
开源动态
+
动态
- -
- +
+
+
+
+

七彩枫叶 在 Pear Admin 专区 回答问题

+ 几秒前 +
+
+
+
+
+

简 在 Pear Admin 专区 进行了 提问

+ 2天前 +
+
+
+
+
+

恒宇少年 将 Pear Admin 更新至 2.3.0 版本

+ 7天前 +
+
+
+
+
+

如花 在 Pear Admin 社区 发布了 建议

+ 7天前 +
+
+
+
+
+

就眠仪式 在 Pear Admin 社区 发布了 建议

+ 8天前 +
+
+
+
+
+

贤心 在 Pear Admin 专区 进行了 提问

+ 8天前 +
+
+
@@ -214,7 +283,8 @@
  • 兼容多标签页切换2019-12-9 14:58
  • 扩展下拉组件2019-12-7 9:06
  • 扩展卡片样式2019-12-1 10:26
    • -
    • +
    • @@ -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); diff --git a/Pear Admin v 2.0/view/console/console2.html b/Pear Admin v 2.0/view/console/console2.html index 971afad..618059d 100644 --- a/Pear Admin v 2.0/view/console/console2.html +++ b/Pear Admin v 2.0/view/console/console2.html @@ -231,30 +231,30 @@
    -   完 成 度 : +   完 成 度 30% :
    -
    +

    -   容 错 率 : +   容 错 率 50% :
    -
    -
    +
    +

    -   康 复 率 : +   康 复 率 60% :
    -
    +

    -   回 调 率 : +   回 调 率 30% :
    -
    +
    @@ -271,12 +271,6 @@
    -
    -
    动态
    -
    - -
    -
    diff --git a/Pear Admin v 2.0/view/page/task.html b/Pear Admin v 2.0/view/page/task.html new file mode 100644 index 0000000..ee13178 --- /dev/null +++ b/Pear Admin v 2.0/view/page/task.html @@ -0,0 +1,223 @@ + + + + + + + + + + +
    +
    +
    +
    + +
    + +
    + +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + \ No newline at end of file