From 2000726aeae69e167461d47c41463d8fac3d8054 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 09 十月 2023 17:17:51 +0800
Subject: [PATCH] 修改页面
---
src/main/resources/static/img/loginBg2.jpg | 0
src/main/resources/templates/tr/report/publicity.html | 37 ++++---
src/main/resources/templates/index.html | 59 ++++++-----
src/main/resources/static/css/style.css | 51 +++++++---
src/main/resources/templates/main.html | 47 +++++----
src/main/resources/static/ruoyi/index.js | 2
src/main/resources/static/img/publicity/img.jpg | 0
src/main/resources/static/img/publicity/second_title_pre2.png | 0
src/main/resources/static/img/publicity/head_right_bg.png | 0
src/main/resources/static/css/publicity/style.css | 46 +++++----
src/main/resources/static/css/login2.css | 2
src/main/resources/static/img/publicity/title-line.png | 0
src/main/resources/static/img/publicity/head_left_bg.png | 0
src/main/resources/templates/login.html | 2
src/main/resources/static/css/skins.css | 28 ++--
src/main/resources/static/img/publicity/second_title_pre.png | 0
16 files changed, 156 insertions(+), 118 deletions(-)
diff --git a/src/main/resources/static/css/login2.css b/src/main/resources/static/css/login2.css
index 9dd7c6a..ca12c35 100644
--- a/src/main/resources/static/css/login2.css
+++ b/src/main/resources/static/css/login2.css
@@ -5,7 +5,7 @@
left:0px;
height:100%;
width:100%;
- background: url('../img/loginBg.jpg') no-repeat center;
+ background: url('../img/loginBg2.jpg') no-repeat center;
background-size: cover;
}
diff --git a/src/main/resources/static/css/publicity/style.css b/src/main/resources/static/css/publicity/style.css
index 5bee2e1..01921a7 100644
--- a/src/main/resources/static/css/publicity/style.css
+++ b/src/main/resources/static/css/publicity/style.css
@@ -2,26 +2,30 @@
.flexNone{flex:none;}
-.container{width:calc(100% - 60px); height:calc(100% - 60px); background:radial-gradient(#072840,#03101E); padding:30px; overflow: hidden;}
-.header{height: 7.87vh; position: relative; margin-bottom: 15px; display: flex;}
-.header:before{content: ' '; background-image: url(../../img/publicity/head_left_fgx.png); background-repeat: no-repeat; background-size: 100% 100%; background-position: center; position: absolute; bottom: 0; left: 0; width: 50%; height: 1.95vh;}
-.header:after{content: ' '; background-image: url(../../img/publicity/head_right_fgx.png); background-repeat: no-repeat; background-size: 100% 100%; background-position: center; position: absolute; bottom: 0; right: 0; width: 50%; height: 1.95vh;}
+.container{width:calc(100% - 50px); height:calc(100% - 50px); background:url("../../img/publicity/img.jpg") no-repeat center;background-size: 100% 100%; padding:25px; overflow: hidden;display: flex;flex-direction: column;justify-content: space-between}
+.header{width: 100%;margin-bottom: 15px; display: flex;flex-direction: column;align-items: center}
+.header .header-cont{width: 100%;height: 100%; position: relative; display: flex;margin-bottom: 10px}
+/*.header:before{content: ' '; background-image: url(../../img/publicity/head_left_fgx.png); background-repeat: no-repeat; background-size: 100% 100%; background-position: center; position: absolute; bottom: 0; left: 0; width: 50%; height: 1.95vh;}*/
+/*.header:after{content: ' '; background-image: url(../../img/publicity/head_right_fgx.png); background-repeat: no-repeat; background-size: 100% 100%; background-position: center; position: absolute; bottom: 0; right: 0; width: 50%; height: 1.95vh;}*/
+.header .title-line{width: 100%;height: 22px;background: url("../../img/publicity/title-line.png") no-repeat center;background-size: 100% 100%;}
+.header .header_left{background-image: url(../../img/publicity/head_left_bg.png); background-position: top right; background-size: 100% 100%; background-repeat: no-repeat; height: 5vh; align-items: center; padding-bottom: .5vh; flex: 1; overflow: hidden; display:flex; align-items:center;}
+.header .header_left .logo_text{color: #00f3f0; font-size: 2.2vh; letter-spacing: 2px; line-height: 1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; padding-right: 30px;}
-.header .header_left{background-image: url(../../img/publicity/head_left_bg.png); background-position: top right; background-size: 100% 100%; background-repeat: no-repeat; height: 5.38vh; align-items: center; padding-bottom: .5vh; flex: 1; overflow: hidden; display:flex; align-items:center;}
-.header .header_left .logo_text{color: #00f3f0; font-size: 2.5vh; letter-spacing: 2px; line-height: 1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; padding-right: 30px;}
+.header .header_center{color: #00f3f0; font-size: 4vh;font-weight: 600; text-align: center; line-height: 1; letter-spacing: 4px; padding-top: 8px;flex: 1;overflow: hidden;}
-.header .header_center{color: #72e0f5; font-size: 4vh;font-weight: 600; text-align: center; line-height: 1; letter-spacing: 4px; padding-top: 8px;flex: 1;overflow: hidden;}
-
-.header .header_right{background-image: url(../../img/publicity/head_right_bg.png); background-position: top left; background-size: 100% 100%; background-repeat: no-repeat; height: 5.38vh; align-items: center; padding-bottom: .5vh; flex: 1;
- overflow: hidden;display: flex;}
-.header .header_right .datetime{color: #00f3f0;font-size: 2.5vh; letter-spacing: 2px; text-align: right; line-height: 1; padding-left:2vw;}
-.header .header_right .switch_fullscreen{height: 3.71vh; width: 3.71vh; margin-left: 16px; background: #ffffff2b; justify-content: center; line-height: 3.71vh; font-size: 2.5vh; color: #72e0f5; cursor: pointer; display:flex; align-items:center;}
+.header .header_right{background-image: url(../../img/publicity/head_right_bg.png); background-position: top left; background-size: 100% 100%; background-repeat: no-repeat; height: 5vh; align-items: center; padding-bottom: .5vh; flex: 1;
+ overflow: hidden;display: flex;justify-content: space-between}
+.header .header_right .datetime{color: #00f3f0;font-size: 2.2vh; letter-spacing: 2px; text-align: right; line-height: 1; padding-left:3vw;}
+.header .header_right .btn-cont{display: flex;align-items: center}
+.header .header_right .switch_fullscreen{height: 3.71vh; width: 3.71vh;border-radius: 50%;margin-left: 10px; background: #ffffff2b; justify-content: center; line-height: 3.71vh; font-size: 2.5vh; color: #72e0f5; cursor: pointer; display:flex; align-items:center;}
.header .header_right .switch_fullscreen .anticon{display: inline-block; color: inherit; font-style: normal; line-height: 0; text-align: center; text-transform: none; vertical-align: -.125em; text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;}
-.firstRow{margin-bottom: 2.97vh; display:flex;}
-.firstRow .map{height:100%; flex:1;height:35.13vh;margin: 0 1.67vw; border:1px solid #7CD5FF; position:relative}
+.firstRow{width: 100%; margin-bottom: 15px; display:flex;justify-content: space-between}
+.firstRow>div{margin-right: 1.6vw}
+.firstRow>div:last-of-type{margin-right: 0}
+.firstRow .map{height:100%; flex:1;height:35.13vh;border:1px solid #7CD5FF; position:relative}
/*轮播*/
.lunbo{overflow:hidden; width:30vw; height:35.13vh;}
.lunbo .swiper-wrapper{align-items: center;height:35.13vh;}
@@ -38,12 +42,12 @@
.lunbo .swiper-pagination-bullet-active:before{width: 24px!important; opacity: 1; border-radius: 100px; transform: scale(1.2); background: #fa6f66;}
.firstRow .rowCenter{height:35.13vh; flex:1.22; display: flex; flex-direction: column;}
-.firstRow .rowCenter .tj1{position: relative; padding: 0 27px; margin-bottom: 1.13vh; display: flex;}
+.firstRow .rowCenter .tj1{position: relative; margin-bottom: 1.13vh; display: flex;justify-content: space-between}
/*.firstRow .rowCenter .tj1:before{content: ' '; background-image: url(../../img/publicity/tj1_top_left.png); background-position: center; background-repeat: no-repeat; position: absolute; height: 21px; width: 21px; top: 0; bottom: 0; margin: auto; left: 0;}*/
/*.firstRow .rowCenter .tj1:after{content: ' '; background-image: url(../../img/publicity/tj1_top_right.png); background-position: center; background-repeat: no-repeat; position: absolute; height: 21px; width: 21px; top: 0; bottom: 0; margin: auto; right: 0;}*/
-.firstRow .rowCenter .tj1 .tj1_card{background:url(../../img/publicity/tj1_bg.png); background-size: 100% 100%; background-repeat: no-repeat; background-origin: padding-box; border-width: 10px; border-style: solid; -o-border-image: url(1排中上-4.ee30b40….png) 10 stretch; border-image: url(../../img/publicity/tj1_border.png) 10 stretch; justify-content: center; flex:1;}
-.firstRow .rowCenter .tj1 .tj1_card .tj1_card_title{color: #04cfcd; font-size: 2.1vh; line-height: 1.3; text-align: center; margin-bottom: 1.3vh;}
+.firstRow .rowCenter .tj1 .tj1_card{width: calc(33% - 10px);background:url(../../img/publicity/tj1_bg.png); background-size: 100% 100%; background-repeat: no-repeat; background-origin: padding-box; border-width: 10px; border-style: solid; -o-border-image: url(1排中上-4.ee30b40….png) 10 stretch; border-image: url(../../img/publicity/tj1_border.png) 10 stretch; justify-content: center; flex:1;}
+.firstRow .rowCenter .tj1 .tj1_card .tj1_card_title{color: #00f6ff; font-size: 2.1vh; line-height: 1.3; text-align: center; margin-bottom: 1.3vh;}
.firstRow .rowCenter .tj1 .tj1_card .tj1_card_value{color: #00deff; font-size: 3.7vh; line-height: 1; text-align: center; font-weight: 700;}
.firstRow .rowCenter .tj1 .tj1_card_center{margin: 0 22px; position: relative;}
@@ -53,7 +57,7 @@
.firstRow .rowCenter .tj2 .tj2_content .row{display: flex;padding-bottom: .8vw; border-bottom: 1px solid rgba(3,94,119,.4); flex: 1; overflow: hidden;}
.firstRow .rowCenter .tj2 .tj2_content .row2{padding-top: .8vw; border-top: 1px solid rgba(3,94,119,.4); display: flex; flex: 1; overflow: hidden;}
.firstRow .rowCenter .tj2 .tj2_content .tj2_item{display: flex; flex-direction: column; justify-content: center; width:25vw}
-.firstRow .rowCenter .tj2 .tj2_content .tj2_item .tj2_item_title{color: #04cfcd; font-size: 1.7vh; line-height: 1.5; margin-bottom: 1.3vh; overflow: hidden;}
+.firstRow .rowCenter .tj2 .tj2_content .tj2_item .tj2_item_title{color: #00f6ff; font-size: 1.7vh; line-height: 1.5; margin-bottom: 1.3vh; overflow: hidden;}
.firstRow .rowCenter .tj2 .tj2_content .tj2_item .tj2_item_value_wrap{font-size: 36px; line-height: 36px;}
.firstRow .rowCenter .tj2 .tj2_content .tj2_item .tj2_item_value_wrap .tj2_item__icon{background-repeat: no-repeat; background-position: center; background-size: contain; width: 3.71vh; height: 3.71vh; float: left;}
.firstRow .rowCenter .tj2 .tj2_content .tj2_item .tj2_item_value_wrap .tj2_item__icon.zdfx{background-image:url(../../img/publicity/zdfx.png)}
@@ -71,7 +75,7 @@
.firstRow .rowRight .gs_card{height:calc(100% - 1.86vh - 20px); background-image: url(../../img/publicity/tj1_bg.png); background-size: 100% 100%; background-repeat: no-repeat; background-origin: padding-box; border-width: 10px; border-style: solid; -o-border-image: url(../../img/publicity/rowRight_border.png) 10 stretch; border-image: url(../../img/publicity/rowRight_border.png) 10 stretch; padding:.93vh; display:flex; overflow:hidden}
.firstRow .rowRight .gs_card .swiper_left{flex:1; border-right:1px solid rgba(3,94,119,.4);padding-right:.93vh}
.firstRow .rowRight .gs_card .swiper_right{flex:1; border-left:1px solid rgba(3,94,119,.4);padding-left:.93vh}
-.firstRow .rowRight .gs_card .two_title{background-image: url(../../img/publicity/second_title_pre.png); background-repeat: no-repeat; background-position: left center; background-size: contain; padding-left: 1.67vw; height: 2.46vh; line-height: 1; font-size: 2.46vh; color: #04cfcd; margin-bottom: 1.3vh;}
+.firstRow .rowRight .gs_card .two_title{background-image: url(../../img/publicity/second_title_pre2.png); background-repeat: no-repeat; background-position: left center; background-size: contain; padding-left: 1.67vw; height: 2.46vh; line-height: 1; font-size: 2.2vh; color: #00f6ff; margin-bottom: 1.3vh;}
.gongshi{overflow:hidden; width:200px;}
@@ -92,8 +96,8 @@
.endRow{width:100%; display:flex;}
-.endRow .two_title{background-image: url(../../img/publicity/second_title_pre.png); background-repeat: no-repeat; background-position: left center; background-size: contain; padding-left: 1.67vw; height: 2.46vh; line-height: 1; font-size: 2.46vh; color: #04cfcd; margin-bottom: 1.3vh;}
-.endRow .endRow_left{flex:1; margin-right:1.25vw;display: flex; flex-direction: column; height:45vh;width:50%}
+.endRow .two_title{background-image: url(../../img/publicity/second_title_pre2.png); background-repeat: no-repeat; background-position: left center; background-size: contain; padding-left: 1.67vw; height: 2.46vh; line-height: 1; font-size: 2.2vh; color: #00f6ff; margin-bottom: 1.3vh;}
+.endRow .endRow_left{flex:1; margin-right:1.25vw;display: flex; flex-direction: column;width:50%}
.endRow .endRow_right{flex:1; display: flex; flex-direction: column;width:50%}
.endRow .chart_card{height: calc(100% - 40px); background-image: url(../../img/publicity/tj1_bg.png); background-size: 100% 100%; background-repeat: no-repeat; background-origin: padding-box; border-width: 20px; border-style: solid; -o-border-image: url(../../img/publicity/count_border_bg.png) 20 stretch; border-image: url(../../img/publicity/count_border_bg.png) 20 stretch; flex:1;overflow: hidden;}
diff --git a/src/main/resources/static/css/skins.css b/src/main/resources/static/css/skins.css
index e7145fb..2e4c9b8 100644
--- a/src/main/resources/static/css/skins.css
+++ b/src/main/resources/static/css/skins.css
@@ -6,12 +6,12 @@
*/
/** 蓝色主题 skin-blue **/
.navbar, .skin-blue .navbar {
- background-color: #3c8dbc
+ background-color: #014983
}
.skin-blue .navbar-default .nav>li.selected>a,
.skin-blue .navbar-default .nav>li.selected>a:focus {
- background-color: #1890ff;
+ background-color: #014983;
color: rgba(255,255,255,1);
}
@@ -60,7 +60,7 @@
}
.skin-blue .logo {
- background-color: #367fa9;
+ background-color: #014983;
color: #fff;
border-bottom: 0 solid transparent
}
@@ -166,7 +166,7 @@
}
.skin-blue.layout-top-nav>.logo {
- background-color: #3c8dbc;
+ background-color: #014983;
color: #fff;
border-bottom: 0 solid transparent
}
@@ -813,30 +813,30 @@
}
.theme-light .nav>li.active{
- background: #f9fafc;
+ background: #fcfcfc;
}
.theme-light .navbar-static-side {
- background-color: #f9fafc;
+ background-color: #fcfcfc;
box-shadow: 2px 0 2px 0 rgba(29,35,41,.05);
}
.theme-light .user-panel {
- background-color: #f9fafc;
+ background-color: #fcfcfc;
}
.theme-light .navbar-default .nav>li>a {
- color: #777;
+ color: #333;
}
.theme-light.skin-blue .navbar-default .nav>li.active>a {
- color: #1890ff;
+ color: #014983;
}
.theme-light.skin-blue .navbar-default .nav>li.selected>a,
.theme-light.skin-blue .navbar-default .nav>li.selected>a:focus {
background-color: rgb(240, 245, 255);
- color: rgb(47, 84, 235);
+ color: #014983;
}
.theme-light.skin-green .navbar-default .nav>li.active>a {
@@ -885,11 +885,11 @@
}
.fixed-sidebar.theme-light.mini-navbar .nav li:hover>a> span.nav-label {
- background-color: #f9fafc;
+ background-color: #fcfcfc;
}
.fixed-sidebar.theme-light.mini-navbar .nav li:hover>.nav-second-level {
- background-color: #f9fafc;
+ background-color: #fcfcfc;
}
/** 深蓝主题 theme-light **/
@@ -921,12 +921,12 @@
}
.theme-blue.skin-blue .navbar-default .nav>li.active>a {
- color: #1890ff;
+ color: #014983;
}
.theme-blue.skin-blue .navbar-default .nav>li.selected>a,
.theme-blue.skin-blue .navbar-default .nav>li.selected>a:focus {
- background-color: #1890ff;
+ background-color: #014983;
}
.theme-blue.skin-green .navbar-default .nav>li.active>a {
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index f90ae4b..78b141a 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -38,7 +38,7 @@
.nav>li>a {
color: #a7b1c2;
font-weight: 600;
- padding: 14px 20px 14px 25px;
+ padding: 20px 20px 20px 25px;
}
.nav li>a {
@@ -49,8 +49,9 @@
.nav.navbar-right>li>a {
color: #fff;
font-size: 14px;
- height: 50px;
- padding: 18px 15px;
+ height: 70px;
+ padding: 0 15px;
+ line-height: 70px;
}
.nav>li.active>a {
@@ -107,7 +108,7 @@
.navbar-top-links li a {
padding: 20px 10px;
- min-height: 50px;
+ min-height: 70px;
}
.dropdown-menu {
@@ -226,10 +227,10 @@
}
.minimalize-styl-2 {
- padding: 4px 12px;
- margin: 12px 5px 5px 15px;
font-size: 14px;
float: left;
+ line-height: 70px;
+ margin-left: 15px;
}
.navbar-form-custom {
@@ -283,7 +284,7 @@
}
.nav-second-level li a {
- padding: 7px 15px 7px 10px;
+ padding: 10px 15px 10px 10px;
padding-left: 52px;
}
@@ -390,7 +391,7 @@
}
.fixed-nav .minimalize-styl-2 {
- margin: 14px 5px 5px 15px;
+ margin-left: 15px;
}
.body-small .navbar-fixed-top {
@@ -3285,7 +3286,6 @@
}
nav.page-tabs {
- margin-left: 30px;
width: 100000px;
height: 38px;
overflow: hidden;
@@ -6330,7 +6330,7 @@
}
body.rtls .nav-second-level li a {
- padding: 7px 35px 7px 10px;
+ padding: 10px 35px 10px 10px;
}
body.rtls .ibox-title h5 {
@@ -6364,7 +6364,7 @@
body.rtls .minimalize-styl-2 {
float: right;
- margin: 14px 20px 5px 5px;
+ margin-left: 15px;
}
body.rtls .feed-element>.pull-left {
@@ -6866,7 +6866,7 @@
.navbar-header {
width: 10%;
- height: 50px;
+ height: 70px;
}
.bs-glyphicons {
@@ -6940,16 +6940,16 @@
}
nav .logo {
- background-color: #367fa9;
+ background-color: #014983;
color: #fff;
border-bottom: 0 solid transparent;
-webkit-transition: width .3s ease-in-out;
-o-transition: width .3s ease-in-out;
transition: width .3s ease-in-out;
display: block;
- height: 50px;
+ height: 70px;
font-size: 20px;
- line-height: 50px;
+ line-height: 70px;
text-align: center;
width: 200px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -6957,7 +6957,26 @@
font-weight: 300;
overflow: hidden
}
-
+nav .icon {
+ background-color: #014983;
+ color: #fff;
+ border-bottom: 0 solid transparent;
+ -webkit-transition: width .3s ease-in-out;
+ -o-transition: width .3s ease-in-out;
+ transition: width .3s ease-in-out;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 70px;
+ font-size: 20px;
+ line-height: 22px;
+ text-align: center;
+ width: 70px;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ padding: 0 15px;
+ font-weight: 300;
+ overflow: hidden
+}
.logo-mini {
display: none;
}
diff --git a/src/main/resources/static/img/loginBg2.jpg b/src/main/resources/static/img/loginBg2.jpg
new file mode 100644
index 0000000..e70d14c
--- /dev/null
+++ b/src/main/resources/static/img/loginBg2.jpg
Binary files differ
diff --git a/src/main/resources/static/img/publicity/head_left_bg.png b/src/main/resources/static/img/publicity/head_left_bg.png
index 4cff440..8abf6a7 100644
--- a/src/main/resources/static/img/publicity/head_left_bg.png
+++ b/src/main/resources/static/img/publicity/head_left_bg.png
Binary files differ
diff --git a/src/main/resources/static/img/publicity/head_right_bg.png b/src/main/resources/static/img/publicity/head_right_bg.png
index ca37eb3..539d317 100644
--- a/src/main/resources/static/img/publicity/head_right_bg.png
+++ b/src/main/resources/static/img/publicity/head_right_bg.png
Binary files differ
diff --git a/src/main/resources/static/img/publicity/img.jpg b/src/main/resources/static/img/publicity/img.jpg
new file mode 100644
index 0000000..ffa3ce9
--- /dev/null
+++ b/src/main/resources/static/img/publicity/img.jpg
Binary files differ
diff --git a/src/main/resources/static/img/publicity/second_title_pre.png b/src/main/resources/static/img/publicity/second_title_pre.png
index cee2321..317c186 100644
--- a/src/main/resources/static/img/publicity/second_title_pre.png
+++ b/src/main/resources/static/img/publicity/second_title_pre.png
Binary files differ
diff --git a/src/main/resources/static/img/publicity/second_title_pre2.png b/src/main/resources/static/img/publicity/second_title_pre2.png
new file mode 100644
index 0000000..1675d1d
--- /dev/null
+++ b/src/main/resources/static/img/publicity/second_title_pre2.png
Binary files differ
diff --git a/src/main/resources/static/img/publicity/title-line.png b/src/main/resources/static/img/publicity/title-line.png
new file mode 100644
index 0000000..67c779d
--- /dev/null
+++ b/src/main/resources/static/img/publicity/title-line.png
Binary files differ
diff --git a/src/main/resources/static/ruoyi/index.js b/src/main/resources/static/ruoyi/index.js
index 3343f47..159f5bb 100644
--- a/src/main/resources/static/ruoyi/index.js
+++ b/src/main/resources/static/ruoyi/index.js
@@ -67,6 +67,7 @@
function fixedSidebar() {
$('#side-menu').hide();
$("nav .logo").addClass("hide");
+ $("nav .icon").removeClass("hide");
setTimeout(function() {
$('#side-menu').fadeIn(500);
},
@@ -80,6 +81,7 @@
} else if (!isMobile &&!$('body').hasClass('mini-navbar')) {
fixedSidebar();
$("nav .logo").removeClass("hide");
+ $("nav .icon").addClass("hide");
} else if (isMobile && $('body').hasClass('fixed-sidebar')) {
$('.navbar-static-side').fadeOut();
fixedSidebar();
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index a2d84ca..179724e 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -16,7 +16,7 @@
<link th:href="@{/css/skins.css}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.2.0}" rel="stylesheet"/>
</head>
-<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden;font-size: 15px">
+<body class="fixed-sidebar full-height-layout gray-bg theme-light" style="overflow: hidden;font-size: 15px">
<div id="wrapper">
<!--左侧导航开始-->
@@ -28,24 +28,27 @@
<li class="logo hidden-xs">
<span class="logo-lg" style="font-size: 14px !important;">智能安全双重预防系统</span>
</li>
+ <li class="icon hidden-xs hide">
+ <span class="logo-lg" style="font-size: 14px !important;">智能预警</span>
+ </li>
</a>
<div class="sidebar-collapse" style="">
<ul class="nav" id="side-menu">
- <li>
- <div class="user-panel">
- <a class="menuItem" title="个人中心" th:href="@{/system/user/profile}">
- <div class="hide" th:text="个人中心"></div>
- <div class="pull-left image">
- <img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="img-circle" alt="User Image">
- </div>
- </a>
- <div class="pull-left info">
- <p>[[${user.loginName}]]</p>
- <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
- <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>
- </div>
- </div>
- </li>
+<!-- <li>-->
+<!-- <div class="user-panel">-->
+<!-- <a class="menuItem" title="个人中心" th:href="@{/system/user/profile}"> -->
+<!-- <div class="hide" th:text="个人中心"></div>-->
+<!-- <div class="pull-left image">-->
+<!-- <img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="img-circle" alt="User Image">-->
+<!-- </div>-->
+<!-- </a>-->
+<!-- <div class="pull-left info">-->
+<!-- <p>[[${user.loginName}]]</p>-->
+<!-- <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>-->
+<!-- <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </li>-->
<li>
<a href="#"><i class="fa fa-home"></i> <span class="nav-label">主页</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
@@ -87,7 +90,7 @@
<div class="row border-bottom">
<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
- <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="#" title="收起菜单">
+ <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;height: 70px" href="#" title="收起菜单">
<i class="fa fa-bars"></i>
</a>
</div>
@@ -102,7 +105,7 @@
<li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li>
<li class="dropdown user-menu">
<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
- <img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="user-image">
+<!-- <img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="user-image">-->
<span class="hidden-xs">[[${#strings.defaultString(user.userName, '-')}]]</span>
</a>
<ul class="dropdown-menu">
@@ -114,10 +117,10 @@
<a onclick="resetPwd()">
<i class="fa fa-key"></i> 修改密码</a>
</li>
- <li>
- <a onclick="switchSkin()">
- <i class="fa fa-dashboard"></i> 切换主题</a>
- </li>
+<!-- <li>-->
+<!-- <a onclick="switchSkin()">-->
+<!-- <i class="fa fa-dashboard"></i> 切换主题</a>-->
+<!-- </li>-->
<li class="divider"></li>
<li>
<a th:href="@{logout}">
@@ -129,17 +132,17 @@
</nav>
</div>
<div class="row content-tabs">
- <button class="roll-nav roll-left tabLeft">
- <i class="fa fa-backward"></i>
- </button>
+<!-- <button class="roll-nav roll-left tabLeft">-->
+<!-- <i class="fa fa-backward"></i>-->
+<!-- </button>-->
<nav class="page-tabs menuTabs">
<div class="page-tabs-content">
<a href="javascript:;" class="active menuTab" data-id="/system/main">首页</a>
</div>
</nav>
- <button class="roll-nav roll-right tabRight">
- <i class="fa fa-forward"></i>
- </button>
+<!-- <button class="roll-nav roll-right tabRight">-->
+<!-- <i class="fa fa-forward"></i>-->
+<!-- </button>-->
<a href="javascript:void(0);" class="roll-nav roll-right tabReload"><i class="fa fa-refresh"></i> 刷新</a>
</div>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 0c06d9f..a2566d5 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -83,7 +83,7 @@
<!-- <canvas class="particles-js-canvas-el" style="width: 100%; height: 100%;" width="472" height="625"></canvas>-->
<!--</div>-->
<body class="signin">
- <h1 style="font-size:56px;color: #3a61da;text-shadow:3px 3px 1px #cce2f9;font-weight: bolder;letter-spacing: 10px">智能安全双重预防系统</h1>
+ <h1 style="font-size:56px;color: #04e6dd;text-shadow:3px 3px 1px #176fc8;font-weight: bolder;letter-spacing: 10px">智能安全双重预防系统</h1>
<div class="signinpanel">
<form id="signupForm" autocomplete="off" style="background: rgb(255, 255, 255);">
<h4 class="no-margins">登录：</h4>
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index 344efc5..b9eabfb 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -106,14 +106,16 @@
<th:block th:include="include :: publicity-css"/>
</head>
<body>
-<div class="container" style="height: 850px!important;">
+<div class="container">
<div class="header">
+ <div class="header-cont">
<div class="header_left row">
<div class="logo_text">安全管理服务</div>
</div>
<div class="header_center">安全信息公示平台</div>
<div class="header_right">
<div class="datetime">2019-2020</div>
+ <div class="btn-cont">
<div class="switch_fullscreen flexNone"><i class="anticon anticon-fullscreen">
<svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="fullscreen"
aria-hidden="true">
@@ -121,13 +123,13 @@
</svg>
</i></div>
- <div class="switch_fullscreen flexNone" id="homePage"><i class="anticon anticon-home">
- <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="home"
- aria-hidden="true">
- <path d="M946.5 505L560.1 118.8l-25.9-25.9a31.5 31.5 0 0 0-44.4 0L77.5 505a63.9 63.9 0 0 0-18.8 46c.4 35.2 29.7 63.3 64.9 63.3h42.5V940h691.8V614.3h43.4c17.1 0 33.2-6.7 45.3-18.8a63.6 63.6 0 0 0 18.7-45.3c0-17-6.7-33.1-18.8-45.2zM568 868H456V664h112v204zm217.9-325.7V868H632V640c0-22.1-17.9-40-40-40H432c-22.1 0-40 17.9-40 40v228H238.1V542.3h-96l370-369.7 23.1 23.1L882 542.3h-96.1z">
- </path>
- </svg>
- </i></div>
+<!-- <div class="switch_fullscreen flexNone" id="homePage"><i class="anticon anticon-home">-->
+<!-- <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="home"-->
+<!-- aria-hidden="true">-->
+<!-- <path d="M946.5 505L560.1 118.8l-25.9-25.9a31.5 31.5 0 0 0-44.4 0L77.5 505a63.9 63.9 0 0 0-18.8 46c.4 35.2 29.7 63.3 64.9 63.3h42.5V940h691.8V614.3h43.4c17.1 0 33.2-6.7 45.3-18.8a63.6 63.6 0 0 0 18.7-45.3c0-17-6.7-33.1-18.8-45.2zM568 868H456V664h112v204zm217.9-325.7V868H632V640c0-22.1-17.9-40-40-40H432c-22.1 0-40 17.9-40 40v228H238.1V542.3h-96l370-369.7 23.1 23.1L882 542.3h-96.1z">-->
+<!-- </path>-->
+<!-- </svg>-->
+<!-- </i></div>-->
<div class="switch_fullscreen flexNone ant-tooltip-open" id="logout"><i _ngcontent-vjs-c1="" nz-icon=""
nztheme="outline" nztype="logout"
@@ -137,7 +139,10 @@
<path d="M868 732h-70.3c-4.8 0-9.3 2.1-12.3 5.8-7 8.5-14.5 16.7-22.4 24.5a353.84 353.84 0 0 1-112.7 75.9A352.8 352.8 0 0 1 512.4 866c-47.9 0-94.3-9.4-137.9-27.8a353.84 353.84 0 0 1-112.7-75.9 353.28 353.28 0 0 1-76-112.5C167.3 606.2 158 559.9 158 512s9.4-94.2 27.8-137.8c17.8-42.1 43.4-80 76-112.5s70.5-58.1 112.7-75.9c43.6-18.4 90-27.8 137.9-27.8 47.9 0 94.3 9.3 137.9 27.8 42.2 17.8 80.1 43.4 112.7 75.9 7.9 7.9 15.3 16.1 22.4 24.5 3 3.7 7.6 5.8 12.3 5.8H868c6.3 0 10.2-7 6.7-12.3C798 160.5 663.8 81.6 511.3 82 271.7 82.6 79.6 277.1 82 516.4 84.4 751.9 276.2 942 512.4 942c152.1 0 285.7-78.8 362.3-197.7 3.4-5.3-.4-12.3-6.7-12.3zm88.9-226.3L815 393.7c-5.3-4.2-13-.4-13 6.3v76H488c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h314v76c0 6.7 7.8 10.5 13 6.3l141.9-112a8 8 0 0 0 0-12.6z"></path>
</svg>
</i></div>
+ </div>
</div>
+ </div>
+ <div class="title-line"></div>
</div>
<div class="firstRow">
<div class="rowCenter">
@@ -281,19 +286,6 @@
</div>
<div class="endRow">
<div class="endRow_left">
- <div class="two_title">风险统计</div>
- <div style="margin-bottom:0px; flex:1">
- <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
- <div id="risk" style="height: 195px"></div>
- </div>
- </div>
- <div style="flex:1">
- <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
- <div id="riskPoint" style="height: 195px"></div>
- </div>
- </div>
- </div>
- <div class="endRow_right">
<div class="two_title">隐患统计</div>
<div style="margin-bottom:0px; flex:1;">
<div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
@@ -306,6 +298,19 @@
</div>
</div>
</div>
+ <div class="endRow_right">
+ <div class="two_title">风险统计</div>
+ <div style="margin-bottom:0px; flex:1">
+ <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
+ <div id="risk" style="height: 195px"></div>
+ </div>
+ </div>
+ <div style="flex:1">
+ <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
+ <div id="riskPoint" style="height: 195px"></div>
+ </div>
+ </div>
+ </div>
</div>
</div>
diff --git a/src/main/resources/templates/tr/report/publicity.html b/src/main/resources/templates/tr/report/publicity.html
index b0a5c76..179fcb8 100644
--- a/src/main/resources/templates/tr/report/publicity.html
+++ b/src/main/resources/templates/tr/report/publicity.html
@@ -11,21 +11,23 @@
<body>
<div class="container">
<div class="header">
+ <div class="header-cont">
<div class="header_left row">
<div class="logo_text">安全管理服务</div>
</div>
<div class="header_center">安全信息公示平台</div>
<div class="header_right">
<div class="datetime">2019-2020</div>
+ <div class="btn-cont">
<div class="switch_fullscreen flexNone"><i class="anticon anticon-fullscreen">
- <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="fullscreen"
+ <svg viewBox="64 64 896 896" fill="currentColor" width="0.8em" height="0.8em" data-icon="fullscreen"
aria-hidden="true">
<path d="M290 236.4l43.9-43.9a8.01 8.01 0 0 0-4.7-13.6L169 160c-5.1-.6-9.5 3.7-8.9 8.9L179 329.1c.8 6.6 8.9 9.4 13.6 4.7l43.7-43.7L370 423.7c3.1 3.1 8.2 3.1 11.3 0l42.4-42.3c3.1-3.1 3.1-8.2 0-11.3L290 236.4zm352.7 187.3c3.1 3.1 8.2 3.1 11.3 0l133.7-133.6 43.7 43.7a8.01 8.01 0 0 0 13.6-4.7L863.9 169c.6-5.1-3.7-9.5-8.9-8.9L694.8 179c-6.6.8-9.4 8.9-4.7 13.6l43.9 43.9L600.3 370a8.03 8.03 0 0 0 0 11.3l42.4 42.4zM845 694.9c-.8-6.6-8.9-9.4-13.6-4.7l-43.7 43.7L654 600.3a8.03 8.03 0 0 0-11.3 0l-42.4 42.3a8.03 8.03 0 0 0 0 11.3L734 787.6l-43.9 43.9a8.01 8.01 0 0 0 4.7 13.6L855 864c5.1.6 9.5-3.7 8.9-8.9L845 694.9zm-463.7-94.6a8.03 8.03 0 0 0-11.3 0L236.3 733.9l-43.7-43.7a8.01 8.01 0 0 0-13.6 4.7L160.1 855c-.6 5.1 3.7 9.5 8.9 8.9L329.2 845c6.6-.8 9.4-8.9 4.7-13.6L290 787.6 423.7 654c3.1-3.1 3.1-8.2 0-11.3l-42.4-42.4z"></path>
</svg>
</i></div>
<div class="switch_fullscreen flexNone" id="homePage"><i class="anticon anticon-home">
- <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="home"
+ <svg viewBox="64 64 896 896" fill="currentColor" width="0.8em" height="0.8em" data-icon="home"
aria-hidden="true">
<path d="M946.5 505L560.1 118.8l-25.9-25.9a31.5 31.5 0 0 0-44.4 0L77.5 505a63.9 63.9 0 0 0-18.8 46c.4 35.2 29.7 63.3 64.9 63.3h42.5V940h691.8V614.3h43.4c17.1 0 33.2-6.7 45.3-18.8a63.6 63.6 0 0 0 18.7-45.3c0-17-6.7-33.1-18.8-45.2zM568 868H456V664h112v204zm217.9-325.7V868H632V640c0-22.1-17.9-40-40-40H432c-22.1 0-40 17.9-40 40v228H238.1V542.3h-96l370-369.7 23.1 23.1L882 542.3h-96.1z">
</path>
@@ -35,12 +37,15 @@
<div class="switch_fullscreen flexNone ant-tooltip-open" id="logout"><i _ngcontent-vjs-c1="" nz-icon=""
nztheme="outline" nztype="logout"
class="anticon anticon-logout">
- <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="logout"
+ <svg viewBox="64 64 896 896" fill="currentColor" width="0.8em" height="0.8em" data-icon="logout"
aria-hidden="true">
<path d="M868 732h-70.3c-4.8 0-9.3 2.1-12.3 5.8-7 8.5-14.5 16.7-22.4 24.5a353.84 353.84 0 0 1-112.7 75.9A352.8 352.8 0 0 1 512.4 866c-47.9 0-94.3-9.4-137.9-27.8a353.84 353.84 0 0 1-112.7-75.9 353.28 353.28 0 0 1-76-112.5C167.3 606.2 158 559.9 158 512s9.4-94.2 27.8-137.8c17.8-42.1 43.4-80 76-112.5s70.5-58.1 112.7-75.9c43.6-18.4 90-27.8 137.9-27.8 47.9 0 94.3 9.3 137.9 27.8 42.2 17.8 80.1 43.4 112.7 75.9 7.9 7.9 15.3 16.1 22.4 24.5 3 3.7 7.6 5.8 12.3 5.8H868c6.3 0 10.2-7 6.7-12.3C798 160.5 663.8 81.6 511.3 82 271.7 82.6 79.6 277.1 82 516.4 84.4 751.9 276.2 942 512.4 942c152.1 0 285.7-78.8 362.3-197.7 3.4-5.3-.4-12.3-6.7-12.3zm88.9-226.3L815 393.7c-5.3-4.2-13-.4-13 6.3v76H488c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h314v76c0 6.7 7.8 10.5 13 6.3l141.9-112a8 8 0 0 0 0-12.6z"></path>
</svg>
</i></div>
+ </div>
</div>
+ </div>
+ <div class="title-line"></div>
</div>
<div class="firstRow">
<div class="map">
@@ -183,19 +188,6 @@
</div>
<div class="endRow">
<div class="endRow_left">
- <div class="two_title">风险统计</div>
- <div style="margin-bottom:0px; flex:1">
- <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
- <div id="risk" style="height: 195px"></div>
- </div>
- </div>
- <div style="flex:1">
- <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
- <div id="riskPoint" style="height: 195px"></div>
- </div>
- </div>
- </div>
- <div class="endRow_right">
<div class="two_title">隐患统计</div>
<div style="margin-bottom:0px; flex:1;">
<div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
@@ -208,6 +200,19 @@
</div>
</div>
</div>
+ <div class="endRow_right">
+ <div class="two_title">风险统计</div>
+ <div style="margin-bottom:0px; flex:1">
+ <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
+ <div id="risk" style="height: 195px"></div>
+ </div>
+ </div>
+ <div style="flex:1">
+ <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
+ <div id="riskPoint" style="height: 195px"></div>
+ </div>
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.2