diff --git a/src/main/resources/static/assets/web/css/style.css b/src/main/resources/static/assets/web/css/style.css index 34be00f..e8be6c3 100644 --- a/src/main/resources/static/assets/web/css/style.css +++ b/src/main/resources/static/assets/web/css/style.css @@ -1,37 +1,37 @@ .clearFloat:after{content:'';display:block;clear:both} .fl{float:left} .fr{float:right} -.banner{position: relative;width:100%;height:456px;min-width:1200px;} -.banner img{width: 100%} +.banner{position:relative;width:100%;height:456px;min-width:1200px} +.banner img{width:100%} .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 .left{width: 100px;text-align: center;} -.nav.child .left{width: 125px;} -.nav.child ul li.active .left{width: 150px;} -.nav ul li.active .left{text-align: center} -.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: 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{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 .left{width:100px;text-align:center} +.nav.child .left{width:125px} +.nav.child ul li.active .left{width:150px} +.nav ul li.active .left{text-align:center} +.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 .left span,.nav ul li.log-out a{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 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 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:400} .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;display: inline-block} +.nav ul li.active .left span{color:#3d41b7;font-weight:700;line-height:60px;margin-top:0;position:relative;display:inline-block} .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{position: relative;z-index: 100;border-radius: 5px;background: #fff;width:1200px;margin:20px auto;padding-top: 10px;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;padding-bottom:30px} +.mid-link{position:relative;z-index:100;border-radius:5px;background:#fff;width:1200px;margin:20px auto;padding-top:10px;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;padding-bottom:30px} .mid-link .text{display:block;margin:0 0 15px 15px} .mid-link .link{padding:0 30px;overflow:hidden} .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:1200px;margin:0 auto 20px;position: relative;z-index: 100;} +.news{width:1200px;margin:0 auto 20px;position:relative;z-index:100} .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,12 +39,12 @@ .news .news-box .box-title a{font-size:16px;float:right;color:#fff} .news .news-box .news-list{padding:0 10px} .news .news-box .news-list ul{height:243px} -.news .news-box .news-list ul li{border-bottom:1px dashed #dcdcdc;height:60px;line-height:60px;font-size:16px;color:#333;background: #fff} +.news .news-box .news-list ul li{border-bottom:1px dashed #dcdcdc;height:60px;line-height:60px;font-size:16px;color:#333;background:#fff} .news .news-box .news-list ul li:last-child{border:none} .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:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis} .news .news-box .news-list ul li span{float:right} -.slide-news{position: relative;z-index: 100;width:1200px;margin:30px auto;} +.slide-news{position:relative;z-index:100;width:1200px;margin:30px auto} .slide-news .slide{width:66%;height:420px;float:left} .slide .bd a{display:block;position:relative} .dynamic-news,.slide{position:relative} @@ -61,16 +61,16 @@ .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;background: #fff} -.exposure-news-list li{height:53px;line-height:53px;border-bottom:1px dashed #eee;padding:0 10px;font-size:16px;background: #fff} +.exposure{overflow:hidden;padding-bottom:15px;border-bottom:2px solid #a0a0a0;background:#fff} +.exposure-news-list li{height:53px;line-height:53px;border-bottom:1px dashed #eee;padding:0 10px;font-size:16px;background:#fff} .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{position: relative;z-index: 100;width:1200px;margin:0 auto 30px} +.bottom-nav{position:relative;z-index:100;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{position: relative;z-index: 100;background:#f0efef;min-width:1200px;text-align:center;padding:25px 0;color:#b2b1b1;font-size:16px} +.footer{position:relative;z-index:100;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} @@ -94,9 +94,8 @@ .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} -.news-detail img, .news-detail video{max-width: 100% !important;} -/*.assessment-header .banner{width:100%;height:300px;min-width:1200px}*/ -.assessment-header .banner img{width: 100%} +.news-detail img,.news-detail video{max-width:100%!important} +.assessment-header .banner img{width:100%} .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} @@ -111,21 +110,21 @@ .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:1200px;margin:0 auto 30px;position: relative} -.shadow{position: absolute;top:0;right:0;bottom: 0;width: 10px;background: #fff;z-index: 1000} -.left-nav{float:left;overflow: hidden;background:#fff;width:260px;box-shadow:0 0 10px #eee;padding:15px;box-sizing:border-box;height:100%;border-radius:5px;padding-right: 0;} -.nav-container{max-height: 665px;overflow-y: scroll;position: relative;width: 280px;} +.assessment-main{width:1200px;margin:0 auto 30px;position:relative} +.shadow{position:absolute;top:0;right:0;bottom:0;width:10px;background:#fff;z-index:1000} +.left-nav{float:left;overflow:hidden;background:#fff;width:260px;box-shadow:0 0 10px #eee;padding:15px;box-sizing:border-box;height:100%;border-radius:5px;padding-right:0} +.nav-container{max-height:665px;overflow-y:scroll;position:relative;width:280px} .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;width: 228px;box-sizing: border-box;white-space: nowrap;overflow: hidden;text-overflow: ellipsis} -.nav-tab .tab-title.active{color:#3d41b7;} +.nav-tab{border-bottom:1px dashed #ddd;padding:0 10px;width:228px;box-sizing:border-box;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +.nav-tab .tab-title.active{color:#3d41b7} .nav-tab .tab-title.bordered{border-bottom:1px dashed #ddd} .tab-title{line-height:60px;font-weight:700;font-size:16px;color:#333;cursor:pointer} .hide-list{display:none} -.hide-list li{line-height:40px;padding-left:20px;position:relative;cursor:pointer;border-top: 1px dashed #ddd} -.hide-list li .nav-name{line-height: 40px;white-space: nowrap;overflow:hidden;text-overflow: ellipsis;} -.hide-list li .nav-name.bordered{border-bottom: 1px dashed #ddd;} -.hide-list li:first-child{border: none} +.hide-list li{line-height:40px;padding-left:20px;position:relative;cursor:pointer;border-top:1px dashed #ddd} +.hide-list li .nav-name{line-height:40px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +.hide-list li .nav-name.bordered{border-bottom:1px dashed #ddd} +.hide-list li:first-child{border:none} .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} @@ -135,10 +134,10 @@ .assessment-search-box{float:left;margin-right:10px;font-size:0} .search-title{display:inline-block;vertical-align:top;padding:0 10px;height:35px;line-height:35px;background:#f5f5f5;font-size:14px;color:#333} .assessment-search-box input,.assessment-search-box select{width:200px;height:35px;border:1px solid #f5f5f5;box-sizing:border-box;padding:0 10px;font-size:14px} -.assessment-search-container button{width:110px;height:35px;border:none;background:#1f9fff;cursor:pointer;border-radius:20px;display:block;float:left;color:#fff;outline: none} -.main-list{margin-top:10px;min-height: 400px} +.assessment-search-container button{width:110px;height:35px;border:none;background:#1f9fff;cursor:pointer;border-radius:20px;display:block;float:left;color:#fff;outline:0} +.main-list{margin-top:10px;min-height:400px} .main-list ul li{background:#fff;padding:20px;box-shadow:0 0 10px #eee;border-radius:5px;margin-bottom:10px} -.main-list ul li:last-child{margin-bottom: 0} +.main-list ul li:last-child{margin-bottom:0} .main-list ul li .line{margin-bottom:10px;font-size:14px;color:#333} .main-list ul li .line:last-child{margin-bottom:0} .main-list ul li .line span{font-weight:700;color:#3d41b7} @@ -152,255 +151,81 @@ .pager ul{display:inline-block;overflow:hidden;vertical-align:middle} .pager ul li{width:35px;line-height:35px;float:left;margin-right:10px;border:1px solid #ddd;box-sizing:border-box;cursor:pointer;text-align:center;font-size:14px;color:#333} .pager ul li.active{color:#1e16c6;border:1px solid #1e16c6} -.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: 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;} -.news-container .news-list ul li{height: 60px;line-height: 60px;border-bottom: 1px dashed #DDD;} -.news-container .news-list ul li a{display: inline-block;max-width: 65%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;font-size: 18px;color: #333;} -.news-container .news-list ul li a:hover{color: #064ec0} -.news-container .news-list ul li span{float: right;font-size: 18px;color: #333} -.street{width: 32%;background: #fff;padding: 15px;box-sizing: border-box;box-shadow: 0 0 10px #eee;float:right;overflow:hidden;height: 420px;} -.street-box{width: 100%;height: 100%;} -.street a{display: block;padding: 0 5px;box-sizing:border-box;white-space:nowrap;overflow: hidden;text-overflow: ellipsis;float:left;margin-bottom: 15px;width:49%;background: #d12730;color: #fff;text-align: center;line-height: 35px;border-radius: 5px;} -.street a:hover{background: rgba(6,78,192,0.8)} +.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: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} +.news-container .news-list ul li{height:60px;line-height:60px;border-bottom:1px dashed #ddd} +.news-container .news-list ul li a{display:inline-block;max-width:65%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:18px;color:#333} +.news-container .news-list ul li a:hover{color:#064ec0} +.news-container .news-list ul li span{float:right;font-size:18px;color:#333} +.street{width:32%;background:#fff;padding:15px;box-sizing:border-box;box-shadow:0 0 10px #eee;float:right;overflow:hidden;height:420px} +.street-box{width:100%;height:100%} +.street a{display:block;padding:0 5px;box-sizing:border-box;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;float:left;margin-bottom:15px;width:49%;background:#d12730;color:#fff;text-align:center;line-height:35px;border-radius:5px} +.street a:hover{background:rgba(209,39,48,.8)} .street a:nth-child(even){float:right} -.street a img{display: block;margin: 10px auto 0;} -@media (min-width: 1420px){ - .banner{ - height: 450px - } - .assessment-header .banner{ - width: 100%; - height: 270px; - min-width: 1200px; - } +.street a img{display:block;margin:10px auto 0} +@media (min-width:1420px){.banner{height:450px} + .assessment-header .banner{width:100%;height:270px;min-width:1200px} } -@media (max-width: 1419px){ - .banner{ - height: 400px - } - .assessment-header .banner{ - width: 100%; - height: 220px; - min-width: 1200px; - } +@media (max-width:1419px){.banner{height:400px} + .assessment-header .banner{width:100%;height:220px;min-width:1200px} } -.street-container{ - width: 1200px; - margin: 20px auto; - overflow: hidden; -} -.street-type{ - float: left; - width: 350px; - min-height: 550px; - background: #fff; -} -.type-title{ - padding: 0 20px; - height: 40px; - line-height: 40px; - background: #064ec0; - color: #fff; -} -.street-type ul{ - padding: 15px; - font-size: 14px; -} -.street-type ul li{ - margin-bottom: 12px; - padding-left: 28px; - background: url("../images/type-icon.png") no-repeat left center; -} -.street-type ul li a{ - display: block; - font-size: 17px; - color: #333; -} -.org-detail{ - float: left; - width: 500px; - margin: 0 20px 0; - background: #fff; -} -.detail-box{ - padding: 10px 15px; - height: 510px; - box-sizing: border-box; -} -.street-notice{ - float: left; - width: 310px; -} -.street-notice-box{ - background: #fff; - margin-bottom: 20px; -} -.notice-title{ - overflow: hidden; - border-bottom: 1px solid #064ec0; -} -.notice-title .type-title{ - display: inline-block; - padding: 0 15px; -} -.notice-title a{ - float: right; - line-height: 40px; - margin-right: 10px; -} -.street-notice ul li a{ - display: block; - position: relative; -} -.street-notice ul li a p{ - position: absolute; - left: 0; - right: 0; - bottom: 0; - background: rgba(0,0,0,0.6); - padding: 0 10px; - color: #fff; - font-size: 14px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - line-height: 35px; -} -.street-notice ul li a img{ - width: 100%; - height: 254px; -} - -.street-leader{ - background: #fff; -} -.leader-box{ - padding: 37px 15px; -} -.leader-box a{ - display: block; - overflow: hidden; -} -.leader-avatar{ - float: left; - width: 100px; - height: 120px; -} -.leader-avatar img{ - width: 100%; - height: 100%; -} -.leader-info{ - width: 170px; - float:right; -} -.leader-info h3{ - font-size: 18px; - color: #000; - font-weight: normal; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.leader-info p{ - font-size: 14px; - color: #333; -} -.leader{ - width: 1200px; - margin: 20px auto; - background: #fff; -} -.leader-title{ - border-bottom: 1px solid #064ec0; -} -.leader-list{ - min-height: 550px; -} -.leader-title span{ - display: inline-block; - padding: 0 15px; - background: #064ec0; - color: #fff; - line-height: 40px; -} -.leader-list ul{ - padding-bottom: 18px; -} -.leader-list ul li{ - float:left; - width: 140px; - margin: 18px 49px 0 49px; -} -.leader-list ul li:nth-child(5n){ - margin-right: 0; -} -.leader-list ul li a{ - display: block; - text-align: center; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.avatar-leader{ - width: 100%; - height: 180px; - overflow: hidden; - position: relative; -} -.avatar-leader img.avatar{ - width: 100%; - height: 100%; - transition: all .5s; -} -.avatar-leader img.default-avatar{ - width: auto; - height: auto; - position: absolute; +.street-container{width:1200px;margin:20px auto;overflow:hidden} +.street-type{float:left;width:350px;min-height:550px;background:#fff} +.type-title{padding:0 20px;height:40px;line-height:40px;background:#064ec0;color:#fff} +.street-type ul{padding:15px;font-size:14px} +.street-type ul li{margin-bottom:12px;padding-left:28px;background:url(../images/type-icon.png) no-repeat left center} +.street-type ul li a{display:block;font-size:17px;color:#333} +.org-detail{float:left;width:500px;margin:0 20px 0;background:#fff} +.detail-box{padding:10px 15px;height:510px;box-sizing:border-box} +.street-notice{float:left;width:310px} +.street-notice-box{background:#fff;margin-bottom:20px} +.notice-title{overflow:hidden;border-bottom:1px solid #064ec0} +.notice-title .type-title{display:inline-block;padding:0 15px} +.notice-title a{float:right;line-height:40px;margin-right:10px} +.street-notice ul li a{display:block;position:relative} +.street-notice ul li a p{position:absolute;left:0;right:0;bottom:0;background:rgba(0,0,0,.6);padding:0 10px;color:#fff;font-size:14px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:35px} +.street-notice ul li a img{width:100%;height:254px} +.street-leader{background:#fff} +.leader-box{padding:37px 15px} +.leader-box a{display:block;overflow:hidden} +.leader-avatar{float:left;width:100px;height:120px} +.leader-avatar img{width:100%;height:100%} +.leader-info{width:170px;float:right} +.leader-info h3{font-size:18px;color:#000;font-weight:400;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +.leader-info p{font-size:14px;color:#333} +.leader{width:1200px;margin:20px auto;background:#fff} +.leader-title{border-bottom:1px solid #064ec0} +.leader-list{min-height:550px} +.leader-title span{display:inline-block;padding:0 15px;background:#064ec0;color:#fff;line-height:40px} +.leader-list>ul{padding-bottom:18px;height: 516px;} +.leader-list>ul>li{float:left;width:140px;margin:18px 49px 0 49px} +.leader-list>ul>li:nth-child(5n){margin-right:0} +.leader-list>ul>li>a{display:block;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +.avatar-leader{width:100%;height:180px;overflow:hidden;position:relative} +.avatar-leader img.avatar{width:100%;height:100%;transition:all .5s} +.avatar-leader img.default-avatar{width:auto;height:auto;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)} +.leader-list ul li:hover img.avatar{transform:scale(1.05)} +.leader-list ul li a span{color:#00a1f4;font-size:16px;line-height:30px} +.leader-list ul li a p{color:#888;font-size:16px} +.leader-content{width:1200px;margin:20px auto 40px;background:#fff} +.leader-info-top{text-align:center;padding:50px 0} +.leader-info-top img{width:180px;height:228px;margin-bottom:20px} +.leader-info-top p{font-size:16px;margin-bottom:5px} +.info-bottom-title{padding:0 35px;background:#e6ecf3;line-height:50px} +.leader-intro{padding:20px 35px} +.leader-pager{padding-bottom: 15px} +.loading{ + position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); + background: rgba(255,255,255,0.6); + padding: 30px; + border-radius: 10px; + box-shadow: 0 0 17px #DEDEDE; } -.leader-list ul li:hover img.avatar{ - transform: scale(1.05); -} -.leader-list ul li a span{ - color: #00a1f4; - font-size: 16px; - line-height: 30px; -} -.leader-list ul li a p{ - color: #888; - font-size: 16px; -} -.leader-content{ - width: 1200px; - margin: 20px auto 40px; - background: #fff; -} -.leader-info-top{ - text-align: center; - padding: 50px 0; -} -.leader-info-top img{ - width: 180px; - height: 228px; - margin-bottom: 20px; -} -.leader-info-top p{ - font-size: 16px; - margin-bottom: 5px; -} -.info-bottom-title{ - padding: 0 35px; - background: #e6ecf3; - line-height: 50px; -} -.leader-intro{ - padding: 20px 35px; -} \ No newline at end of file diff --git a/src/main/resources/static/assets/web/images/loading.gif b/src/main/resources/static/assets/web/images/loading.gif new file mode 100644 index 0000000..8524d0f Binary files /dev/null and b/src/main/resources/static/assets/web/images/loading.gif differ diff --git a/src/main/resources/static/route/web/leader-detail.html b/src/main/resources/static/route/web/leader-detail.html index 9f8860c..427fc86 100644 --- a/src/main/resources/static/route/web/leader-detail.html +++ b/src/main/resources/static/route/web/leader-detail.html @@ -87,15 +87,15 @@
- + -

{{leaderInfo.userName}}

-

{{leaderInfo.positionNames}}

+

{{leaderInfo.departmentMemberName}}

+

{{leaderInfo.departmentMemberPosition}}

领导简介
- {{leaderInfo.userExpand}} + {{leaderInfo.departmentMemberExplain}}
@@ -120,8 +120,7 @@ methods: { getLeaderInfo: function () { var self = this - top.restAjax.get(top.restAjax.path('api/departmentBase/get-by-user-id/{userId} ', [self.userId]), {}, null, function(code, data) { - console.log(data) + top.restAjax.get(top.restAjax.path('api/departmentmember/get/{departmentMemberId}', [self.userId]), {}, null, function(code, data) { self.leaderInfo = data }, function(code, data) { layer.msg(data.msg); diff --git a/src/main/resources/static/route/web/leader.html b/src/main/resources/static/route/web/leader.html index bfebd7c..e55ee1f 100644 --- a/src/main/resources/static/route/web/leader.html +++ b/src/main/resources/static/route/web/leader.html @@ -37,7 +37,7 @@ -
  • +
  • 四个清单 @@ -48,7 +48,7 @@
    • -
  • +
  • 五项流程 @@ -59,7 +59,7 @@
    • -
  • +
  • 六本台账 @@ -92,19 +92,44 @@
    +
    + 首页 + 上一页 +
      +
    • + {{cpage}} +
      • +
    +
      +
    • + {{cpage}} +
      • +
    • + {{page.totalPage - 5 + cpage}} +
      • +
    • + {{page.page - (3 - cpage)}} +
      • +
    + 下一页 + 尾页 +
    +
    + +
    @@ -121,14 +146,24 @@ el: '#app', data: { departmentId: '', - leaderList: [] + leaderList: [], + page: { + page: 1, + rows: 10, + totalPage: 1, + departmentId: '' + }, + isLoading: false }, methods: { getLeader: function () { var self = this - top.restAjax.get(top.restAjax.path('api/departmentBase/list-user/{departmentId}', [self.departmentId]), {}, null, function(code, data) { - console.log(data) - self.leaderList = data + self.isLoading = true + top.restAjax.get(top.restAjax.path('api/departmentmember/list-page-departmentid', []), self.page, null, function(code, data) { + self.leaderList = data.rows + self.page.page = data.page + self.page.totalPage = Math.ceil(data.total / self.page.rows) + self.isLoading = false }, function(code, data) { layer.msg(data.msg); }, function() { @@ -136,10 +171,16 @@ }, function() { // layer.close(loadLayerIndex1); }); + }, + paging: function (page) { + if (!this.isLoading) { + this.page.page = page + this.getLeader() + } } }, mounted: function () { - this.departmentId = restAjax.params(window.location.href).departmentId + this.page.departmentId = restAjax.params(window.location.href).departmentId this.getLeader() } }) diff --git a/src/main/resources/static/route/web/public.html b/src/main/resources/static/route/web/public.html index 0d77661..a6905d7 100644 --- a/src/main/resources/static/route/web/public.html +++ b/src/main/resources/static/route/web/public.html @@ -417,7 +417,6 @@ getMainList: function (id) { var self = this; self.mainList = [] - console.log(id) // var loadLayerIndex; top.restAjax.get(top.restAjax.path('api/indexlib/listpageweb/{indexLibParentId}', [id]), self.page, null, function(code, data) { for (let i = 0; i < data.rows.length; i++) { diff --git a/src/main/resources/static/route/web/street.html b/src/main/resources/static/route/web/street.html index 606c4cb..c341ac6 100644 --- a/src/main/resources/static/route/web/street.html +++ b/src/main/resources/static/route/web/street.html @@ -103,7 +103,7 @@
    机构概况
    -

    {{streetInfo.departmentSummary}}

    +

    {{streetInfo}}

    @@ -132,13 +132,13 @@ MORE+
    - +
    - +
    -

    {{leaderInfo.userName}}

    -

    {{leaderInfo.positionNames}}

    +

    {{leaderInfo.departmentMemberName}}

    +

    {{leaderInfo.departmentMemberPosition}}
    @@ -162,15 +162,15 @@ el: '#app', data: { departmentId: '', - streetInfo: {}, + streetInfo: '', leaderInfo: {}, newsList: [] }, methods: { getStreetInfo: function () { var self = this - top.restAjax.get(top.restAjax.path('api/department/get/{departmentId}', [self.departmentId]), {}, null, function(code, data) { - self.streetInfo = data + top.restAjax.get(top.restAjax.path('api/departmentsynopsis/get-by-departmentid/{departmentId}', [self.departmentId]), {}, null, function(code, data) { + self.streetInfo = data.departmentSynopsisContent }, function(code, data) { layer.msg(data.msg); }, function() { @@ -181,9 +181,12 @@ }, getLeader: function () { var self = this - top.restAjax.get(top.restAjax.path('api/departmentBase/list-user-boss/{departmentId}', [self.departmentId]), {}, null, function(code, data) { - self.leaderInfo = data[0] - console.log(self.leaderInfo) + top.restAjax.get(top.restAjax.path('api/departmentmember/list-page-departmentid', [self.departmentId]), { + page: 1, + rows: 1, + departmentId: self.departmentId + }, null, function(code, data) { + self.leaderInfo = data.rows[0] }, function(code, data) { layer.msg(data.msg); }, function() { @@ -200,7 +203,6 @@ departmentId: self.departmentId } top.restAjax.get(top.restAjax.path('api/contentdatabase/list-page-department', []), info, null, function(code, data) { - console.log(data) for (let i = 0; i < data.rows.length; i++) { data.rows[i].coverPhotos = data.rows[i].coverPhotos.split(',')[0] } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index e978231..837637e 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -222,7 +222,6 @@ // var loadLayerIndex; top.restAjax.get(top.restAjax.path('api/indexlib/listwebtags', []), {}, null, function(code, data) { self.topNavList = data - console.log(data) }, function(code, data) { layer.msg(data.msg); }, function() { @@ -372,7 +371,6 @@ getSixBook: function () { var self = this top.restAjax.get(top.restAjax.path('api/indexlib/listztreeweb/{indexLibParentId}', ['c912f0ff-d1e6-4346-a0cd-c955ea559a0b']), {}, null, function(code, data) { - console.log(data) self.sixBook = data }, function(code, data) { layer.msg(data.msg); @@ -386,9 +384,9 @@ mounted: function () { // this.getTopNav() this.getGateNav() - this.getWeekNews() - this.getLatestDynamic() - this.getInfoPublic() + // this.getWeekNews() + // this.getLatestDynamic() + // this.getInfoPublic() // this.getExposure() this.getBanner() this.getStreet()