From c6e295e6841add2de2005c5ebddb829c947bbecb Mon Sep 17 00:00:00 2001 From: Jmysy <854085467@qq.com> Date: Thu, 16 Apr 2020 18:00:35 +0800 Subject: [PATCH] =?UTF-8?q?2.1=E7=89=88=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pear Admin v 2.0/admin/css/pearAdmin.css | 103 +++++++--- Pear Admin v 2.0/admin/css/pearNotice.css | 36 ++++ Pear Admin v 2.0/admin/data/notice.json | 68 ++++++ Pear Admin v 2.0/admin/images/success.png | Bin 0 -> 7585 bytes .../component/layui/lay/extends/pearAdmin.js | 6 +- .../component/layui/lay/extends/pearMenu.js | 3 +- .../component/layui/lay/extends/pearNotice.js | 117 +++++++++++ Pear Admin v 2.0/component/layui/layui.js | 1 + Pear Admin v 2.0/index.html | 110 ++++++---- Pear Admin v 2.0/view/console/console.html | 194 ++++++++++-------- 10 files changed, 472 insertions(+), 166 deletions(-) create mode 100644 Pear Admin v 2.0/admin/css/pearNotice.css create mode 100644 Pear Admin v 2.0/admin/data/notice.json create mode 100644 Pear Admin v 2.0/admin/images/success.png create mode 100644 Pear Admin v 2.0/component/layui/lay/extends/pearNotice.js diff --git a/Pear Admin v 2.0/admin/css/pearAdmin.css b/Pear Admin v 2.0/admin/css/pearAdmin.css index 496b2e9..359b24b 100644 --- a/Pear Admin v 2.0/admin/css/pearAdmin.css +++ b/Pear Admin v 2.0/admin/css/pearAdmin.css @@ -5,12 +5,10 @@ .pear-admin .layui-side{ transition: all .3s; } - .pear-admin .layui-logo .title{ font-size: 20px; } - - .layui-header .layui-nav-more{ + .layui-header .layui-nav-more{ display: none!important; } @@ -34,17 +32,14 @@ width: calc(100% - 220px); background-color: white; } - .pear-admin .layui-header .layui-nav-img{ width: 30px; height: 30px; } - .pear-admin .layui-layout-control{ left: 120px; position: absolute; } - .pear-admin .layui-logo{ width: 220px; height: 60px; @@ -52,45 +47,51 @@ background-color: #28333E; } - .pear-admin .layui-logo img{ width: 36px; height: 36px; } - - + .pear-admin .layui-logo .title{ + font-size: 21px; + font-weight: 550; + color: #5FB878; + position: relative; + top: 5px; + margin-left: 5px; + } + .pear-admin .layui-logo .logo{ + display: none; + } + .pear-mini .layui-logo .title{ + display: none; + } + .pear-mini .layui-logo .logo{ + display: inline-block; + } .pear-admin .layui-side { top: 0px; width: 220px; box-shadow: 2px 0 6px rgba(0, 21, 41, .35); z-index: 9999; } - - - .pear-admin .layui-side-scroll::-webkit-scrollbar{ width:0px; height:0px; } - .pear-admin .layui-side-scroll{ - height: calc(100% - 60px); + height: calc(100% - 102px); background-color: #28333E; } - .pear-admin .layui-header .layui-nav .layui-nav-item>a { color: black; font-size: 15px; } - - .pear-admin .layui-body { left: 220px; bottom: 0px; } - - .pear-admin .layui-layout-left { + .pear-admin .layui-layout-left { left: 0px; } @@ -99,57 +100,95 @@ .pear-mini .layui-side{ width: 60px; } - .pear-mini .layui-header{ left: 60px; width: calc(100% - 60px); } - .pear-mini .layui-body{ left: 60px; } - .pear-mini .layui-logo{ width: 60px; } - .pear-mini .layui-nav-tree .layui-nav-item span{ display: none; } + .pear-mini .bottom-nav li{ + width: 100%!important; + } + .pear-mini .layui-side-scroll{ + height: calc(100% - 228px); + } + + /** 快捷按键 */ + .bottom-nav { + position: absolute; + bottom: 0; + left: 0; + width: 100%; + box-shadow: 0 -2px 0 rgba(0,0,0,.3); + background-color: #28333E; + } + .bottom-nav li { + display: block; + float: left; + width: 25%; + padding: 6px; + box-sizing: border-box; + text-align: center; + } + .bottom-nav *{ + color: white; + } + .bottom-nav li a { + cursor: pointer; + display: block; + width: 100%; + height: 30px; + line-height: 30px; + color: #666; + border-radius: 4px; + } + .bottom-nav li a:hover{ + background-color: #5FB878; + } /** 顶 部 菜 单 样 式 */ - .pear-admin .layui-header .layui-nav .layui-nav-bar { top: 0px !important; height: 2px !important; background-color: #5FB878; } - .pear-admin .layui-header .layui-nav .layui-this:after { display: none; } /** 新增兼容 */ @media screen and (max-width:768px) { + + + .pear-mini .bottom-nav{ + display: none; + } + .pear-mini .layui-side-scroll{ + height: calc(100% - 62px); + } + /** 隐 藏 布 局 样 式 */ .pear-mini .layui-side{ width: 0px; } - .pear-mini .layui-header{ left: 0px; width: 100%; } - .pear-mini .layui-body{ left: 0px; } - .pear-mini .layui-logo{ width: 0px; } - .pear-admin .layui-body{ left: 0px; } @@ -157,7 +196,6 @@ left: 0px; width: 100%; } - .pear-admin .pear-cover{ width: 100%; height: 100%; @@ -167,7 +205,6 @@ z-index: 1000; opacity: 0; } - .pear-mini .pear-cover{ display: none; } @@ -210,6 +247,4 @@ .layui-layer-dialog .layui-layer-content{ padding: 0px!important; - } - - \ No newline at end of file + } \ No newline at end of file diff --git a/Pear Admin v 2.0/admin/css/pearNotice.css b/Pear Admin v 2.0/admin/css/pearNotice.css new file mode 100644 index 0000000..7eded50 --- /dev/null +++ b/Pear Admin v 2.0/admin/css/pearNotice.css @@ -0,0 +1,36 @@ +.pear-notice .layui-this { + color: #5FB878 !important; +} + +.pear-notice li { + border-right: 1px solid whitesmoke; +} + +.pear-notice * { + color: dimgray !important; +} + +.pear-notice span{ + margin-left: 20px; + font-size: 13px; +} + +.pear-notice img{ + margin-left: 8px; + width: 33px!important; + height: 33px!important; + border-radius: 50px; +} + +.pear-notice-item{ + height: 45px!important; + line-height: 45px!important; +} + + +/** 滚动条样式 */ +.pear-notice *::-webkit-scrollbar{width:4px;height:4px;} +.pear-notice *::-webkit-scrollbar-track{background: white;border-radius:2px;} +.pear-notice *::-webkit-scrollbar-thumb{background: #E6E6E6;border-radius:2px;} +.pear-notice *::-webkit-scrollbar-thumb:hover{background: #E6E6E6;} +.pear-notice *::-webkit-scrollbar-corner{background: #f6f6f6;} \ No newline at end of file diff --git a/Pear Admin v 2.0/admin/data/notice.json b/Pear Admin v 2.0/admin/data/notice.json new file mode 100644 index 0000000..76f03d8 --- /dev/null +++ b/Pear Admin v 2.0/admin/data/notice.json @@ -0,0 +1,68 @@ +[{ + "id": 1, + "title": "私信", + "children": [{ + "id": 11, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }, { + "id": 12, + "avatar":"admin/images/success.png", + "title": "收到一条成功通知", + "time": "2019-02-15" + }] + }, + { + "id": 2, + "title": "消息", + "children": [{ + "id": 11, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }, { + "id": 12, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }, + { + "id": 11, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }, { + "id": 12, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }, + { + "id": 11, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }, { + "id": 12, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }] + }, + { + "id": 3, + "title": "通知", + "children": [{ + "id": 11, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }, { + "id": 12, + "avatar":"admin/images/success.png", + "title": "收到一条紧急任务", + "time": "2019-02-15" + }] + } +] diff --git a/Pear Admin v 2.0/admin/images/success.png b/Pear Admin v 2.0/admin/images/success.png new file mode 100644 index 0000000000000000000000000000000000000000..950af09aff275dc5b5503153cf78792c2d75b593 GIT binary patch literal 7585 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 literal 0 HcmV?d00001 diff --git a/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js b/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js index 5eb60ef..7a7e6a0 100644 --- a/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js +++ b/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js @@ -77,7 +77,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearTab', 'pearMenu', 'pear $("body").on("click", ".refresh", function() { - bodyTab.refresh(1000); + bodyTab.refresh(500); }) sideMenu.click(function(dom, data) { @@ -88,7 +88,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearTab', 'pearMenu', 'pear url: data.menuUrl, icon: data.menuIcon, close: true - }, 300); + },300); compatible(); }) @@ -105,7 +105,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearTab', 'pearMenu', 'pear }); $("body").on("click", ".refresh", function() { - bodyFrame.refresh(1000); + bodyFrame.refresh(500); }) sideMenu.click(function(dom, data) { diff --git a/Pear Admin v 2.0/component/layui/lay/extends/pearMenu.js b/Pear Admin v 2.0/component/layui/lay/extends/pearMenu.js index 0b603a5..a065c9f 100644 --- a/Pear Admin v 2.0/component/layui/lay/extends/pearMenu.js +++ b/Pear Admin v 2.0/component/layui/lay/extends/pearMenu.js @@ -242,7 +242,6 @@ layui.define(['table', 'jquery', 'element'], function (exports) { if(index === option.defaultMenu){ - controlItem = '
  • '+item.title+'
    • '; menuItem = '
      '; @@ -369,7 +368,7 @@ layui.define(['table', 'jquery', 'element'], function (exports) { // 封 装 }else{ - content += '
      '; + content += '
      无 内 容
      '; /* 暂 无 数 据     */ } diff --git a/Pear Admin v 2.0/component/layui/lay/extends/pearNotice.js b/Pear Admin v 2.0/component/layui/lay/extends/pearNotice.js new file mode 100644 index 0000000..56cbd14 --- /dev/null +++ b/Pear Admin v 2.0/component/layui/lay/extends/pearNotice.js @@ -0,0 +1,117 @@ +layui.define(['table', 'jquery', 'element'], function (exports) { + "use strict"; + + var MOD_NAME = 'pearNotice', + $ = layui.jquery, + element = layui.element; + + var pearNotice = function (opt) { + this.option = opt; + }; + + pearNotice.prototype.render = function (opt) { + //默认配置值 + var option = { + elem:opt.elem, + url:opt.url, + height:opt.height, + data:opt.data, + click:opt.click + } + + option.data = getData(option.url); + + var notice = createHtml(option); + + $("#"+option.elem).html(notice); + + // 添加监听 + $("*[notice-id]").click(function(){ + var id = $(this).attr("notice-id"); + var title = $(this).attr("notice-title"); + option.click(id,title); + }) + + return new pearNotice(option); + } + + /** 同 步 请 求 获 取 数 据 */ + function getData(url){ + + $.ajaxSettings.async = false; + var data = null; + + $.get(url, function(result) { + data = result; + }); + + $.ajaxSettings.async = true; + return data; + } + + function createHtml(option){ + + + + var notice = '
    • '+ + ''+ + '
      '; + + var noticeTitle = '
        '; + + var noticeContent = '
        ' + + var index = 0; + + // 根据 data 便利数据 + $.each(option.data, function(i, item) { + + + + if(index==0){ + + noticeTitle += '
      • '+item.title+'
        • '; + + noticeContent += '
        '; + + }else{ + + noticeTitle += '
      • '+item.title+'
        • '; + + noticeContent += '
        '; + + } + + $.each(item.children, function(i, note) { + + noticeContent += '
        '+ + ''+ + ''+note.title+''+ + ''+note.time+''+ + '
        '; + + }) + + noticeContent += '
        '; + + + index++; + }) + + noticeTitle += '
      '; + + noticeContent += '
      '; + + notice += noticeTitle; + + notice += noticeContent; + + notice += '
      • '; + + + return notice; + + } + + exports(MOD_NAME,new pearNotice()); +}) \ No newline at end of file diff --git a/Pear Admin v 2.0/component/layui/layui.js b/Pear Admin v 2.0/component/layui/layui.js index 4ee5f62..76feb78 100644 --- a/Pear Admin v 2.0/component/layui/layui.js +++ b/Pear Admin v 2.0/component/layui/layui.js @@ -54,6 +54,7 @@ pearAdmin:"extends/pearAdmin", pearFrame:"extends/pearFrame", pearSocial:"extends/pearSocial", + pearNotice:"extends/pearNotice", echarts:"extends/echarts", echartsTheme:"extends/echartsTheme", treetable:"extends/treetable", diff --git a/Pear Admin v 2.0/index.html b/Pear Admin v 2.0/index.html index 16dfe4b..23631f6 100644 --- a/Pear Admin v 2.0/index.html +++ b/Pear Admin v 2.0/index.html @@ -4,16 +4,15 @@ - + - - - - - - + + + + + + + @@ -26,71 +25,96 @@
      -
      -
      +
      - +
      - +
      - + diff --git a/Pear Admin v 2.0/view/console/console.html b/Pear Admin v 2.0/view/console/console.html index 2bed0f5..8ed2271 100644 --- a/Pear Admin v 2.0/view/console/console.html +++ b/Pear Admin v 2.0/view/console/console.html @@ -73,8 +73,8 @@ } .list .list-item{ - height: 34px; - line-height: 34px; + height: 33px; + line-height: 33px; color: gray; padding: 5px; padding-left: 15px; @@ -120,10 +120,10 @@
      今日访问
      -
      +
      9,04,0
      -
      +
      @@ -135,10 +135,10 @@
      提交次数
      -
      +
      6,34,4
      -
      +
      @@ -150,10 +150,10 @@
      下载数量
      -
      +
      1,34,1
      -
      +
      @@ -165,10 +165,10 @@
      流量统计
      -
      +
      7,04,6
      -
      +
      @@ -187,74 +187,7 @@
    • 数据统计
    -
    -
    -
    -
    - PearOne -
    -
    - 城镇中有那么多的酒馆，她却偏偏走进了我的酒馆 -
    -
    10小时前
    -
    -
    -
    -
    -
    - Angular -
    -
    - 希望是一个好东西，也许是最好的，好东西是不会消亡 -
    -
    1小时前
    -
    -
    -
    -
    -
    - Vue -
    -
    - 生命就像一盒巧克力，结果往往出人意料 -
    -
    2小时前
    -
    -
    -
    -
    -
    - BootStrap -
    -
    - 一切都在不可避免的走向庸俗 -
    -
    3小时前
    -
    -
    -
    -
    -
    - Ant Design -
    -
    - 你要是愿意我就永远爱你，你要是不愿意我就永远相思 -
    -
    10小时前
    -
    -
    -
    -
    -
    - Jmys -
    -
    - 在所谓'人世间'摸爬滚打至今，一切都会过去 -
    -
    24小时前
    -
    -
    -
    +
    @@ -280,6 +213,8 @@
    最近更新
      +
    • 新增消息组件2019-12-15 11:28
      • +
    • 移动端兼容2019-12-15 11:28
    • 系统布局优化2019-12-15 11:28
    • 兼容多系统菜单模式2019-12-15 11:28
    • 兼容多标签页切换2019-12-9 14:58
      • @@ -355,12 +290,103 @@