diff --git a/Pear Admin v 2.0/admin/css/pearMenu.css b/Pear Admin v 2.0/admin/css/pearMenu.css index 82e4f43..ebf60e2 100644 --- a/Pear Admin v 2.0/admin/css/pearMenu.css +++ b/Pear Admin v 2.0/admin/css/pearMenu.css @@ -67,15 +67,26 @@ display: none!important; } -.pear-nav-control .layui-this{ - background-color: #F0F0F0; +.pear-nav-control a{ + font-weight: 500; + font-size: 14px; } -.pear-nav-control .layui-nav-bar{ - display: none; +.pear-nav-control .layui-nav-bar { + top: 0px !important; } +.pear-nav-control .layui-this *{ + color: #51A351!important; + font-weight: 600; + font-size: 15px; +} +.pear-nav-control a:hover{ + font-weight: 600; + color: #51A351!important; + font-size: 15px; +} /** 隐 藏 后 子 级 悬 浮 菜 单 */ .pear-nav-tree .layui-nav-hover{ diff --git a/Pear Admin v 2.0/admin/css/pearStep.css b/Pear Admin v 2.0/admin/css/pearStep.css index 7b208b6..b622112 100644 --- a/Pear Admin v 2.0/admin/css/pearStep.css +++ b/Pear Admin v 2.0/admin/css/pearStep.css @@ -2,8 +2,8 @@ font-size: 0; margin: 0 auto; max-width: 100%; - width: 80%; - padding-left: 13%; + width: 60%; + padding-left: 15%; } @@ -14,8 +14,6 @@ font-size: 15px; } - - .step-item-tail { width: 100%; padding: 0 10px; diff --git a/Pear Admin v 2.0/admin/data/menu.json b/Pear Admin v 2.0/admin/data/menu.json index 4815143..05d36a1 100644 --- a/Pear Admin v 2.0/admin/data/menu.json +++ b/Pear Admin v 2.0/admin/data/menu.json @@ -11,7 +11,15 @@ "icon": "layui-icon layui-icon-console", "type": 1, "openType": "_iframe", - "href": "view/console/console.html", + "href": "view/console/console1.html", + "spread": true + },{ + "id": 13, + "title": "数据分析", + "icon": "layui-icon layui-icon-console", + "type": 1, + "openType": "_iframe", + "href": "view/console/console2.html", "spread": true },{ "id": 12, diff --git a/Pear Admin v 2.0/index.html b/Pear Admin v 2.0/index.html index 55bde04..3c72e71 100644 --- a/Pear Admin v 2.0/index.html +++ b/Pear Admin v 2.0/index.html @@ -4,14 +4,14 @@ - - + + @@ -72,9 +72,9 @@ var config = { keepLoad: 1200, // 主 页 加 载 过 度 时 长 可为 false muiltTab: true, // 是 否 开 启 多 标 签 页 true 开启 false 关闭 - control: false, // 是 否 开 启 多 系 统 菜 单 true 开启 false 关闭 + control: true, // 是 否 开 启 多 系 统 菜 单 true 开启 false 关闭 theme: "dark-theme", // 默 认 主 题 样 式 dark-theme 默认主题 light-theme 亮主题 - index: 'view/console/console.html', // 默 认 加 载 主 页 + index: 'view/console/console1.html', // 默 认 加 载 主 页 data: 'admin/data/menu.json', // 菜 单 数 据 加 载 地 址 done: function() { /** 框架初始化 */ diff --git a/Pear Admin v 2.0/view/console/console.html b/Pear Admin v 2.0/view/console/console1.html similarity index 80% rename from Pear Admin v 2.0/view/console/console.html rename to Pear Admin v 2.0/view/console/console1.html index a59d9b5..de96d1d 100644 --- a/Pear Admin v 2.0/view/console/console.html +++ b/Pear Admin v 2.0/view/console/console1.html @@ -290,89 +290,78 @@ var echartsRecords = echarts.init(document.getElementById('echarts-records'), 'walden'); - var optionRecords = { - "title": { - "text": "" - }, - "tooltip": { - "trigger": "axis", - "axisPointer": { - "type": "cross", - "label": { - "backgroundColor": "#6a7985" - } - } - }, - "legend": { - "data": ["邮件营销", "联盟广告", "视频广告", "直接访问", "搜索引擎"] - }, - "toolbox": { - "feature": { - "saveAsImage": {} - } - }, - "grid": { - "left": "3%", - "right": "4%", - "bottom": "3%", - "containLabel": true - }, - "xAxis": [{ - "type": "category", - "boundaryGap": false, - "data": ["周一", "周二", "周三", "周四", "周五", "周六", "周日"] - }], - "yAxis": [{ - "type": "value" - }], - "series": [{ - "name": "邮件营销", - "type": "line", - "stack": "总量", - "areaStyle": {}, - "data": [120, 132, 101, 134, 90, 230, 210] - }, - { - "name": "联盟广告", - "type": "line", - "stack": "总量", - "areaStyle": {}, - "data": [220, 182, 191, 234, 290, 330, 310] - }, - { - "name": "视频广告", - "type": "line", - "stack": "总量", - "areaStyle": {}, - "data": [150, 232, 201, 154, 190, 330, 410] - }, - { - "name": "直接访问", - "type": "line", - "stack": "总量", - "areaStyle": { - "normal": {} - }, - "data": [320, 332, 301, 334, 390, 330, 320] - }, - { - "name": "搜索引擎", - "type": "line", - "stack": "总量", - "label": { - "normal": { - "show": true, - "position": "top" - } - }, - "areaStyle": { - "normal": {} - }, - "data": [820, 932, 901, 934, 1290, 1330, 1320] - } - ] + 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 + }] }; - echartsRecords.setOption(optionRecords); + echartsRecords.setOption(option); window.onresize = function() { echartsRecords.resize(); diff --git a/Pear Admin v 2.0/view/console/console2.html b/Pear Admin v 2.0/view/console/console2.html new file mode 100644 index 0000000..0d8db95 --- /dev/null +++ b/Pear Admin v 2.0/view/console/console2.html @@ -0,0 +1,530 @@ + + + + + 首页三 + + + + + + + + +
+
+
+
+ 快捷菜单 +
+
+
+
+
+ +
+ 主页 +
+
+
+ +
+ 弹层 +
+
+
+ +
+ 聊天 +
+
+
+ +
+ 相机 +
+
+
+ +
+ 表单 +
+
+
+ +
+ 安全 +
+
+
+ +
+ 公告 +
+
+
+ +
+ 更多 +
+
+
+
+
+
+
+
+ 代办任务 +
+
+
+
+
+
待审评论
+
21
+
+
+
+
+
待审帖子
+
32
+
+
+
+
+
待审文章
+
14
+
+
+
+
+
待审用户
+
63
+
+
+
+
+
+
+
+
+
+ 个人信息 +
+
+ + 晚上好，就眠仪式，我猜你可能累了 +
+
+   完 成 度 : +
+
+
+
+
+
+   容 错 率 : +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
留言板
+
+
    +
  • +

    Pear Admin

    +

    当浑浊变成了一种常态，那么清白就成了一种罪过。

    + 4月30日 22:43 + 回复 +
    • +
  • +

    Ant Design

    +

    那是一种内在的东西，他们到达不了，也无法触及！

    + 5月12日 01:25 + 回复 +
    • + +
  • +

    Angular

    +

    希望是一个好东西,也许是最好的,好东西是不会消亡的！

    + 6月11日 15:33 + 回复 +
    • +
  • +

    Bootstrap

    +

    一切都在不可避免的走向庸俗。

    + 2月09日 13:40 + 回复 +
    • +
+
+
+
+
+ + + + +