diff --git a/src/main/resources/static/assets/web/css/style.css b/src/main/resources/static/assets/web/css/style.css index e20673b..441fe70 100644 --- a/src/main/resources/static/assets/web/css/style.css +++ b/src/main/resources/static/assets/web/css/style.css @@ -1,32 +1,32 @@ .clearFloat:after{content:'';display:block;clear:both} .fl{float:left} .fr{float:right} -.banner,.banner img{width:100%;height:630px;min-width:1530px} -.nav{width:1530px;margin:-50px auto 0;position:relative;padding:20px 0;background:#fff;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;border-radius:5px} -.nav ul li{width:255px;float:left;-webkit-box-sizing:border-box;box-sizing:border-box;border-right:1px solid #d2d2d2;cursor:pointer;overflow: hidden} -.nav.child ul li{width: 306px;} -.nav ul li.log-out{padding: 0 20px;} -.nav ul li.log-out .left{width: 90px;text-align: center;} +.banner,.banner img{width:100%;height:630px;min-width:1200px} +.nav{width:1200px;margin:-50px auto 0;position:relative;padding:20px 0;background:#fff;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;border-radius:5px} +.nav ul li{width:200px;float:left;-webkit-box-sizing:border-box;box-sizing:border-box;border-right:1px solid #d2d2d2;cursor:pointer;overflow: hidden} +.nav.child ul li{width: 240px;} +.nav ul li.log-out{padding: 0 10px;} +.nav ul li.log-out .left{width: 85px;text-align: center;} .nav ul li.log-out a{padding: 0;font-size:20px;color:#333;} -.nav ul li.log-out a, .nav ul li.log-out .left span{line-height: 30px;margin: 0;font-size: 18px} +.nav ul li.log-out a, .nav ul li.log-out .left span{line-height: 30px;margin: 0;font-size: 16px} .nav ul li.log-out .left span{border-bottom: 1px solid #DDD;white-space: nowrap;overflow: hidden;text-overflow: ellipsis} .nav ul li.log-out .left span.not-admin{border: none;line-height: 60px} .nav ul li:last-child{border-right:none} -.nav ul li a{display:block;overflow:hidden;padding:0 20px} -.nav ul li .left span{font-size:20px;color:#333;display:block;margin-top:8px} -.nav ul li .left p{font-size:14px;color:#999} -.nav ul li .right a{display: block;line-height: 60px;font-size: 20px;margin-right:20px;width: 60px;height: 60px;background: url("../images/logout-bg.png") no-repeat center;background-size: 100% 100%;border-radius: 50%;text-align: center;color: #fff;font-weight: normal} +.nav ul li a{display:block;overflow:hidden;padding:0 10px} +.nav ul li .left span{font-size:18px;color:#333;display:block;margin-top:8px} +.nav ul li .left p{font-size:12px;color:#999} +.nav ul li .right a{display: block;line-height: 60px;font-size: 20px;width: 60px;height: 60px;background: url("../images/logout-bg.png") no-repeat center;background-size: 100% 100%;border-radius: 50%;text-align: center;color: #fff;font-weight: normal} .nav ul li .right img{width:60px;height:60px} .nav ul li.active .left span{color:#3d41b7;font-weight:700;line-height:60px;margin-top:0;position:relative} .nav ul li.active .left span:after{content:'';display:block;width:100%;height:2px;background:#3d41b7;position:absolute;left:0;bottom:10px} .nav ul li.active .left p{display:none} -.mid-link{width:1530px;margin:30px auto;border-top:10px solid #ffd88b;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;padding-bottom:30px} +.mid-link{width:1200px;margin:20px auto;border-top:10px solid #ffd88b;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;padding-bottom:30px} .mid-link .text{display:block;margin:15px 0 15px 15px} .mid-link .link{padding:0 30px;overflow:hidden} -.mid-link .link .link-box{float:left;width:23.25%;height:130px;margin-right:2%;cursor:pointer;display:block} +.mid-link .link .link-box{float:left;width:23.25%;height:120px;margin-right:2%;cursor:pointer;display:block} .mid-link .link .link-box:last-child{margin-right:0} .mid-link .link .link-box img{width:100%;height:100%} -.news{width:1530px;margin:0 auto 30px} +.news{width:1200px;margin:0 auto 20px} .news .news-box{width:32%;margin-right:2%;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;float:left} .news .news-box:last-child{margin-right:0} .news .news-box .box-title{height:40px;line-height:40px;padding:0 10px;background:#064ec0;color:#fff} @@ -39,7 +39,7 @@ .news .news-box .news-list ul li:hover,.news .news-box .news-list ul li:hover a{color:#064ec0} .news .news-box .news-list ul li a{color:#333;display:inline-block;max-width:60%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis} .news .news-box .news-list ul li span{float:right} -.slide-news{width:1530px;margin:0 auto 30px;overflow:hidden} +.slide-news{width:1200px;margin:0 auto 30px;overflow:hidden} .slide-news .slide{width:66%;height:420px;float:left} .slide .bd a{display:block;position:relative} .dynamic-news,.slide{position:relative} @@ -48,25 +48,25 @@ .dynamic-news>a.prev:hover,.slide>a.prev:hover{background:url(../images/prev-on.png) no-repeat center} .dynamic-news>a.next,.slide>a.next{right:10px;background:url(../images/next.png) no-repeat center;background-size:100% 100%} .dynamic-news>a.next:hover,.slide>a.next:hover{background:url(../images/next-on.png) no-repeat center} -.slide .bd a img{width:100%;height:420px} +.slide .bd a img{width:100%;height:380px} .slide-text{position:absolute;left:0;bottom:0;background:rgba(0,0,0,.6);color:#fff;font-size:14px;width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;height:40px;line-height:40px;padding:0 10px;box-sizing:border-box} .slide-news .exposure-news{width:32%;float:right} .exposure-box{float:left;width:96px} .exposure-box img{width:96px;height:96px} -.exposure-title{float:right;width:380px} +.exposure-title{float:right;width:275px} .exposure-title a{font-size:24px;color:#064ec0;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin-top:15px} .exposure-title p{font-size:24px;color:#064ec0} .exposure{overflow:hidden;padding-bottom:15px;border-bottom:2px solid #a0a0a0} -.exposure-news-list li{height:60px;line-height:60px;border-bottom:1px dashed #eee;padding:0 10px;font-size:16px} +.exposure-news-list li{height:53px;line-height:53px;border-bottom:1px dashed #eee;padding:0 10px;font-size:16px} .exposure-news-list li a{display:inline-block;max-width:60%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#333} .exposure-news-list li span{float:right;color:#333} .exposure-news-list li:hover a,.exposure-news-list li:hover span{color:#064ec0} -.bottom-nav{width:1530px;margin:0 auto 30px} +.bottom-nav{width:1200px;margin:0 auto 30px} .nav-title{font-size:18px;color:#333;font-weight:700;padding-bottom:10px;border-bottom:2px solid #de0606} .nav-list{margin-top:10px} .nav-list a{display:inline-block;margin-right:15px;font-size:16px;color:#333;line-height:30px} -.footer{background:#f0efef;min-width:1530px;text-align:center;padding:25px 0;color:#b2b1b1;font-size:16px} -.row{width:1530px;margin:30px auto} +.footer{background:#f0efef;min-width:1200px;text-align:center;padding:25px 0;color:#b2b1b1;font-size:16px} +.row{width:1200px;margin:30px auto} .row:after{content:'';display:block;clear:both} .row .dynamic{width:49%;float:left} .img-title{margin-bottom:15px;position:relative} @@ -83,20 +83,20 @@ .notice-list li span{font-size:16px;color:#333;float:right} .notice-list li:hover a,.notice-list li:hover span{color:#064ec0} .row .pass{float:left} -.detail{width:1530px;margin:30px auto;background:#fff;padding:30px;box-sizing:border-box} +.detail{width:1200px;margin:30px auto;background:#fff;padding:30px;box-sizing:border-box} .news-title{padding-bottom:30px;border-bottom:1px solid #e5e5e5;text-align:center} .news-title h2{font-size:22px;color:#333;margin-bottom:20px} .news-title p{font-size:16px;color:#999} .news-detail{padding:20px 0;min-height:500px} .news-detail p{line-height:35px;font-size:16px;color:#333} -.assessment-header .banner,.assessment-header .banner img{width:100%;height:300px;min-width:1530px} -.count{width:1530px;margin:30px auto;padding:20px;box-sizing:border-box;background:#fff} -.chart-box{width:280px} +.assessment-header .banner,.assessment-header .banner img{width:100%;height:300px;min-width:1200px} +.count{width:1200px;margin:20px auto;padding:15px 15px 0;box-sizing:border-box;background:#fff} +.chart-box{width:260px} .count-title{padding-left:10px;border-left:5px solid #3d41b7;font-size:16px;color:#333} -.chart{width:280px;height:170px;margin-top:10px} -.count-container{width:1200px} +.chart{width:260px;height:170px;margin-top:10px} +.count-container{width:900px} .count-out{margin-top:30px} -.count-box{float:left;width:285px;height:120px;padding:20px 20px 30px 150px;box-sizing:border-box;text-align:right;margin-right:15px} +.count-box{float:left;width:210px;height:115px;padding:20px 20px 30px 100px;box-sizing:border-box;text-align:right;margin-right:15px} .count-box:first-child{background:url(../images/count-icon1.png) no-repeat center;background-size:100% 100%} .count-box:nth-child(2){background:url(../images/count-icon2.png) no-repeat center;background-size:100% 100%} .count-box:nth-child(3){background:url(../images/count-icon3.png) no-repeat center;background-size:100% 100%} @@ -104,8 +104,8 @@ .count-box:nth-child(5){background:url(../images/count-icon5.png) no-repeat center;background-size:100% 100%;margin-right:0} .count-box span{font-size:26px;color:#fff;font-weight:700} .count-box p{font-size:16px;color:#fff} -.assessment-main{width:1530px;margin:0 auto 30px;position: relative} -.left-nav{float:left;background:#fff;width:280px;box-shadow:0 0 10px #eee;padding:15px;box-sizing:border-box;height:100%;border-radius:5px;position: absolute;} +.assessment-main{width:1200px;margin:0 auto 30px;position: relative} +.left-nav{float:left;background:#fff;width:260px;box-shadow:0 0 10px #eee;padding:15px;box-sizing:border-box;height:100%;border-radius:5px;position: absolute;} .nav-title{padding-bottom:10px;border-bottom:1px solid #ddd} .nav-title span{display:inline-block;padding-left:10px;border-left:5px solid #3d41b7;font-size:16px;color:#333;font-weight:400} .nav-tab{border-bottom:1px dashed #ddd;padding:0 10px} @@ -120,7 +120,7 @@ .hide-list li:after{content:'';display:block;width:6px;height:6px;border-radius:50%;background:#333;position:absolute;top:20px;left:7px;margin-top:-3px} .hide-list li .nav-name.active{color:#3d41b7} .hide-list li.active:after{background:#3d41b7} -.right-main{width:1230px;float:right} +.right-main{width:930px;float:right} .assessment-search{padding:15px;background:#fff;border-radius:5px;box-shadow:0 0 10px #eee} .assessment-search-container{margin-top:20px} .assessment-search-box{float:left;margin-right:10px;font-size:0} @@ -146,7 +146,7 @@ .fullWidth{width: 100% !important;} .no-data{text-align: center;padding: 200px 0;background: #fff;border-radius: 5px;box-shadow: 0 0 10px #eee;} .no-data img{width: 200px;} -.news-container{width: 1530px;margin: 30px auto;padding: 0 20px 20px;background: #fff;border-radius: 5px;box-shadow: 0 0 10px #EEE;box-sizing: border-box} +.news-container{width: 1200px;margin: 30px auto;padding: 0 20px 20px;background: #fff;border-radius: 5px;box-shadow: 0 0 10px #EEE;box-sizing: border-box} .page-title{height: 60px;line-height: 60px;border-bottom: 1px solid #ddd;font-size: 20px;color:#333;padding-left: 15px;position: relative} .page-title:after{content: '';display: block;width: 5px;height: 25px;background: #064ec0;position: absolute;left: 0;top: 50%;margin-top: -10px} .news-container .news-list{min-height: 500px;} diff --git a/src/main/resources/static/assets/web/images/mid-img1.png b/src/main/resources/static/assets/web/images/mid-img1.png index 462fda6..9f06a23 100644 Binary files a/src/main/resources/static/assets/web/images/mid-img1.png and b/src/main/resources/static/assets/web/images/mid-img1.png differ diff --git a/src/main/resources/static/assets/web/images/mid-img2.png b/src/main/resources/static/assets/web/images/mid-img2.png index b0a654b..d22941f 100644 Binary files a/src/main/resources/static/assets/web/images/mid-img2.png and b/src/main/resources/static/assets/web/images/mid-img2.png differ diff --git a/src/main/resources/static/assets/web/images/mid-img3.png b/src/main/resources/static/assets/web/images/mid-img3.png index 7fb609c..95280c7 100644 Binary files a/src/main/resources/static/assets/web/images/mid-img3.png and b/src/main/resources/static/assets/web/images/mid-img3.png differ diff --git a/src/main/resources/static/assets/web/images/mid-img4.png b/src/main/resources/static/assets/web/images/mid-img4.png index 29906ac..dfdf7b0 100644 Binary files a/src/main/resources/static/assets/web/images/mid-img4.png and b/src/main/resources/static/assets/web/images/mid-img4.png differ diff --git a/src/main/resources/static/route/web/list.html b/src/main/resources/static/route/web/list.html index 9ba420c..4ad005b 100644 --- a/src/main/resources/static/route/web/list.html +++ b/src/main/resources/static/route/web/list.html @@ -70,7 +70,7 @@
@@ -180,6 +180,7 @@ // 分页 paging: function (page) { this.page.page = page + this.newsList = [] this.getNewsList() } }, diff --git a/src/main/resources/static/route/web/notice.html b/src/main/resources/static/route/web/notice.html index b229470..a546735 100644 --- a/src/main/resources/static/route/web/notice.html +++ b/src/main/resources/static/route/web/notice.html @@ -70,7 +70,7 @@
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 02dddfb..29dd253 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -76,16 +76,16 @@
- + - + - + - +
@@ -99,7 +99,7 @@
@@ -113,7 +113,7 @@
@@ -127,7 +127,7 @@
@@ -142,7 +142,7 @@ -
{{banner.subTitle}}
+
{{banner.title}}
 @@ -156,14 +156,14 @@
- {{exposureFirst.subTitle}} + {{exposureFirst.title}}

{{exposureFirst.publishDate}}

@@ -287,7 +287,6 @@ for (let i = 0; i < data.rows.length; i++) { data.rows[i].coverPhotos = data.rows[i].coverPhotos.split(',')[0] } - console.log(data.rows) self.bannerList = data.rows self.$nextTick(function () { jQuery(".slide").slide({mainCell:".bd ul",effect:"left",autoPlay:true,delayTime:500});