From 0a260078485afa06e991e6e31c694beafecaae80 Mon Sep 17 00:00:00 2001 From: hdm Date: Mon, 29 Nov 2021 16:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC=E6=95=B4?= =?UTF-8?q?=E4=BD=93UI=E4=BD=93=E9=AA=8C=E7=BB=86=E8=8A=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E8=A7=86=E8=A7=89=E6=95=88=E6=9E=9C=E6=9B=B4?= =?UTF-8?q?=E4=BD=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/home/view/admin/index.html | 12 ++++++------ app/home/view/admin/log.html | 4 ++-- app/home/view/admin/log_list.html | 8 +++----- app/home/view/analysis/index.html | 4 ++-- app/home/view/article/cate.html | 16 ++++----------- app/home/view/article/index.html | 4 ++-- app/home/view/article/list.html | 4 ++-- app/home/view/check/index.html | 2 +- app/home/view/conf/index.html | 2 +- app/home/view/database/backuplist.html | 2 +- app/home/view/database/database.html | 2 +- app/home/view/department/index.html | 17 ++++------------ app/home/view/expense/cate.html | 4 ++-- app/home/view/expense/index.html | 4 ++-- app/home/view/income/index.html | 4 ++-- app/home/view/index/index.html | 3 +-- app/home/view/index/main.html | 12 +++++------- app/home/view/invoice/index.html | 4 ++-- app/home/view/invoice/subject.html | 4 ++-- app/home/view/keywords/index.html | 4 ++-- app/home/view/mail/draft.html | 4 ++-- app/home/view/mail/inbox.html | 4 ++-- app/home/view/mail/rubbish.html | 4 ++-- app/home/view/mail/sendbox.html | 4 ++-- app/home/view/menu/index.html | 16 ++++----------- app/home/view/note/cate.html | 16 ++++----------- app/home/view/note/index.html | 2 +- app/home/view/personal/change.html | 4 ++-- app/home/view/personal/leave.html | 4 ++-- app/home/view/plan/calendar.html | 14 ++++++------- app/home/view/plan/index.html | 8 ++++---- app/home/view/position/index.html | 2 +- app/home/view/role/index.html | 4 ++-- app/home/view/rule/index.html | 17 ++++------------ app/home/view/schedule/calendar.html | 15 +++++++------- app/home/view/schedule/cate.html | 2 +- app/home/view/schedule/index.html | 8 ++++---- public/static/home/css/common.css | 9 ++++++--- public/static/home/css/gougucms.css | 24 ++++++++++++----------- public/static/home/js/module/rightpage.js | 2 +- 40 files changed, 119 insertions(+), 160 deletions(-) diff --git a/app/home/view/admin/index.html b/app/home/view/admin/index.html index 8c7ab65..8788524 100644 --- a/app/home/view/admin/index.html +++ b/app/home/view/admin/index.html @@ -1,7 +1,7 @@ {extend name="common/base"/} {block name="style"} {/block} {block name="body"}
-
最新动态
+
员工动态
-
    -
