Merge remote-tracking branch 'origin/master'

src/main/resources/static/assets/web/css/style.css

@@ -37,8 +37,8 @@
 .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 a{font-size:16px;float:right;color:#fff}
-.news .news-box .news-list{padding:0 10px}
+.news .news-box .news-list{padding:0 10px;overflow: hidden;}
-.news .news-box .news-list ul{height:243px}
+.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 ul li:hover,.news .news-box .news-list ul li:hover a{color:#064ec0}
@@ -238,14 +238,14 @@
 }
 .fix-box{
     position: fixed;
-    top:53%;
+    top:42.7%;
     right:0;
-    transform: translate(0,-50%);
     padding:0 15px 15px;
     background: #fff;
     width: 300px;
     z-index: 100;
     box-shadow: 0 0 10px #EEE;
+    border-radius: 5px;
 }
 .fix-title{
     border-bottom: 1px solid #eee;
@@ -253,10 +253,14 @@
     font-size: 18px;
     text-align: center;
     color: #333;
+    font-weight: bold;
 }
 .scroll-slide-title,.scroll-slide li{
     font-size: 0;
 }
+.scroll-slide-title span{
+    font-weight: bold;
+}
 .scroll-slide-title span,.scroll-slide span{
     display: inline-block;
     font-size: 16px;

src/main/resources/templates/index.html

@@ -186,7 +186,7 @@
         </div>
     </div>
     <div class="count clearFloat">
-        <h3>四个清单</h3>
+        <h3>四个清单-指标上报统计</h3>
         <div class="chart-box fl">
             <div class="count-title">指标状态占比统计</div>
             <div class="chart" id="chart4"></div>
@@ -214,7 +214,7 @@
         </div>
     </div>
     <div class="count clearFloat">
-        <h3>五项流程</h3>
+        <h3>五项流程-指标上报统计</h3>
         <div class="chart-box fl">
             <div class="count-title">指标状态占比统计</div>
             <div class="chart" id="chart5"></div>
@@ -242,7 +242,7 @@
         </div>
     </div>
     <div class="count clearFloat">
-        <h3>六本台账</h3>
+        <h3>六本台账-指标上报统计</h3>
         <div class="chart-box fl">
             <div class="count-title">指标状态占比统计</div>
             <div class="chart" id="chart6"></div>
@@ -288,8 +288,8 @@
         </div>
         <div class="scroll-slide">
             <div class="bd">
-                <ul v-for="(item,i) in ontWeekRoleData">
+                <ul v-cloak>
-                    <li>
+                    <li v-for="(item,i) in ontWeekRoleData">
                         <span>{{ item.userName}}</span>
                         <span>{{ item.indexLib4}}</span>
                         <span>{{ item.indexLib5}}</span>
@@ -332,6 +332,23 @@
             ontWeekRoleData:{}
         },
         methods: {
+            openCountDetail: function (path) {
+                var self = this
+                var id = this.pageId
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: true,
+                    area: ['70%', '70%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path(path + '?indexLibIdParentId=' + '{id}' + '&departmentId=' + self.departmentId, [id]),
+                    end: function() {
+                        // self.getMainList(self.curId)
+                        location.reload();
+                    }
+                });
+            },
             // 饼图
             initChart4: function () {
                 var self = this;
@@ -690,6 +707,9 @@
                 var self = this
                 top.restAjax.get(top.restAjax.path('api/indexaudit/count-role-month', []), {}, null, function(code, data) {
                     self.ontWeekRoleData = data
+                    self.$nextTick(function () {
+                        jQuery(".scroll-slide").slide({mainCell:".bd ul",autoPlay:true,effect:"topMarquee",vis:6,interTime:50,trigger:"click"});
+                    })
                 }, function(code, data) {
                     layer.msg(data.msg);
                 }, function() {
@@ -715,10 +735,10 @@
             this.getCount5()
             this.getCount6()
             this.getOneWeeKRoleIndexLibCoun();
-            $('.street-box').niceScroll()
+            // $('.street-box').niceScroll()
-            $('.news-list ul').niceScroll()
+            // $('.news-list ul').niceScroll()
             this.departmentId = $('.hide-input').val()
-            jQuery(".scroll-slide").slide({mainCell:".bd ul",autoPlay:true,effect:"topMarquee",vis:5,interTime:50,trigger:"click"});
+
         }
     })
 </script>