From 559733bb61f3f5f6dfcf5cd1d78b4eb672215216 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 27 May 2022 15:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=BB=91=E6=9A=97=E4=B8=BB?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/adminlte/css/skins/skin-dark.css | 327 ++++++++++++++++++ .../static/icheck/1.0/minimal/dark.png | Bin 0 -> 1804 bytes .../static/icheck/1.0/minimal/dark.psd | Bin 0 -> 39956 bytes .../static/icheck/1.0/minimal/grey.css | 5 +- .../3.5/css/awesome/zTreeStyle.css | 5 + .../laydate/5.3/theme/default/laydate.css | 16 + .../static/layer/3.5/theme/default/icon.png | Bin 11493 -> 14758 bytes .../static/layer/3.5/theme/default/layer.css | 231 ++++++------- .../main/resources/static/images/ruler.png | Bin 0 -> 152 bytes .../main/resources/views/layouts/default.html | 11 +- .../views/modules/sys/onlineList.html | 4 +- .../views/modules/sys/switchSkin.html | 9 +- .../views/modules/sys/sysDesktop.html | 76 ++-- .../sys/user/empUserFormAuthDataScope.html | 8 +- .../views/modules/sys/user/secAdminForm.html | 8 +- .../views/themes/default/include/header.html | 5 +- 16 files changed, 517 insertions(+), 188 deletions(-) create mode 100644 common/src/main/resources/static/adminlte/css/skins/skin-dark.css create mode 100644 common/src/main/resources/static/icheck/1.0/minimal/dark.png create mode 100644 common/src/main/resources/static/icheck/1.0/minimal/dark.psd create mode 100644 modules/core/src/main/resources/static/images/ruler.png diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css new file mode 100644 index 00000000..befcbc52 --- /dev/null +++ b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css @@ -0,0 +1,327 @@ +/* + * http://jeesite.com + */ +a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable { + color: #42a4e0; +} +.main-header .navbar { + background: #1a1a1a; +} +.main-header .navbar .nav > li > a { + color: #b9b9b9; +} +.main-header .navbar .nav > li > a:hover, +.main-header .navbar .nav > li > a:active, +.main-header .navbar .nav > li > a:focus, +.main-header .navbar .nav .open > a, +.main-header .navbar .nav .open > a:hover, +.main-header .navbar .nav .open > a:focus, +.main-header .navbar .nav > .active > a { + background: rgba(0, 0, 0, 0.3); + color: #f6f6f6; +} +.main-header .navbar .sidebar-toggle { + color: #ffffff; +} +.main-header .navbar .sidebar-toggle:hover { + color: #f6f6f6; + background: rgba(0, 0, 0, 0.3); +} +.main-header .navbar .sidebar-toggle { + color: #fff; +} +.main-header .navbar .sidebar-toggle:hover { + background-color: #367fa9; +} +@media (max-width: 767px) { + .main-header .navbar .dropdown-menu li.divider { + background-color: rgba(255, 255, 255, 0.1); + } + .main-header .navbar .dropdown-menu li a { + color: #fff; + } + .main-header .navbar .dropdown-menu li a:hover { + background: #367fa9; + } +} +.main-header .logo { + background-color: transparent; + color: #fff; + border-bottom: 0 solid transparent; +} +.main-header .logo:hover { + background-color: #000; +} +.main-header li.user-header { + background-color: #000; +} +.content-header { + background: transparent; +} +.sidebar, +.left-side { + background-color: #1a1a1a; +} +.content-wrapper, +.main-footer { + border-left: 1px solid #303030; +} +.user-panel > .info, +.user-panel > .info > a { + color: #eee; +} +.sidebar-menu > li { + -webkit-transition: border-left-color 0.3s ease; + -o-transition: border-left-color 0.3s ease; + transition: border-left-color 0.3s ease; +} +.sidebar-menu > li.header { + color: #848484; + background: #1a1a1a; +} +.sidebar-menu > li > a { + border-left: 3px solid transparent; + font-weight: 600; +} +.sidebar-menu > li:hover > a, +.sidebar-menu > li.active > a { + color: #cccccc; + background: #1a1a1a; +} +.sidebar-menu > li.active { + border-left-color: #1e5edb; +} +.sidebar-menu > li.active > a { + font-weight: 600; +} +.sidebar-menu > li.menu-open > a, +.sidebar-menu > li > .treeview-menu { + background: #1a1a1a; +} +.sidebar a { + color: #d3d3d3; +} +.sidebar a:hover { + text-decoration: none; +} +.treeview-menu > li > a { + color: #d3d3d3; +} +.treeview-menu > li.active > a, +.treeview-menu > li > a:hover { + color: #fff; +} +.sidebar-form { + border-radius: 3px; + border: 1px solid #d2d6de; + margin: 10px 10px; +} +.sidebar-form input[type="text"], +.sidebar-form .btn { + box-shadow: none; + background-color: #303030; + border: 1px solid transparent; + height: 35px; +} +.sidebar-form input[type="text"] { + color: #666; + border-top-left-radius: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 2px; +} +.sidebar-form input[type="text"]:focus, +.sidebar-form input[type="text"]:focus + .input-group-btn .btn { + background-color: #303030; + color: #666; +} +.sidebar-form input[type="text"]:focus + .input-group-btn .btn { + border-left-color: #fff; +} +.sidebar-form .btn { + color: #999; + border-top-left-radius: 0; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 0; +} +.main-footer { + border-top-color: #303030; + border-radius: 4px; + background-color: #1a1a1a; + color: #ddd; +} +.skin-blue.layout-top-nav .main-header > .logo { + background-color: #1e5edb; + color: #fff; + border-bottom: 0 solid transparent; +} +.skin-blue.layout-top-nav .main-header > .logo:hover { + background-color: #3b8ab8; +} + +.sidebar-menu {padding:0 8px 0 7px;} +.sidebar-menu li>a>.pull-right-container {left:0;} +.sidebar-menu .treeview-item.active>a {color: #fff;background-color:#2975bc;border-right:0;border-radius:6px;} + +/* 页签添加内边距 */ +.content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#000;} +.box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;} +.tabpanel_content .html_content {padding:14px 14px 13px 15px;} +.tabpanel_tab_content {border-bottom:0;} +.ui-layout-resizer {background:none;} +.content {padding:0!important} + +/* 页签-无界风格 */ +.tabpanel_mover li {height:26px;padding:2px 16px 2px 3px;margin:11px 0 0px 9px;border:0;border-radius:4px;background:#1a1a1a;} +.tabpanel_mover li .title {padding-left:0;text-align:center;color:#ddd;} +.tabpanel_mover li.active {background-color:#2975bc;} +.tabpanel_mover li.active div {color:#fff;} +.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;background:none;opacity:0.7;} +.tabpanel_mover li .closer:before {content:"\f00d";} +.tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2); + -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;} +.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;} +.tabpanel_tab_content {background-color:transparent;border-bottom-color:#eeeeee;overflow:visible;} +.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:12px;} +.tabpanel_tab_content .tabpanel_mover {margin:0 5px;} + +/* 页签-下划线风格 +.tabpanel_mover li {background:#fff;border:0;padding:5px 16px 5px 3px;} +.tabpanel_mover li .title {padding-left:0;text-align:center;} +.tabpanel_mover li.active {background-color:#fff;border-bottom:2px solid #3aa0ff;} +.tabpanel_mover li.active div {color:#0975d9;} +.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.6;right:3px;top:10px;} +.tabpanel_mover li .closer:before {content:"\f00d";} +.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2); + -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;} +.tabpanel_tab_content {height:32px;line-height:32px;border:0;background-color:#fff;overflow:visible;} +.tabpanel_tab_content .tabpanel_move_content {min-height:32px;} +.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:4px;} */ + +#page-loading {color:#ddd;border-color:#505050;background:#343434;padding:7px} +::-webkit-scrollbar {background:#2a2a2a;} +::-webkit-scrollbar-thumb {background:#6a6a6a;} + +.btn-default {background-color:#323232;border-color:#323232;color:#b5b5b5;} +.btn-default.active, .btn-default:active {background-color:#3e3e3e;border-color:#3e3e3e;color:#dfdfdf;} +.btn-default:hover, .btn-default:active, .btn-default.hover, .btn-default:focus, +.btn-default.active.focus, .btn-default.active:focus, .btn-default.active:hover, .btn-default:active.focus, +.btn-default:active:focus, .btn-default:active:hover, .open>.dropdown-toggle.btn-default.focus, +.open>.dropdown-toggle.btn-default:focus, .open>.dropdown-toggle.btn-default:hover { + background-color:#3e3e3e;border-color:#3e3e3e;color:#eee;} +.input-group-btn .btn, .treeSearchInput button {background-color:#1a1a1a;border-color:#3c3c3c;color:#ddd;} +.treeExpandCollapse, .treeExpandCollapse a {background-color:#1a1a1a;color:#8d8d8d;} + +.btn-primary, .btn-primary:hover, .btn-primary:active, +.btn-primary.hover, .btn-primary.focus, .btn-primary:focus, +.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover, +.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover, +.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, +.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, +.select2-container--default .select2-selection--multiple .select2-selection__choice, +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#1e5edb!important;border-color:#1e5edb!important;} +.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#2975bc;} +.form-unit {border-bottom:1px solid #4e4e4e;} + +.form-inline .form-more {background-color:#1a1a1a;border-bottom-color:#393939;} +.form-control, .input-group .input-group-addon, input, select, textarea, pre {background-color:#1a1a1a;border-color:#414141!important;color:#ddd} +.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {background-color:#2a2a2a;} +.select2-container .select2-selection--single, .select2-container .select2-selection--multiple, +.select2-container--default .select2-selection--single, .select2-selection .select2-selection--single, +.select2-container--default .select2-selection--multiple {background-color:#1a1a1a!important;border-color:#383838;color:#ddd} +.select2-container--default .select2-selection--single .select2-selection__rendered {color:#ddd} +.treeselect .form-control, .form-control.laydate {background-color:#1a1a1a!important;color:#ddd} +.select2-dropdown {background-color:#1a1a1a;border-color:#414141!important;color:#ddd;} +.select2-container--default .select2-results__option[aria-selected=true] {background-color:#3c3c3c;color:#ddd;} + +.navbar-custom-menu>.navbar-nav>li>.dropdown-menu, +.main-header .navbar .dropdown-menu li.divider {background-color:#1a1a1a;border-color:#414141!important;} +.main-header .navbar .dropdown-menu li a {color:#ddd!important;} +.main-header .navbar .dropdown-menu li a:hover {background: #4c4c4c!important;} +.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a {border-color:#414141!important;} +.navbar-nav>.messages-menu>.dropdown-menu>li.header,.main-header .navbar .dropdown-menu li a, +.navbar-nav>.notifications-menu>.dropdown-menu>li.footer>a, .navbar-nav>.messages-menu>.dropdown-menu>li.footer>a, +.navbar-nav>.tasks-menu>.dropdown-menu>li.footer>a {background-color:#1a1a1a!important;border-color:#414141!important;color:#c6c6c6!important;} + +.error-page > .error-content, .error-page > .copyright {color:#9d9d9d;} +.sort-highlight, .tags-input {background:#262626;border-color:#4e4e4e;} +.todo-list>li {background:#262626;color:#ddd;border-left-color:#4e4e4e;} +.alert-default {background:#1a1a1a;border-color:#3c3c3c;color:#7c7c7c;} +.strength .strength_meter {border-color:#3c3c3c!important;} +.bg-teal-gradient {background:#34b3b3!important;} +.info-box {background:#1a1a1a;color:#ddd;} + +.box, .nav-tabs-custom {background:#1a1a1a!important;color:#ddd!important;box-shadow:none;} +.box-trees {background:#2a2a2a!important;} +.box-header, .nav-tabs-custom>.nav-tabs>li.header {color:#c8c8c8;} +.box-header.with-border {border-bottom-color:#3a3a3a;} +.box-footer {background-color:#282828;border-top:#3c3c3c;} +.box-footer .knob-label {background:#282828;color:#ddd;} +.box-main>.box-header, .nav-main>.nav-tabs {border-bottom-color:#3a3a3a;color:#ddd} +.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border-bottom-color:#1a1a1a;} +.nav-tabs-custom>.tab-content {background-color:#1a1a1a;color:#ddd;} +.nav-tabs-custom>.nav-tabs {border-bottom-color:#3a3a3a;} +.nav-tabs-custom>.nav-tabs>li>a {color:#8d8d8d;} +.nav-tabs-custom>.nav-tabs>li.active>a {border-right-color:#3a3a3a;border-left-color:#3a3a3a;} +.nav-tabs-custom>.nav-tabs>li.active>a, .nav-tabs-custom>.nav-tabs>li.active:hover>a {background-color:#1a1a1a;color:#ddd;} +.nav-tabs-custom>.nav-tabs>li:first-of-type.active>a, +.nav-tabs-custom>.nav-tabs.pull-right>li:first-of-type.active>a {border-left-color:#3a3a3a;} +.nav-main>.nav-tabs>li>a:hover {color:#ddd;} +.box-main>.box-header .box-title .fa {color:#2975bc;} +.nav-tabs-custom>.nav-tabs>li.active {border-top-color:#3aa0ff;} +.nav-main>.nav-tabs.pull-right>li:first-of-type.active>a {border-color:#3c3c3c;} +.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple, +.select2-container--default .select2-search--dropdown .select2-search__field, +.select2-container--default.select2-container--focus .select2-selection--single, +.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#40a9ff!important;box-shadow:0 0 0 2px rgba(24,144,255,.2);} +.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color: #1f1f1f;color:#b3b3b3;} +.table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td {border-top-color:#3e3e3e;} +.table-striped>tbody>tr:nth-of-type(odd) {background-color:#262626;} +.table-hover>tbody>tr:hover>td, .table-hover>tbody>tr:hover>th {background-color:#323232;} +.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child, +.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column, +.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#333;} +.ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td, +.ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#222;} +.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#1f1f1f;} +/* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */ + +.ui-jqgrid .frozen-left th.ui-th-ltr, .ui-jqgrid .frozen-left tr.ui-row-ltr td {border-right-color:#333} +.ui-jqgrid .frozen-right th.ui-th-ltr, .ui-jqgrid .frozen-right tr.ui-row-ltr td {border-left-color:#333} +.ui-jqgrid tr.jqgroup td, .ui-jqgrid tr.footrow td, .ui-jqgrid tr.jqfoot td {background:#323232;} +.ui-jqgrid .actions .moreItems {background:#1a1a1a;border-color:#3c3c3c;box-shadow:none;} +.ui-jqgrid .actions .moreItems a {color:#ddd;} +.ui-jqgrid .editgrid tr.ui-state-hover.ui-row-ltr td, +.ui-jqgrid .editgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#1a1a1a!important;} + +.ui-jqgrid .ui-priority-secondary {background-color:#111;} +.ui-widget-content {background-color:#1a1a1a;} + +.pagination>li>a, .pagination>li>span {background:#262626;color:#ddd;border-color:#525252;} +.pagination>li>a:focus, .pagination>li>a:hover, .pagination>li>span:focus, .pagination>li>span:hover, +.pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover, .pagination>.active>span, +.pagination>.active>span:focus, .pagination>.active>span:hover {background:#3aa0ff;color:#fff;border-color:#3aa0ff;} +.pagination>.disabled>a, .pagination>.disabled>a:focus, .pagination>.disabled>a:hover, .pagination>.disabled>span, +.pagination>.disabled>span:focus, .pagination>.disabled>span:hover {background:#262626;color:#747474;border-color:#525252;} + +.table-form input, .table-form select, .table-form textarea, +.table-form .form-control, .table-form .select2-selection, +.table-form .form-control:focus, .table-form .select2-container--default.select2-container--focus .select2-selection--single, +.table-form .select2-container--default.select2-container--focus .select2-selection--multiple {border-bottom-color:#494949} +.table-form .ui-jqgrid tr.ui-row-ltr td input, +.table-form .ui-jqgrid tr.ui-row-ltr td select, +.table-form .ui-jqgrid tr.ui-row-ltr td textarea, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td input, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td select, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td textarea, +.table-form .ui-jqgrid tr.ui-row-ltr.ui-priority-secondary td input, +.table-form .ui-jqgrid tr.ui-row-ltr.ui-priority-secondary td select, +.table-form .ui-jqgrid tr.ui-row-ltr.ui-priority-secondary td textarea, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr.ui-priority-secondary td, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr.ui-priority-secondary td input, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr.ui-priority-secondary td select, +.table-form .ui-jqgrid tr.ui-state-highlight.ui-row-ltr.ui-priority-secondary td textarea {color:#ddd!important;} +.table-form .ui-jqgrid tr.ui-state-highlight {background-color:#1a1a1a!important;} diff --git a/common/src/main/resources/static/icheck/1.0/minimal/dark.png b/common/src/main/resources/static/icheck/1.0/minimal/dark.png new file mode 100644 index 0000000000000000000000000000000000000000..0bad0d695d5d9d101af254156d0d8bffa7fc1c2e GIT binary patch literal 1804 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 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/static/icheck/1.0/minimal/grey.css b/common/src/main/resources/static/icheck/1.0/minimal/grey.css index cff3eb59..28701c9b 100644 --- a/common/src/main/resources/static/icheck/1.0/minimal/grey.css +++ b/common/src/main/resources/static/icheck/1.0/minimal/grey.css @@ -24,4 +24,7 @@ .icheckbox_minimal-grey, .iradio_minimal-grey {background-image:url(grey@2x.png); -webkit-background-size:200px 20px;background-size:200px 20px;} -} \ No newline at end of file +} + +.skin-dark .icheckbox_minimal-grey, +.skin-dark .iradio_minimal-grey {background-image:url(dark.png);} \ No newline at end of file diff --git a/common/src/main/resources/static/jquery-ztree/3.5/css/awesome/zTreeStyle.css b/common/src/main/resources/static/jquery-ztree/3.5/css/awesome/zTreeStyle.css index ee839885..632d121f 100644 --- a/common/src/main/resources/static/jquery-ztree/3.5/css/awesome/zTreeStyle.css +++ b/common/src/main/resources/static/jquery-ztree/3.5/css/awesome/zTreeStyle.css @@ -116,3 +116,8 @@ ul.ztree.zTreeDragUL {margin:0;padding:0;position:absolute;width:auto;height:aut .ztree li span.button.chk[class$="focus"]:before {font-weight:bold;} .ztree li span.button.chk[class$="disable"]:before {color:#aaa;} .ztree li a.curSelectedNode, .ztree li a.tmpTargetNode_inner {height:26px;} + +.skin-dark .ztree li a {color:#ddd} +.skin-dark .ztree li span.button:before {color:#aaa} +.skin-dark .ztree li a.curSelectedNode {background-color:#2975bc;color:#eee;} +.skin-dark .ztree li a.curSelectedNode span.button:before {color:#eee;} diff --git a/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css b/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css index 8fddab20..dcb175d2 100644 --- a/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css +++ b/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css @@ -169,3 +169,19 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;} .laydate-theme-grid .laydate-year-list>li{height: 43px; line-height: 43px;} .laydate-theme-grid .laydate-month-list>li{height: 71px; line-height: 71px;} +.skin-dark .layui-laydate, +.skin-dark .layui-laydate-hint, +.skin-dark .layui-laydate-list, +.skin-dark .layui-laydate-footer span, +.skin-dark .laydate-time-list li ol {background:#1a1a1a;border-color:#484848;color:#ddd;} +.skin-dark .layui-laydate-header {border-bottom-color:#484848;} +.skin-dark .layui-laydate-footer {border-top-color:#484848;} +.skin-dark .layui-laydate-content th {color:#9c9c9c;} +.skin-dark .layui-laydate-content td {color:#aaa;} +.skin-dark .layui-laydate-content .laydate-day-prev, +.skin-dark .layui-laydate-content .laydate-day-next {color:#5a5a5a} +.skin-dark .layui-laydate-footer span {background:transparent;} +.skin-dark .layui-laydate-content td:hover, +.skin-dark .layui-laydate-list li:hover, +.skin-dark .laydate-footer-btns span {background-color:#444;border-color:#444;color:#b5b5b5;} +.skin-dark .layui-laydate .laydate-btns-confirm {background-color:#139ce0;border-color:#139ce0;color:#fff;} \ No newline at end of file diff --git a/common/src/main/resources/static/layer/3.5/theme/default/icon.png b/common/src/main/resources/static/layer/3.5/theme/default/icon.png index 3e17da8b1aaae2935e19ac97d9015f0fe24e8770..82ffcdaf50af7242c50b86bc55aef0c7fcfac4b6 100644 GIT binary patch literal 14758 zcmbVz1ymhNv+h7b@IZnD_XKx$f=h6B-N443-~0u>1l2><|8DM?W!@b4IS@guwd0GQG*@c!Tf zqMf9sBLE;{JY6tA@;4j+fZKsk6&6$=ZoP%%PI*4iIH`ITd4fOJi;mGC=_nzK=X$1J)2H zLz0iyRyK}2ANk4tYL^GRe=24qBl(NO$&#P!{Zoe|8nOx`BDM|?5_Sd-dShlb77|Ww z24)T>ZWcB=5*8+APDUn9MrKxeCT1Qc4jxu+lD|J>U~dj4raVfb;(zxAKJk;8J2~0$ zFfzKjx-z)3GT1tpF*0*=b2BorFtV`FgB0|RZZ=MaAL(rz$^YGgD8$j&0cz(2wY4F6 zYSGZh*4c@l4CM4*L$J2{r&$}vzr_R!jPawP9V0UX)6v z=~*~bn7Me^xWVuLMha?;iJ_C>|CiXrn8(!C!P*cUGt}D948mwY!gSpQ?Wl!%CegRLpl3Vh+HBq2;9B__hb%+0|;&%(g`7rU~uJW@7}PKGwd5Ghf9 zGEhDYP^bxyDH}7p5fc|1JqH)FF+Dpcn=w7NktsX92{)$^Sj1_<$-@5c`l7bR&QDtK z@A@WSeG@}wQ)6yUE_x;=W+SjF8xuVj3yTT8DVvcIGX%n9!pds+@A~o%P;eC*TK$jP zd0LxK>cb-mbp$8Y?eEp246*t*TT>@jLkGxvGf-Op9o1v}fAQ~V=<;84|KFRx|C{^&R8{|n-2W|H zV{=0rGYDv08Off;!}w%|{xvm>|L3gz_3l5Itbdb(cJS%;9|H_N{A0o)Hek~Zpn*1X zC?W*_Rs$)~_bMO19eBBEC{Is4c)UdHp^72Pz%Hh;__?Ze9y+z_TsK*xCRSCW);woX zd?sn%Fa=|&Xj%PKq>2esEMnVPpelrGqJ|#%9uq+Xz2`Y1_wA(w*D3`!;^^G+^igBW zaAlf_yjjHFx8`X*4{LN`A%stC?FnU%@*zkP^usa}4VJYuLdi37-Gr}SXE@V( zx6b9R_6QVvC_Q)|_*la_>wbzv_xmZe7jNGk?hW-Hol}Q@ql=bz1Z;gc)7{9KUZzpTz43hdHW3GZ6J}3V5KyK0R|uq zU_v>2PH%311P{RM;o9ZUC1x;@S>AitKc5J`^ZQ+!BNm@6A$!D9mN30?-gFoH$^2OW z`fE(g=MoYUXu=5f$)%!?{MA5Nq9M*(RG>wmqZUvQmpwYg7NSNb%4vcFFau$dyA__z z^&tQydd;C1d($Ee3C{pE{b(}B?8;3<%<9uX&h-Z8JxOzODi|Qh(De2YI|g2LaE>GB z?vx_+$HHN)G0)+yyx>TK>SV4sI~L<~Lj(bL28KGDTWt6|r3WiB4uNcbaR*mDX? zJ-soM62-cW9FnE)q3N0>!}>XcNvK190&u)W1bCdbedAY~;eZl)J5l8`Wbe1HgnK|?Ak6CopszJ*f2bnQ zXSNA^-(5itYK*+&daYwe-Qi7#{_uo+f6F~0sX5J!3MKtCAt52ZiXgq~`IHYnPYQmQ zGoz1_dyKbM?!;R%VFVOClm+>Cih-nU%6(T#nvLAh&&CL&_grDHU0oAJS0CSW7o*0! z6Pi6Oyx?{C-9usA+*Yj7Df&pepf9W?xZgUt^+zg_Z(kbW{Yr<(XKfnOD=gshCyH)N-f)IXJDFFMON)w%e)$p{jN^8iwK-YldZcH4 zR2c{5vNx|dU)YISa7rCl$4bkS!*N}OZW@5h2B5<}ev70n?jU0~No$}PRMm~!EYQal zM!^2v6a|mj+?(pEJiU~-RA<4F+2#DohT9zF*74a0Fzn14caLA|nDM}~#+{o(=J39;pa2WRQ6m~gv$hUzlIS; z>{r4H*AKrC4w)A0?UaOtd^$SLaq8k&l8%8fkWAK3*~Y zBRDuX>gMFvU;BWw6>KfpWV%U_uP!{ZD8oLg}LC=zU(jk)K(_W4kD5G8zS1`I?&Nn)Vd!`-eSD{{?7h=Gxp1Bz;OA-9~2o{qSU3fhfNxqBH2G9k8IVRTxc=aOeo_CTOC@RL6zRH_mVzv z3Yc)h!9$om{r!6aq@rdOb7Xt4Kwk3XFTWgdJe6Q9BtU55oWa)Z!c%u|h*8p8hBd@1 zdMJby+-VGo=Lvqi*EYb}%zN-G`TiZazP?^j%W;KA{;gVQNS<|E>*d^|v*U>&PQ1}MyfZwp&A~-=Xek_@%$|@ni>|I}Wh{ zz{5l6acR9DL?4NonmRZ<{KfZt6jBo&+3_gfpok^GS>JDcrhw3<^x*D=&)tR9e%zoR zxS&xwtXS0Cf(+Mif^ds3RszD!+oL-+%^|Vp_c(LpV}Lf1`zjli_)}Vc(|^=98|mzET|m3ed|?_PN?i>ig`b z7JyDgys0@!{NSELWnlH?@#rF3056kHi)VW&Q^wFf&eTRXO(2xi9T{KU2ZBWx>5I(U8cGo<# zsaMjzyV1|roTDKf&pqC)LzK&x5q;9X$afyU!3`;SKWZ;jBA1gZo8i^hfqSLg)aumC zR)5HsWEPje>gI*73BS!vO(^hQ zrCDkBr2eLS_s)I$r~x+<Ba{haZeli)7*#C~(C}So)uHx+9Jjb+NFpe7m?mJ7rtwe@zVk zmuqs;cnF(M%|F|0lp*-4R1c^9M)kuvrRpORSKn84=FvxK73%^y-iYCO{EgU#fTq;e zBMQ>zv!|3VL5U&EGt+T{5_<1YqTFNli>v$ieQ{I8DtKvv@Wb(X=Vnu+o?rT@eOraA_Hun{Qji z3q0PPsY0R2)BLqDqA?ODNbGYNPqVo&rXDXK|CbYj6VqEQ7R_YVJ{e)qyE%7~3p%ji zw~Gt4+_34iDH-xOM~*~5EEX(|&~fOp?fiQ65b?}8pdi{uMj{z-SZxpd*)>+8U2B7S zo4!cD>hfAW*I!27)kaGVmrJ0);YM(H!mD{5BTa5Biu|>(-S<wmg}6i~Lnu*);YmSC`tYbLiqhUQIA9kICDQ0p@zH*4a<~dF&#!mcpIC z9B;P_k^9Y7fX>dhmVyypOA#8{OGD_>7Uh72H8srkXd|tGfnvxT7`HstJj|5(0-$q` zEL)rt&YL;ds6EgemkvKnhmq-jcN>BI&10&nZ%u6ey*4eK{_Oq0b()~hk~|4ITkHLw zdFXI*&FaeGY;0UyyZ6#skC|-ajlGE-uU6j7CbJu(Z|f%6&ReIG1Wem|)lo9dXQU=5 zzJ-8-uI|^mI<6iQ7N>(bEZdgrclfz}IXgq1!-hDU)MAR^fE}rJ(17&!1lq5zO>kvU zN|W)3Ea(mPadb=?Vi8W(j~_6+F8fTl)194gmQzJAzQfd^bBF*+$9@Kt#bCfOPwXV? zyYXClS3fw}PZ?C9r*4Bjga8jMuRy@pl|9xbZdzVF!2HipW{&GE`fMUVRW21xJnceDP1`FmBX)uC=(xGGi)^^VB{v{9SdyTyrcIY@mR>~7p*145H$Hy=u6 zOM3H~d>ZnKDjr_LJ_IEqXm5~BN}R;qH7n)dVT3+9kYl4(2DMF_aRHG<`yY|oO0ZEE z#Tm?C+9t-c*N0y?HNvh4=u^A@A>b2WJSrJIexywl^bzp$_lE)QZ!S8@3_IF(nVh#r zVEPjnyKgS`V1S~Yl$;%@0CZ$vkmvw)47bsPTYG`lTYf+6WM`@ zN1y9=vSD<4!_MI0F1pvb^=5b3sT~OaY7-4SL194Hv`c@kEUzjj&%Qv ztpRuMd63~vvUCsAmm%#h2{FmhQ!$%sG9;li8g;0jMm(nM-bdskiZ`bDV_i#8lqCuCMFQkCt0&4q|;N_VLF)Zeb@jXd&EQ zwV5vPdd+_&h_RHLTcKqBt)z=xko*?MVxF*4=QC>hE?ZAoYCX9aHtT7{{(j_MUsHNl znfKFg&(OT4zpZP^7B^|gYo>na1TTlBGNlnz8MX-k$-yPaE9)ep$fO_{%Rpp-u zih+6^-T8*MZ4$|-??pPjL1&=yZMC?(JQg&zHP-Xy^UXYl=Pw(C-CG%q?<)NjUpM>N zut%S07sc+$={=s&-X>%Y?2y>#Fi7lJ?k15zVPkc|S#tgB?CS|8(=gVfN#P2vNRC1Z-vB5|~VT1Q=5@2mKkR@ITe@PeMwObKdi4c6?3X=DaI#B7A zmslR%BI!J87>>~$^BOE~$Rh>emg>&;e1u{Mq~BA*hJ1v0FQSspei*;!bzd}R2>la* ziRE>koEmddPvMIaGE;waK(({iEBLsyIG1)(2`|Ch7aP>puZT7N?Ub! zn>6IiJC(qC;XG87-j=DYXnglo&%*wSy8y@$srpO*zKh;aEvYNkd;xrXQ(4 zW`E{rayZRHcGkD9?`|l3#Ih?|ZCrG%gTm?RbI*J{s}A5d^S_^(eJb#_d*OK|d^GmW$&^j`v61gJoLTS@PGFPi1Fw>wpjuc%`xrnDzdcwd`s%p^Ly1d$Ny$I#BG-ZeQF{idGS-q)XkiI##Oh@(w3SWz68+5 zvEpC5pEJw>o>Y@;W5RP8aO1XmZN{a2+gxzU*$`wZ-qna;@<1;S<~b`XD#jK&JF{N^ zm`H)u;KyjPK$XYe95m=Aw|@?X-%1pHV@a;-)bS~)N@Y=db>sFL7Jw`&b`wq=eRXBU z`}N=-J=D3?w`=v)869w{s@n9*IrYx@GdXovmqn>hFgH4Co;2aC?g^0n-Xj6N2N0s( ziIPQihZFL;fSB2-x`agc94bBsfrFD1n+Eyp{5<|(E&WLNkhKJhUpTDCNWoo<@fGaB zW*9I2I+^N2FSFmF?Yf5B!}BRy?=8JI5$A*_dhY%+t)Q;wm%rpuOA|B<)pn&S(LY(e zp*=F=5xl>|D?jiUUv}ojmtlYV_KSA||3@s&@UKsi)&((t#}i;(c`j2yVd*td!4&mq<7-oG_t=X_P|{Ui=C&+;9A5V z&bQqjyRp~18}APu9$t9Ari9L4zt0TziG`g}@-}3?eWbJ>OROdIf)Oj)tZRyzB|MtY zadGK!7Djjn`StLfxTc=Tx;!6R5BlgT!U$>J^={02(@u;XnwU)SlHMpDpYhc(nK*J> z#%T_43z8vc!ib~_e2FHJj52*JgVZWs(V%?>JUbJaYES*J~AAV}~#ZU0yjGM%zS;slp;R<4n-+aJpyk$-ozf8ttbV}sT#q^H=VP7PaO&02WvX6TDTfuy z{^Q1d>Y%L_qgqJ><@Pjrx#POfcSliaExzrD<6+lJFs6Sc5LS$IAIRvj{nrx*!J@4S zmQ4Ejo0h%wUx|xD3xTDxnNqqb#h zl7e9-elkzJdG!Y9N&MELH4?mvmv8HH_=xSY1prKP1muG`F2A#!kVyddmk8u%ER;awcZZaiV=U4Py! zQdB;(oIDr7~I7Z2p2?lc;H||`e`L+e})SkzIVpf$(A|%>5R>|2Hb|h z7B(kGMSU92m462CxE_8vJ$0}qkdcw0ijyvG6k~QklN~R_3F4MkoZ$0XJlW8f^xnCRX+Q&*dkO2y?YOzJ9wGPwcyc-Q zJx>DV@S-HM%3+awGxFS$u!?05Y~;y7=eFp1^835nT)7#(AvJt~Yf=7`(sUB=d;y*_ zzL`L}mFYvHo`9JF^^ru}RLdMOfq0CzAjYOTuEHGk;hzq|xIugAjnmT>lY*Zg-%J>! z<{p(BcfWiN4{r>fH;>QHC+0+q?Qj2Be@J2x+Y?Bd%DdMmHDm(&iB8~I&G-ARP}J4F zt;R0^jj6dgdk&0@y?@@;P_%!g+a-;QeqFb1WiU;oET7OKt*8>~T?ck4c8zxQ=lJmO zl7`$M1Lzn6oOr*Kvg*aI2E0KG&EPq?Cgyj?q*X5wm68hi6k4uAGik3b<;>|7_RC_T z2d8dsOas$cWwZig`s#=W(8t4;!(pR8?On>xm06BJ+Mjy{WSBY8nsiJKszidld3ZGQ zT;2P9cJ%<-{MUX9-*4U7!jt~aY0>}ulCTW)=%0>F3=9k!b#_1GK3*O!Ixl$Z2J#$Q zA`>W{R>fsn1vD9-y*t=ry>k>Y76{nL!@fU`Z_js0L*1|N%gM9%lrKY%Ooc-`Dj{L> zxq8G>z`TG14tNj%wPLMo)v@IkFWzsdsfN(mhGj0JUkE^+*&_1eQo~oahTONIzbppA ztc0R8zV=e?+FM4&aCn|t;>pmn$sWA|4C|q+hULnHPttW(lE3Q0o zFwKK#CqMCJ4=t|lq0IT628EjOam!TFaw~UCu%H)nVQCTCHqHJX?cTFuq+6ftK$oxz zZ=cW%mcG8eGM`89OnWfAqG?=!7kK-Ga!M-3P71!9{vmF9hdz6h&hxW385XMe$A{XU z31i$+YJ_xNe3mY%`_5bb@k~`_KgFcG zYaCC}y~Hd2QG9JpQ(kO)T~pqq={E)I&kjtW>fNQpvmO|`pq!n(O@T_tCjucw6e7(I5;H8uGzbyRx?tfUTv0O4axm~uz0xQJ%Qo8RGSxv+~3#7Ab9T7^@XSy6&t zET!de#_#g#D1Cc@D=Uc)HrM==AG2>oXayga_hAJ?H$u#?ajv~So7(@@aXzR|`a(Bf zbTd{Xu!B7mBaf&98!^stpVru-UaEKC`uK4FfQ5x6KCE0#^1N;9@bEAj^m_UUKrq2E zecOtGJ_mojMBb{&agTWLZJ-zM#Xn66iadiQQq*=fx!~gCv#!d=Pkh&b*xWndVmLd%^a?ha8>`G$5cQtc7LTx39qOH>!tp1qZ6l^6DR_ zTB2_C)-}hB0~Ndgfxa}aoC@>9#hcwIK!ujytCeZ`D)jf~j+l)%nP!Ok2hOdFWt=|M zZk%mJXAS^KEBeOr$J|t7)z`&3_QPOfZI%_vnG66%)jh4${gY4Eb*w(at8s@GC z9?W3;CkJx~PmUm2=X$kKFwqjboIYASoj~>JDHsetCMu~}(rDJdk2j&@n9efN&ho6V z{z2C(MS3VI|kemhU@<@`f=_jOc@0};aLwtcUW zxZYH2_fMSig5s|Iq8(-9yIq4RU)pJl8~%LpRMkhLoHt_Wn_adNRyeqcI2ffq^Wh%{ zbLTIP(hTx<(tZ$fWI8ume$1;O-A}>w3^Jaq@OXJT@ag0xK?;`~ay`w8k1RMlsnX`3?q6V zhQwbNRPHm&D(48Iz7U&w5RyuCENZ=N3}98vMoe>gYrlP=j3aLH zQgYvfPpvK9->Q7b@GWOvpe_H6DNRmE6 z*s!QS>DcP4C^ZG4gx`AIU_^K+iPLsze^d?MW~s@IIbGP?&hEJ28^JjIlI>E{>|f!6 z1xi5t`+s#Lo@xy4=ePis|(!pJlkjd_GGZ{-s( zhHvprll2t{X8)OPdGn~C_nkFQdmuVy!!0Ch^~yD1cnnB*iu(1iOpG7wISZ`H&h8Ac z(+VuT1u=FSvlcI<$E=qLS|5^Qg4UO#a@IBinw5tzdzEz3B{76Bxr1`dHlX~6&><@i z%w#LGuiQ>!Dox*X>g+xpYjTa`1_T6@bTKTjV|8U?EARep4@AxaGfmo;{JSMi3lnbD zK@li1kEW|Ug$f*Vwsm&KV^ddkPW}WxmaS&=W)5>ga`2e&!Eybed3O^NM1I?|6_JVP z0gp`F9P>EXi|s%9>*-vgbX+XgQXh(B`IJx~N1zzMi(tKu?@4AK@5%Elqd-u_PX@Vi+*ozTL?5&=(KM8EKgkrJ|!%K)}__w@u6lw0(6NxP~;VeSN=tk~S7kk&I zHxIywo`ELDl=2tiDC(S*;$!z2U6WyknrObjRrIQTwLw)RFR; zZ(s^9!L*fkx@FH#oEgu=1|D=(Rm!r# zdRJ6z2C}G%Me#bsSo_4^&u{8Oy1@O_)ycY#oV>hQZDb*g698CRT6R7aJ>2Y-nz`)H zlpBH0%)4ys*CEe8=oS}_6k2zXaA4$8BqP-lJq|6_r2X9Nn3&8c&|DK3$Uax*|iG03`vu{m|jCM+po_?_ILhL0UKR;;zo33i4 zrR7W3oy__y1*&7uxM_EQSOu=W1|ZpA_y19|=p&zy(2(5m!3T5aR7o9pLZD%PTo!c{ zG^Jx}IpdhuthzN`8|kr5TfdLH92W-A-G}i6mZ#=fn)qyY_FfVSY=t$pb=)q%q8&MY z?j!o}z()D-!PH-)5f^ur*L@$QmdF&920&mO)P zThpAZ@7|ei$5Q7k-|5hSnF^;9`O1?ZuE*|?4i6X^83n=mrl+Te$(A14gwFKC2$u?o zUv~W#ln9U1<>J-W)f~lY<0?qK;O?8#daqfn9GN3-nGrc3-PI)p7}3L{$d#oC+ImUsD7mWTKK9yHHQw&e2}Tg zn!mIB@z<6@1Pj8f1f_UdDE)tkghj*i>|8R`d8-V@Mdh3 z*mmartmSD;J4Z8*`CvSe{~s8<1Gt9NuOEEYt9K3$N-jKH_F)apQ(SXX%RGDz8FSKf zTU~G4yXHB&HS6ls=9&oY+BXlTe$s&cCFAu;56wK3n8>J_C^mwVF_Uh8Z(#AG>h$AO z?#aW<2cQfzD!T9CMUZ7~6yiP)sl^u|Vz?|;bye)ed-;lc{Os$KHndv5*qtoA|7BE8 ztDh)fI;8i47&Yl0nTF!?xuPa&*S3jU8A7Zp?zp<)c#TZzWa91DP1h%m|DT zzjYxF88#@AcCss|zm*)8roWYx7BH?12?-(EJS69*Ex(oY46=BN^FPdjx8gP(h3oI` zz+0VX^^ANNso~b6Rx7M|w`Q*kXWPuaTnS)4@T_xbwOd8EcsOhecUXF7TJ?$+jE~3kpsO1Zq&B#8DqxD1w7BV%z~m7 zwfQ4TQj?kdBKU9i@2kRGo#ykMNFO(vh?7$ShchkVgMJiue+cF)j6j-9QyFE|ZONoqJ$yY1f*&3}T4>0J7B()a_LZSAU^4xfnaVJ&Tck1SJ(3S@U zO`qu8heWGC$q}8ayD2fMU$n0H8eC9t!Xk7&d)+cluQsjET4CL9W|;dpJI^VId$tOW zE9{Gbdm7+daY&Ux*zjhA;hu$_2Su9g((k$BD@9ElO0XogV~+UlNl8yA5y!*Sq`=}EJu6S%fD-1 z@)-^re?a;=gzrgfX*p_ZYfByN?elj)bD~*mvlu$ijNY!pwscn|t<<`hZ2O)=7V_U9!?z1dx^)>Z+S;vSkt4+f+Sjl0PY zTm83h$(w&6!*_oab_GD#VHQ?MQxjM28`r0xpe^2!y|pzzx3f)qYkPqVssa!yytuK~ zJ{`)U>LUU|En_v@-+vn8S)#?53uw(nZ(OeVRGkfHyTpjQ^Hz^btBCyp)mKgaaOI~z z6+OKd>G0*BKV9Fr9jk1FgWt%GqjB4$HVKADC*IxgA%mgpF25heFMiB4QKwJeQ3IB< zg;igFbUOSl0b|>QLn+vr@p8%x5L!%3NXyZoGT@vZ zpme1%+!t^bIL7_vj@|Lur<`}@k;Pyzt>SR8(KWN7L5p(87v>q0aTf|EHul=>Q7dN| z@=U%mA!xKSr3J2x)$Pr`oAnalLz#j_>wENG@r5%Vp@;s_tbTQA6^>Qe*;+e2-bUtb5d zU=3r>2c!VcYk#o=A}W_){=yb384Q5Hr+O$$mnZ}9;bfdzRj>Z|6bM(ZuMla$<~5w= zy~HNQ0CW7E9!Fl>+Vk#phHaPX8_YlyMK}(yk)M?ox^syK@4c2^SEBu&*8nsNrmr zj%?C{04Y2hwvn)>SCFk?aY;?q^=rIM_Y%&d^BxJW$?uH$xED>^JGve(LhvUHq)6Wp393Gbha@r>Jh*73KkgkTnJ zX)PTC0|%Zw9X1%HB-|eP@l4?1%GheL0SoxRg8rtnvy+Y-rcDy?sB=q69>NNlyy{-% zIkzhxVZrppei3~P(zp`kYly@8M#0(`{GG1HQl-_!4(-AL@aT)hb=-$VLU$S-V4~!) z*;y$#-GjP9830i@7iTmsE_N>w|^NQVs`9*=`7 zr~D$uYr~ zO?1+E8vWStd~etJVR&v#P>7B-G%JBUvylAjPu=HSe3L}T8M3S~F<*yj#j+q2Lzr^6 zaBH4FP;xx!=BQKFKtTHXrCFLe1tsQl;@TwlOrkEWsZu zdJ2(7YBvd2GGqiJOzr==>4F!^5xkD~AniZ6mc$rk{<@v0S<3_}Gr= z%PM!DVMox;R({MS{ImI0ixwq8ToAgyV;hGlsbM=5fOZ8OPf-(GBFE_zw1bI^IQ-rf zuN4wcld-00bwg)K46vvx^dL%D378T@TV*IeZMwy`O0?T1SOPJWJQs-g{|_v z=6?KS`gNjmYlR1CIQ~I%WD2iIA%^}6+M{&oGkg1eq=gXDCMt|fvP%wsph{-7}1c)gPizzPqF z!#Q9O$lYJUf!bqj{ng)`bFyE}`oYIVGjuO6{zh)$`hRU*{oVfz&!jAp^ v)xAAJ{G=428F@!kq0;x6klV`B2cMvq53I3H3QSM`Nhu{JCt4zG;P<}(9Do%` literal 11493 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 -<% print('<'+'!DOC'+'TYPE html'+'>'); %> -<% print('<'+'html'+'><'+'head'+'>'); %> -<% include('/include/head.html', {title: text(title!)}){} %> -<% include('/themes/'+themeName+'/include/header.html', {libs: libs!}){} %> +// 获取当前皮肤样式名称：详见jeesite-common项目下的static/adminlte/css/skins目录 +var defaultSkinName = @Global.getConfig('sys.index.skinName', 'skin-blue-light3'); +var skinName = cookie('skinName_'+session.userCode, false, defaultSkinName); +print('<'+'!DOC'+'TYPE html'+'><'+'html class="'+skinName+'"><'+'head'+'>'); +include('/include/head.html', {title: text(title!)}){} +include('/themes/'+themeName+'/include/header.html', {libs: libs!, skinName: skinName}){} %> <% if (!@ListUtils.inString('layout', libs!)){ %>
${layoutContent}
diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html index fc590d93..2820235f 100644 --- a/modules/core/src/main/resources/views/modules/sys/onlineList.html +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -56,10 +56,10 @@ $('#dataGrid').dataGrid({ {header:'${text("超时时间")}', name:'timeout', width:100, align:'center'}, {header:'${text("客户主机")}', name:'host', width:70, align:'center'}, {header:'${text("用户类型")}', name:'userType', width:50, align:'center', formatter: function(val, obj, row, act){ - return js.getDictLabel(${@DictUtils.getDictListJson('sys_user_type')}, val, '未设置', true); + return js.getDictLabel(${@DictUtils.getDictListJson('sys_user_type')}, val, '${text('未设置')}', true); }}, {header:'${text("设备类型")}', name:'deviceType', width:50, align:'center', formatter: function(val, obj, row, act){ - return js.getDictLabel(${@DictUtils.getDictListJson('sys_device_type')}, val, '未设置', true); + return js.getDictLabel(${@DictUtils.getDictListJson('sys_device_type')}, val, '${text('未设置')}', true); }} <% if(hasPermi('sys:online:edit')){ %> ,{header:'${text("操作")}', name:'actions', width:100, sortable:false, formatter: function(val, obj, row, act){ diff --git a/modules/core/src/main/resources/views/modules/sys/switchSkin.html b/modules/core/src/main/resources/views/modules/sys/switchSkin.html index 9618ac8b..1e2bbd03 100644 --- a/modules/core/src/main/resources/views/modules/sys/switchSkin.html +++ b/modules/core/src/main/resources/views/modules/sys/switchSkin.html @@ -1,7 +1,9 @@ <% layout('/layouts/default.html', {title:'切换主题'}){ %>
    @@ -167,10 +169,13 @@

    ${text('浅蓝-无界')}

    -
  • +
  • <#form:checkbox name="formLayerModel" label="${text('表单弹窗模式')}" class="form-control"/> <#form:checkbox name="tabPageModel" label="${text('取消页签模式')}" class="form-control"/>
    • +
  • + +
<% } %> \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html index 5861bec6..040b016e 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html @@ -36,7 +36,7 @@