+
    查看更多动态
    diff --git a/app/home/view/analysis/index.html b/app/home/view/analysis/index.html index 6f352e8..b36fcae 100644 --- a/app/home/view/analysis/index.html +++ b/app/home/view/analysis/index.html @@ -30,7 +30,7 @@ fieldset.layui-field-title { {block name="body"} -
    +
    报销售额
    @@ -96,7 +96,7 @@ fieldset.layui-field-title {
    地域分布
    -
    +
    diff --git a/app/home/view/article/cate.html b/app/home/view/article/cate.html index dae9b05..dff75b3 100644 --- a/app/home/view/article/cate.html +++ b/app/home/view/article/cate.html @@ -1,19 +1,11 @@ {extend name="common/base"/} - -{block name="style"} - - {block name="body"} -
    -
    +
    +
    -
    +
    @@ -56,7 +48,7 @@ }); //表头工具栏事件 - $('.body-content').on('click','.add-menu', function(){ + $('.add-menu').on('click', function(){ rightpage.open("{:url('home/article/cate_add')}"); return; }); diff --git a/app/home/view/article/index.html b/app/home/view/article/index.html index cd4e4b2..5ec600b 100644 --- a/app/home/view/article/index.html +++ b/app/home/view/article/index.html @@ -1,8 +1,8 @@ {extend name="common/base"/} {block name="body"} -
    -
    +
    +
    diff --git a/app/home/view/check/index.html b/app/home/view/check/index.html index 3720717..1e1be01 100644 --- a/app/home/view/check/index.html +++ b/app/home/view/check/index.html @@ -1,7 +1,7 @@ {extend name="common/base"/} {block name="body"} -
    +
    -
    +
    @@ -50,7 +50,7 @@ ,laydate = layui.laydate; // 选择员工 - $('.body-content').on('click','[data-event="select"]',function(){ + $('.body-table').on('click','[data-event="select"]',function(){ var that = $(this); var names = that.val(), ids = $('[name="uid"]').val(); employeepicker.init({ @@ -69,7 +69,7 @@ }) }); // 去除员工 - $('.body-content').on('click','[lay-filter="webform"]',function(){ + $('.body-table').on('click','[lay-filter="webform"]',function(){ uid = 0; $('[data-event="select"]').val(''); calendar.refetchEvents({ @@ -78,7 +78,7 @@ }); - $('.body-content').on('click','.addLoan',function(){ + $('.body-table').on('click','.addLoan',function(){ var detail={}; detail['id']=0; detail['title']=''; diff --git a/app/home/view/plan/index.html b/app/home/view/plan/index.html index da028f4..5ebfb93 100644 --- a/app/home/view/plan/index.html +++ b/app/home/view/plan/index.html @@ -8,8 +8,8 @@ {/block} {block name="body"} -
    - +
    +
    @@ -65,7 +65,7 @@ }) // 选择员工 - $('.body-content').on('click','[data-event="select"]',function(){ + $('.body-table').on('click','[data-event="select"]',function(){ var that = $(this); var names = that.val(), ids = $('[name="uid"]').val(); employeepicker.init({ @@ -228,7 +228,7 @@ }) } - $('.body-content').on('click','.addLoan',function(){ + $('.body-table').on('click','.addLoan',function(){ var detail={}; detail['id']=0; detail['title']=''; diff --git a/app/home/view/position/index.html b/app/home/view/position/index.html index f026802..6335222 100644 --- a/app/home/view/position/index.html +++ b/app/home/view/position/index.html @@ -1,7 +1,7 @@ {extend name="common/base"/} {block name="body"} -
    +
    diff --git a/app/home/view/role/index.html b/app/home/view/role/index.html index b8d2600..786d8e0 100644 --- a/app/home/view/role/index.html +++ b/app/home/view/role/index.html @@ -1,8 +1,8 @@ {extend name="common/base"/} {block name="body"} -
    - +
    +
    diff --git a/app/home/view/rule/index.html b/app/home/view/rule/index.html index 29b7616..41922e8 100644 --- a/app/home/view/rule/index.html +++ b/app/home/view/rule/index.html @@ -1,20 +1,11 @@ {extend name="common/base"/} - -{block name="style"} - -{/block} - {block name="body"} -
    -
    +
    +
    -
    +
    @@ -55,7 +46,7 @@ //,skin:'line' }); //表头工具栏事件 - $('.body-content').on('click','.add-menu', function(){ + $('.add-menu').on('click',function(){ rightpage.open("{:url('home/rule/add')}"); return; }); diff --git a/app/home/view/schedule/calendar.html b/app/home/view/schedule/calendar.html index 6376439..a11efdd 100644 --- a/app/home/view/schedule/calendar.html +++ b/app/home/view/schedule/calendar.html @@ -7,13 +7,14 @@ {/block} @@ -24,7 +25,7 @@ -
    +
    @@ -48,7 +49,7 @@ ,laydate = layui.laydate; // 选择员工 - $('.body-content').on('click','[data-event="select"]',function(){ + $('.body-table').on('click','[data-event="select"]',function(){ var that = $(this); var names = that.val(), ids = $('[name="uid"]').val(); employeepicker.init({ @@ -67,7 +68,7 @@ }) }); // 去除员工 - $('.body-content').on('click','[lay-filter="webform"]',function(){ + $('.body-table').on('click','[lay-filter="webform"]',function(){ uid = 0; $('[data-event="select"]').val(''); calendar.refetchEvents({ @@ -76,7 +77,7 @@ }); - $('.body-content').on('click','.addLoan',function(){ + $('.body-table').on('click','.addLoan',function(){ addEvent(); }); diff --git a/app/home/view/schedule/cate.html b/app/home/view/schedule/cate.html index a262685..9f650e3 100644 --- a/app/home/view/schedule/cate.html +++ b/app/home/view/schedule/cate.html @@ -1,7 +1,7 @@ {extend name="common/base"/} {block name="body"} -
    +
    diff --git a/app/home/view/schedule/index.html b/app/home/view/schedule/index.html index e790e71..c9f3f05 100644 --- a/app/home/view/schedule/index.html +++ b/app/home/view/schedule/index.html @@ -8,8 +8,8 @@ {/block} {block name="body"} -
    - +
    +
    @@ -64,7 +64,7 @@ }) // 选择员工 - $('.body-content').on('click','[data-event="select"]',function(){ + $('.body-table').on('click','[data-event="select"]',function(){ var that = $(this); var names = that.val(), ids = $('[name="uid"]').val(); employeepicker.init({ @@ -387,7 +387,7 @@ }) } - $('.body-content').on('click','.addLoan',function(){ + $('.body-table').on('click','.addLoan',function(){ addEvent(); }); diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css index ef39e27..94df5c5 100644 --- a/public/static/home/css/common.css +++ b/public/static/home/css/common.css @@ -39,10 +39,12 @@ :-ms-input-placeholder { /* Internet Explorer 10-11 */ color: #aaa; } - + .layui-card { box-shadow: 0 1px 3px 0 rgb(5 32 96 / 10%);} + .layui-table, .layui-table-view{margin:0} .layui-table td,.layui-table th{padding:9px 10px;} .layui-table-cell{padding:0 10px;} .layui-table[lay-size=sm] td, .layui-table[lay-size=sm] th {padding: 5px;} + .layui-form-bar{padding:12px;border:1px solid #eee; border-bottom:none;} .auth-single .auth-icon{font-size:24px; float:left;} .auth-single .layui-form-radio,.auth-single .layui-form-checkbox{margin-left:0;} .auth-single .layui-form-radio{margin-top:0;} @@ -64,8 +66,9 @@ .layui-td-gray3{color:#999; width:120px; text-align:right; background-color:#f8f8f8;} .layui-td-gray4{color:#999; width:150px; text-align:right; background-color:#f8f8f8;} .layui-td-gray font,.layui-td-gray2 font,.layui-td-gray3 font{color:#FF6347; margin-left: 3px;} - .main-body{padding:10px;padding-bottom: 0;min-width: 880px;} + .main-body{padding:15px;padding-bottom: 0;min-width: 868px;} .body-content{padding:10px;background-color:#fff;} + .body-table{background-color:#fff; margin-bottom:15px} .body-form-btn{padding:10px 0;} .span-color--1{color:#999999;} .span-color-0{color:#5FB878;} @@ -96,7 +99,7 @@ } .layui-layer-admin-right { box-shadow: 1px 1px 10px rgba(0,0,0,.1); - border-radius: 0; + border-radius: 0!important; overflow: auto; } .layui-anim-rl.layui-layer-iframe{ diff --git a/public/static/home/css/gougucms.css b/public/static/home/css/gougucms.css index f01c69c..8e4908e 100644 --- a/public/static/home/css/gougucms.css +++ b/public/static/home/css/gougucms.css @@ -1,12 +1,12 @@ .main-body{padding:0;min-width: 1220px;} .ittab-bg-gray {background-color:#001529;} -.layui-layout-admin .layui-header {height:50px;background-color:#fff;} -.layui-layout-admin .layui-logo {line-height:50px;cursor:pointer;font-size:16px;color:#fff;background:#001529;width:180px;} +.layui-layout-admin .layui-header {height:49px;background-color:#fff;box-shadow: 0 2px 6px 0 rgb(5 32 96 / 10%);} +.layui-layout-admin .layui-logo {line-height:49px;cursor:pointer;font-size:16px;color:#fff;background:#001529;width:180px;border-bottom: 1px solid #001529;} .layui-layout-admin .layui-side {top:50px;width:180px;border-right:1px solid #ddd;} .layui-nav .layui-nav-item {line-height:45px;} .layui-nav.layui-layout-left {color:#333;margin-left:10px;} .layui-nav.layui-layout-left input {border:0;} -.layui-layout-admin .layui-body {top:50px;padding:0px;padding-right:0px;padding-bottom:0px;bottom:0px;left:180px;z-index:1018;overflow:visible;right:0;background-color:#eff0f4;} +.layui-layout-admin .layui-body {top:50px; z-index:1008; padding:0;padding-right:0;padding-bottom:0;bottom:0;left:180px;overflow:visible;right:0;background-color:#F5F8FA;} .ittab-menulist {width:100%;height:100%; border-right:1px solid #ccc; font-size:14px; color:#aaaaaa;} @@ -36,23 +36,25 @@ .ittab-menulist-5 li {background-color: #131E25;} .gougu-admin-tab {margin:0;} -.gougu-admin-tab .layui-icon-prev {position:absolute;top:-50px; left:0; width:39px; height:50px; line-height:50px; color: #999; text-align:center; cursor:pointer; background-color:#fff;border-right: 1px solid #f1f2f7;} -.gougu-admin-tab .layui-icon-prev:hover{color: #333;} -.gougu-admin-tab .layui-icon-next {position:absolute;top:-50px; right:152px; width:39px; height:50px; line-height:50px; color: #999; text-align:center; cursor:pointer; background-color:#fff;border-left: 1px solid #f1f2f7;} -.gougu-admin-tab .layui-icon-next:hover{color: #333;} -.gougu-admin-tab .layui-tab-title {position:absolute;top:-50px;height:50px;left:36px; border:0;max-width:calc(100% - 226px); overflow:hidden;} +.gougu-admin-tab .layui-icon-prev,.gougu-admin-tab .layui-icon-next {position:absolute;top:-50px; width:39px; height:49px; line-height:49px; color: #999; text-align:center; cursor:pointer; background-color:#fff;} +.gougu-admin-tab .layui-icon-prev{left:0; border-right: 1px solid #F5F8FA;} +.gougu-admin-tab .layui-icon-next {right:152px; border-left: 1px solid #F5F8FA;} +.gougu-admin-tab .layui-icon-prev:hover,.gougu-admin-tab .layui-icon-next:hover{color: #333;} -.gougu-admin-tab .layui-tab-title li {min-width:36px; padding:0 24px 0 12px; color:#666;font-size:12px;line-height:48px;border-top:3px solid #fff; border-right: 1px solid #f1f2f7; background-color:#fff;} + +.gougu-admin-tab .layui-tab-title {position:absolute;top:-50px; z-index:58; height:49px;left:36px; border:0;max-width:calc(100% - 226px); overflow:hidden;} + +.gougu-admin-tab .layui-tab-title li {min-width:36px; padding:0 24px 0 12px; color:#666;font-size:12px;line-height:48px;border-top:3px solid #fff; border-right: 1px solid #F5F8FA; background-color:#fff;} .gougu-admin-tab .layui-tab-title li .gougu-tab-active {display: inline-block; background-color: #999; width: 8px; height: 8px; border-radius: 20px; margin-right: 6px;} .gougu-admin-tab .layui-tab-title li .layui-tab-close {position:absolute;width:15px;height:15px;line-height:16px;top:16px;right:5px;font-size:10px;display:none;border-radius:50%;} -.gougu-admin-tab .layui-tab-title li:hover {color:#333;background-color:#f1f2f7;border-top:3px solid #333;} +.gougu-admin-tab .layui-tab-title li:hover {color:#333;background-color:#F5F8FA;border-top:3px solid #333;} .gougu-admin-tab .layui-tab-title li:hover .gougu-tab-active {background-color:#333} .gougu-admin-tab .layui-tab-title li:hover .layui-tab-close {display:inline-block;} .gougu-admin-tab .layui-tab-title li .layui-tab-close:hover {background-color:#E94335;color:#fff;} -.gougu-admin-tab .layui-tab-title li.layui-this {color:#333;background-color:#f1f2f7;border-top:3px solid #E94335;} +.gougu-admin-tab .layui-tab-title li.layui-this {color:#333;background-color:#F5F8FA;border-top:3px solid #E94335;} .gougu-admin-tab .layui-tab-title li.layui-this .gougu-tab-active{background-color:#E94335;} .gougu-admin-tab .layui-tab-title li.layui-this .layui-tab-close{display:inline-block;} diff --git a/public/static/home/js/module/rightpage.js b/public/static/home/js/module/rightpage.js index d89ba2b..1304d25 100644 --- a/public/static/home/js/module/rightpage.js +++ b/public/static/home/js/module/rightpage.js @@ -5,7 +5,7 @@ layui.define(['layer'], function(exports){ layer.open({ type: 2, title: '', - offset: ['1px', '100%'], + offset: ['0', '100%'], skin: 'layui-anim layui-anim-rl layui-layer-admin-right', closeBtn: 0, content: content,