diff --git a/src/main/resources/static/assets/web/css/style.css b/src/main/resources/static/assets/web/css/style.css index 62433cc..735262a 100644 --- a/src/main/resources/static/assets/web/css/style.css +++ b/src/main/resources/static/assets/web/css/style.css @@ -32,15 +32,18 @@ .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 .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{width:32%;margin-right:2%;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} -.news .news-box .box-title span{font-size:18px} +.news .news-box .box-title{height:40px;line-height:40px;color:#333} +.news .news-box .box-title span{font-size:18px;display: inline-block;padding-left: 35px;} +.news .news-box .box-title span.four{background: url("../images/four-icon.png") no-repeat left center;} +.news .news-box .box-title span.five{background: url("../images/five-icon.png") no-repeat left center;} +.news .news-box .box-title span.six{background: url("../images/six-icon.png") no-repeat left center;} .news .news-box .box-title a{font-size:16px;float:right;color:#fff} -.news .news-box .news-list{padding:0 10px;overflow: hidden;} -.news .news-box .news-list ul{height:243px;overflow-y: scroll;width:110%;padding-right:20px;box-sizing: border-box;} -.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{overflow: hidden;} +.news .news-box .news-list ul{height:215px;overflow-y: scroll;width:110%;padding-right:20px;box-sizing: border-box;} +.news .news-box .news-list ul li{padding-left:55px;margin-bottom:15px;height:40px;line-height:40px;font-size:16px;color:#333;background:url("../images/news-bg.png") no-repeat center;background-size: 100% 100%;} +.news .news-box .news-list ul li:last-child{border:none;margin-bottom:0;} .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} @@ -102,11 +105,20 @@ .news-detail p{line-height:35px;font-size:16px;color:#333} .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;box-shadow: 0 0 10px #eee;} -.count>h3{font-size: 20px;color: #333;font-weight: normal;margin-bottom: 10px;} -.chart-box{width:260px} +.count{width:1200px;margin:20px auto;padding:15px;box-sizing:border-box;background:#fff;box-shadow: 0 0 10px #eee;} +.count>h3 span{float:right;color: #808080;font-size: 14px;} +.count>h3{font-size: 16px;color: #333;font-weight: normal;margin-bottom: 10px;} +.chart-box{width:100%;position: relative;} +.tj-box{position: absolute;right: 0;top:6%;width:160px;z-index: 10000} +.tj-box-inner{float:left;width:50%;text-align: center;} +.tj-box-inner span{font-size: 28px;} +.tj-box-inner span.tj-1{color: #d3d6d7} +.tj-box-inner span.tj-2{color: #3ab896} +.tj-box-inner span.tj-3{color: #e94d43} +.tj-box-inner span.tj-4{color: #f4c736} +.tj-box-inner p{font-size: 14px;color: #333;} .count-title{padding-left:10px;border-left:5px solid #3d41b7;font-size:16px;color:#333} -.chart{width:260px;height:170px;margin-top:10px} +.chart{width:100%;height:160px;} .count-container{width:900px} .count-out{margin-top:30px} .count-box{float:left;width:210px;height:115px;padding:20px 20px 30px 100px;cursor:pointer;box-sizing:border-box;text-align:right;margin-right:15px} @@ -171,8 +183,8 @@ .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{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:#3db3bd;color:#fff;text-align:center;line-height:35px;border-radius:5px} +.street a:hover{background:#2f747b} .street a:nth-child(even){float:right} .street a img{display:block;margin:10px auto 0} @media (min-width:1420px){.banner{height:450px} @@ -240,19 +252,20 @@ position: fixed; top:42.7%; right:0; - padding:0 15px 15px; background: #fff; width: 300px; - z-index: 100; + z-index: 1000000; box-shadow: 0 0 10px #EEE; - border-radius: 5px; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + overflow: hidden; } .fix-title{ - border-bottom: 1px solid #eee; line-height: 45px; font-size: 18px; text-align: center; - color: #333; + background: #2f747b; + color: #fff; font-weight: bold; } .scroll-slide-title,.scroll-slide li{ @@ -261,6 +274,9 @@ .scroll-slide-title span{ font-weight: bold; } +.scroll-slide-title span{ + color: #2f747b; +} .scroll-slide-title span,.scroll-slide span{ display: inline-block; font-size: 16px; @@ -275,3 +291,22 @@ overflow:hidden; text-overflow: ellipsis; } +.scroll-slide{ + padding: 0 15px; +} +.count-outer{ + width: 1200px; + margin: 20px auto; +} +.count-outer:after{ + content: ''; + display: block; + clear: both; +} +.count-outer .count{ + float:left; + width: 32%; + margin-right: 2%; +}.count-outer .count:last-child{ + margin-right: 0; + } \ No newline at end of file diff --git a/src/main/resources/static/assets/web/images/five-icon.png b/src/main/resources/static/assets/web/images/five-icon.png new file mode 100644 index 0000000..d0e6a05 Binary files /dev/null and b/src/main/resources/static/assets/web/images/five-icon.png differ diff --git a/src/main/resources/static/assets/web/images/four-icon.png b/src/main/resources/static/assets/web/images/four-icon.png new file mode 100644 index 0000000..6969a8d Binary files /dev/null and b/src/main/resources/static/assets/web/images/four-icon.png differ diff --git a/src/main/resources/static/assets/web/images/news-bg.png b/src/main/resources/static/assets/web/images/news-bg.png new file mode 100644 index 0000000..7530fe3 Binary files /dev/null and b/src/main/resources/static/assets/web/images/news-bg.png differ diff --git a/src/main/resources/static/assets/web/images/six-icon.png b/src/main/resources/static/assets/web/images/six-icon.png new file mode 100644 index 0000000..82d204d Binary files /dev/null and b/src/main/resources/static/assets/web/images/six-icon.png differ diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 87b8560..915f36b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -123,7 +123,7 @@
- 四个清单 + 四个清单 更多>
@@ -136,7 +136,7 @@
- 五项流程 + 五项流程 更多>
@@ -149,7 +149,7 @@
- 六本台账 + 六本台账 更多>
@@ -193,91 +193,90 @@
- -
-

四个清单-指标上报统计

-
-
指标状态占比统计
-
-
-
-
指标状态统计
-
-
- {{countInfo4.checkPendingNum}} -

未审核

-
-
- {{countInfo4.checkPassNum}} -

审核通过

-
-
- {{countInfo4.checkArchivesNum}} -

归档

-
-
- {{countInfo4.checkNoPassNum}} -

审核不通过

+
+
+

+ 四个清单-指标上报统计 + 指标状态占比统计 +

+
+
+
+
+ {{countInfo4.checkPendingNum}} +

未审核

+
+
+ {{countInfo4.checkPassNum}} +

审核通过

+
+
+ {{countInfo4.checkArchivesNum}} +

审核不通过

+
+
+ {{countInfo4.checkNoPassNum}} +

归档

+
-
-
-

五项流程-指标上报统计

-
-
指标状态占比统计
-
-
-
-
指标状态统计
-
-
- {{countInfo5.checkPendingNum}} -

未审核

-
-
- {{countInfo5.checkPassNum}} -

审核通过

-
-
- {{countInfo5.checkArchivesNum}} -

归档

-
-
- {{countInfo5.checkNoPassNum}} -

审核不通过

+
+

+ 五项流程-指标上报统计 + 指标状态占比统计 +

+
+
+
+
+ {{countInfo5.checkPendingNum}} +

未审核

+
+
+ {{countInfo5.checkPassNum}} +

审核通过

+
+
+ {{countInfo5.checkArchivesNum}} +

审核不通过

+
+
+ {{countInfo5.checkNoPassNum}} +

归档

+
-
-
-

六本台账-指标上报统计

+
+

+ 六本台账-指标上报统计 + 指标状态占比统计 +

-
指标状态占比统计
-
-
-
指标状态统计
-
-
- {{countInfo6.checkPendingNum}} +
+
+ {{countInfo6.checkPendingNum}}

未审核

-
- {{countInfo6.checkPassNum}} +
+ {{countInfo6.checkPassNum}}

审核通过

-
- {{countInfo6.checkArchivesNum}} -

归档

-
-
- {{countInfo6.checkNoPassNum}} +
+ {{countInfo6.checkArchivesNum}}

审核不通过

+
+ {{countInfo6.checkNoPassNum}} +

归档

+
+
+
门户导航
@@ -368,15 +367,16 @@ formatter: '{b} : {c} ({d}%)' }, legend: { - x: '0', - y: '25px', - orient: 'vertical' + x: 'center', + y: 'bottom', + orient: 'horizontal' }, + color: ['#d3d6d7','#3ab896','#f4c736','#e94d43'], series: [ { type: 'pie', radius: '65%', - center: ['70%', '50%'], + center: ['30%', '40%'], selectedMode: 'single', data: [ {value: self.countInfo4.checkPendingNum, name: '未审核',}, @@ -414,15 +414,16 @@ formatter: '{b} : {c} ({d}%)' }, legend: { - x: '0', - y: '25px', - orient: 'vertical' + x: 'center', + y: 'bottom', + orient: 'horizontal' }, + color: ['#d3d6d7','#3ab896','#f4c736','#e94d43'], series: [ { type: 'pie', radius: '65%', - center: ['70%', '50%'], + center: ['30%', '40%'], selectedMode: 'single', data: [ {value: self.countInfo5.checkPendingNum, name: '未审核',}, @@ -460,15 +461,16 @@ formatter: '{b} : {c} ({d}%)' }, legend: { - x: '0', - y: '25px', - orient: 'vertical' + x: 'center', + y: 'bottom', + orient: 'horizontal' }, + color: ['#d3d6d7','#3ab896','#f4c736','#e94d43'], series: [ { type: 'pie', radius: '65%', - center: ['70%', '50%'], + center: ['30%', '40%'], selectedMode: 'single', data: [ {value: self.countInfo6.checkPendingNum, name: '未审核',},