From 09a567f4d9a99d7849d1efc5992a6709bdc70bc8 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 16 Dec 2020 20:29:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E5=92=8C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery-ztree/3.5/css/metro/zTreeStyle.css | 14 ++++++------- .../views/modules/sys/officeIndex.html | 2 +- .../views/modules/sys/sysDesktop.html | 20 +++++++++---------- .../views/modules/sys/user/empUserList.html | 2 +- web/src/main/resources/config/application.yml | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css b/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css index d1fb8f11..fc105703 100644 --- a/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css +++ b/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css @@ -8,23 +8,23 @@ website: http://code.google.com/p/jquerytree/ -------------------------------------*/ -.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif} +.ztree * {padding:0; margin:0; font-size:13px;} .ztree {margin:0; padding:5px; color:#333} .ztree li{padding:0; margin:0; list-style:none; line-height:21px; text-align:left; white-space:nowrap; outline:0} .ztree li ul{ margin:0; padding:0 0 0 18px} .ztree li ul.line{ background:url(./img/line_conn.png) 0 0 repeat-y;} -.ztree li a {padding-right:3px; margin:0; cursor:pointer; height:21px; color:#333; background-color: transparent; text-decoration:none; display: inline-block} +.ztree li a {padding-right:3px; margin:0; cursor:pointer; height:23px; color:#333; background-color: transparent; text-decoration:none; display: inline-block; vertical-align: middle;} .ztree li a:hover {text-decoration:underline} -.ztree li a.curSelectedNode {padding-top:0px; background-color:#e5e5e5; color:black; height:22px; -webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#e5e5e5; color:black; height:22px; border:1px #666 solid; -webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.ztree li a.curSelectedNode {padding-top:0px; background-color:#e5e5e5; color:black; height:23px; -webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#e5e5e5; color:black; height:23px; border:1px #666 solid; -webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#aaa; color:white; height:21px; border:1px #666 solid; opacity:0.8; filter:alpha(opacity=80)} .ztree li a.tmpTargetNode_prev {} .ztree li a.tmpTargetNode_next {} .ztree li a input.rename {height:14px; width:80px; padding:0; margin:0; font-size:12px; border:1px #7EC4CC solid; *border:0px} -.ztree li span {line-height:21px; margin-right:2px} +.ztree li span {line-height:23px; margin-right:2px} .ztree li span.button {line-height:0; margin:0; width:21px; height:21px; display: inline-block; vertical-align:middle; border:0 none; cursor: pointer;outline:none; background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; @@ -59,8 +59,8 @@ website: http://code.google.com/p/jquerytree/ .ztree li span.button.roots_close{background-position: -126px 0;} .ztree li span.button.center_open{background-position: -105px -21px;} .ztree li span.button.center_close{background-position: -126px -21px;} -.ztree li span.button.bottom_open{background-position: -105px -42px;} -.ztree li span.button.bottom_close{background-position: -126px -42px;} +.ztree li span.button.bottom_open{background-position: -105px -43px;} +.ztree li span.button.bottom_close{background-position: -126px -43px;} .ztree li span.button.noline_open{background-position: -126px -84px;} .ztree li span.button.noline_close{background-position: -105px -84px;} .ztree li span.button.root_docu{ background:none;} diff --git a/modules/core/src/main/resources/views/modules/sys/officeIndex.html b/modules/core/src/main/resources/views/modules/sys/officeIndex.html index 3e4972ac..8e3aad63 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/officeIndex.html @@ -27,7 +27,7 @@ // 初始化布局 $('body').layout({ west__initClosed: $(window).width() <= 767, // 是否默认关闭 - west__size: 200 + west__size: 170 }); // 主页框架 var win = $("#mainFrame")[0].contentWindow; diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html index 9bada6ae..a332816c 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html +++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html @@ -558,29 +558,29 @@

访问

-
+
−
+
+
−
- - + +
访问
- - + +
在线
- - + +
会员
@@ -614,17 +614,17 @@
-
+
新订购
-
+
进行中
-
+
已成交
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index 91eafd8c..24bedeac 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -52,7 +52,7 @@
-
+
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 580d8394..aff7f3fe 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -26,9 +26,9 @@ server: tomcat: uri-encoding: UTF-8 - # 将请求协议转换为 https + # 当 Nginx 为 https，tomcat 为 http 时，设置该选项为 true schemeHttps: false - + #======================================# #========== Database sttings ==========# #======================================#