Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/peopleManages/taskStatistics/index.vue

@@ -93,8 +93,8 @@ export default {
                 },
                 legend: {
                     orient: 'vertical',
-                    right: '10',
-                    top: 'center'
+                    right: '5',
+                    top: 'top'
                 },
                 grid: {
                     left: '2%',
@@ -105,7 +105,11 @@ export default {
                 xAxis: {
                     type: 'value',
                     name: '任务数量(项)',
-                    boundaryGap: [0, 0]
+                    axisLabel: {
+                        formatter: function (v) {
+                            return parseInt(v)//表示整数。其他数值类型以此类推
+                        }
+                    }
                 },
                 yAxis: {
                     type: 'category',
@@ -153,6 +157,19 @@ export default {
                             valueAnimation: true
                         }
                     }
+                ],
+                dataZoom: [
+                    {
+                        type: 'inside',
+                        xAxisIndex: 0,
+                        filterMode: 'filter'
+                    },
+                    {
+                        type: 'inside',
+                        left: 'left',
+                        yAxisIndex: 0,
+                        filterMode: 'none'
+                    }
                 ]
             },
             setParams: {},
@@ -390,13 +407,8 @@ export default {
 .chart {
     width: 95%;
     height: 800px;
-    // padding-right: 20px;
 }
 
-// #echart-line {
-//     margin-right: 10px;
-// }
-
 .jbd-title-cont {
     text-align: center;
     font-weight: bold;

src/views/remindPage/sealCompleted.vue

@@ -3,7 +3,7 @@
         <div class="center">
             <img class="ok-img" src="../../assets/images/success/completed.png" alt="">
             <div>
-                签章已经完成，请回到上个页面继续检测流程
+                签章已经完成，请关闭当前页面，回到上个页面继续检测流程
             </div>
         </div>
     </div>