Merge branch 'master' of http://139.196.39.194:9021/yuansh/FBS_VIEW

lib/pdfjs/web/viewer.js

@@ -45,7 +45,7 @@ var mozL10n = document.mozL10n || document.webL10n;
 
 
 var CSS_UNITS = 96.0 / 72.0;
-var DEFAULT_SCALE_VALUE = 1.0;
+var DEFAULT_SCALE_VALUE = 'page-width';
 var DEFAULT_SCALE = 1.0;
 var UNKNOWN_SCALE = 0;
 var MAX_AUTO_SCALE = 1.25;
@@ -3574,7 +3574,7 @@ var PDFPageView = (function PDFPageViewClosure() {
     this.renderingId = 'page' + id;
 
     this.rotation = 0;
-    this.scale = 'page-width';//scale || DEFAULT_SCALE;
+    this.scale = scale || DEFAULT_SCALE;
     this.viewport = defaultViewport;
     this.pdfPageRotate = defaultViewport.rotation;
     this.hasRestrictedScaling = false;

pages/dashboard/esop.html

@@ -137,7 +137,9 @@
             },
             methods: {
                 SYPage(){
-                    this.taskList2 = taskList2.slice(0, 10);
+                    this.pIndex = 0;
+                    this.pSize = 10;
+                    this.taskList2 = taskList2.slice(this.pIndex, this.pSize);
                 },
                 beforePage(){
                     if(this.pIndex == 0){