diff --git a/Pear Admin v 2.0/admin/data/menu.json b/Pear Admin v 2.0/admin/data/menu.json index c15e007..989be38 100644 --- a/Pear Admin v 2.0/admin/data/menu.json +++ b/Pear Admin v 2.0/admin/data/menu.json @@ -3,7 +3,6 @@ "title": "工作空间", "type": 0, "icon": "layui-icon layui-icon-console", - "spread": true, "href": "", "children": [{ "id": 11, @@ -11,24 +10,21 @@ "icon": "layui-icon layui-icon-console", "type": 1, "openType": "_iframe", - "href": "view/console/console1.html", - "spread": true + "href": "view/console/console1.html" },{ "id": 13, "title": "数据分析", "icon": "layui-icon layui-icon-console", "type": 1, "openType": "_iframe", - "href": "view/console/console2.html", - "spread": true + "href": "view/console/console2.html" },{ "id": 12, "title": "百度一下", "icon": "layui-icon layui-icon-console", "type": 1, - "openType": "_blank", - "href": "http://www.baidu.com", - "spread": true + "openType": "_iframe", + "href": "http://www.baidu.com" }] }, { @@ -37,15 +33,13 @@ "icon": "layui-icon layui-icon-set-fill", "type": 0, "href": "", - "spread": true, "children": [{ "id": 41, "title": "用户管理", "icon": "layui-icon layui-icon-username", "type": 1, "openType": "_iframe", - "href": "view/system/user.html", - "spread": true + "href": "view/system/user.html" }, { "id": 42, @@ -53,8 +47,7 @@ "icon": "layui-icon layui-icon-user", "type": 1, "openType": "_iframe", - "href": "view/system/role.html", - "spread": true + "href": "view/system/role.html" }, { "id": 43, @@ -62,8 +55,7 @@ "icon": "layui-icon layui-icon-user", "type": 1, "openType": "_iframe", - "href": "view/system/power.html", - "spread": true + "href": "view/system/power.html" } ] }, @@ -73,7 +65,6 @@ "icon": "layui-icon layui-icon-component", "type": 0, "href": "", - "spread": true, "children": [ { @@ -82,15 +73,13 @@ "icon": "layui-icon layui-icon-face-smile", "type": 0, "href": "view/common/message.html", - "spread": true, "children": [{ "id": 211, "title": "功能按钮", "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/basic/button.html", - "spread": true + "href": "view/common/basic/button.html" }, { "id": 200, @@ -98,8 +87,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/basic/icon.html", - "spread": true + "href": "view/common/basic/icon.html" }, { "id": 212, @@ -107,8 +95,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/basic/form.html", - "spread": true + "href": "view/common/basic/form.html" }, { "id": 215, @@ -116,8 +103,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/basic/step.html", - "spread": true + "href": "view/common/basic/step.html" }, { "id": 213, @@ -125,8 +111,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/basic/formSelects.html", - "spread": true + "href": "view/common/basic/formSelects.html" } ] }, @@ -136,15 +121,13 @@ "icon": "layui-icon layui-icon-face-smile", "type": 0, "href": "view/common/message.html", - "spread": true, "children": [{ "id": 221, "title": "数据表格", "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/senior/table.html", - "spread": true + "href": "view/common/senior/table.html" }, { "id": 222, @@ -152,8 +135,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/senior/treeTable.html", - "spread": true + "href": "view/common/senior/treeTable.html" }, { "id": 223, @@ -161,8 +143,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/senior/tinymce.html", - "spread": true + "href": "view/common/senior/tinymce.html" } ] }, @@ -172,15 +153,13 @@ "icon": "layui-icon layui-icon-face-smile", "type": 0, "href": "view/common/message.html", - "spread": true, "children": [{ "id": 231, "title": "消息提醒", "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/popper/message.html", - "spread": true + "href": "view/common/popper/message.html" }, { @@ -189,8 +168,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/popper/loading.html", - "spread": true + "href": "view/common/popper/loading.html" }, { "id": 233, @@ -198,8 +176,7 @@ "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/common/popper/drawer.html", - "spread": true + "href": "view/common/popper/drawer.html" } ] }, @@ -210,15 +187,13 @@ "icon": "layui-icon layui-icon-face-smile", "type": 0, "href": "view/common/table.html", - "spread": true, "children": [{ "id": 241, "title": "哈希加密", "icon": "layui-icon layui-icon-face-cry", "type": 1, "openType": "_iframe", - "href": "view/common/other/hash.html", - "spread": true + "href": "view/common/other/hash.html" } ] } @@ -230,15 +205,13 @@ "icon": "layui-icon layui-icon-face-cry", "type": 0, "href": "", - "spread": true, "children": [{ "id": 301, "title": "任务列表", "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/page/task.html", - "spread": true + "href": "view/page/task.html" } ] }, @@ -248,15 +221,13 @@ "icon": "layui-icon layui-icon-auz", "type": 0, "href": "", - "spread": true, "children": [{ "id": 403, "title": "403", "icon": "layui-icon layui-icon-face-smile", "type": 1, "openType": "_iframe", - "href": "view/error/403.html", - "spread": true + "href": "view/error/403.html" }, { "id": 404, @@ -264,8 +235,7 @@ "icon": "layui-icon layui-icon-face-cry", "type": 1, "openType": "_iframe", - "href": "view/error/404.html", - "spread": true + "href": "view/error/404.html" }, { @@ -274,12 +244,9 @@ "icon": "layui-icon layui-icon-face-cry", "type": 1, "openType": "_iframe", - "href": "view/error/500.html", - "spread": true + "href": "view/error/500.html" } ] } - - ] 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 1b3e92a..9080308 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 @@ -211,6 +211,14 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearTab', 'pearMenu', 'pear } }; + $("body").on("click", ".pearson", function() { + pearTab.addTabOnlyByElem("content", { + id: 111, + title: "个人信息", + url: "view/system/person.html", + close: true + }) + }) $("body").on("click", ".collaspe,.pear-cover", function() { sideMenu.collaspe(); 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 index 56cbd14..9c483a1 100644 --- a/Pear Admin v 2.0/component/layui/lay/extends/pearNotice.js +++ b/Pear Admin v 2.0/component/layui/lay/extends/pearNotice.js @@ -68,7 +68,7 @@ layui.define(['table', 'jquery', 'element'], function (exports) { - if(index==0){ + if(index === 0){ noticeTitle += '
  • '+item.title+'
  • '; diff --git a/Pear Admin v 2.0/index.html b/Pear Admin v 2.0/index.html index d3c1738..226e72c 100644 --- a/Pear Admin v 2.0/index.html +++ b/Pear Admin v 2.0/index.html @@ -69,11 +69,12 @@ diff --git a/Pear Admin v 2.0/view/console/common.html b/Pear Admin v 2.0/view/console/common.html new file mode 100644 index 0000000..858c949 --- /dev/null +++ b/Pear Admin v 2.0/view/console/common.html @@ -0,0 +1,43 @@ + + + + + + + + + +
    +
    弹出层
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    Iframe 操作
    +
    +
    +
    + +
    +
    +
    +
    + + + + diff --git a/Pear Admin v 2.0/view/console/console1.html b/Pear Admin v 2.0/view/console/console1.html index 71685ff..6918853 100644 --- a/Pear Admin v 2.0/view/console/console1.html +++ b/Pear Admin v 2.0/view/console/console1.html @@ -20,7 +20,7 @@ .card .body {color: gray;} .card .body {margin-left: 20px;margin-right: 20px;} .card .footer {margin-left: 20px;margin-right: 20px;margin-top: 20px;font-size: 13px;color: gray;position: absolute;} - .list .list-item {height: 33px;line-height: 33px;color: gray;padding: 5px;padding-left: 15px;border-radius: 4px;margin-top: 5.2px;} + .list .list-item {height: 32px;line-height: 32px;color: gray;padding: 5px;padding-left: 15px;border-radius: 4px;margin-top: 5.2px;} .custom-tab .layui-tab-title {border-bottom-width: 0px;border-bottom-style: none;} .custom-tab .layui-tab-title li {margin-left: 10px;} .list .list-item:hover {background-color: whitesmoke;} @@ -164,15 +164,14 @@
    最近更新