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

lib/pdfjs/web/viewer.js

@@ -26,7 +26,7 @@
 'use strict';
 
 var DEFAULT_URL = 'compressed.tracemonkey-pldi-09.pdf';
-var DEFAULT_SCALE_DELTA = 1.1;
+var DEFAULT_SCALE_DELTA = 'page-width';//1.1;
 var MIN_SCALE = 0.25;
 var MAX_SCALE = 10.0;
 var SCALE_SELECT_CONTAINER_PADDING = 8;
@@ -7204,12 +7204,12 @@ function webViewerInitialized() {
   } else {
     document.getElementById('fileInput').value = null;
   }
-    // 手动修改 冯海夫
+    // 锟街讹拷锟睫革拷 锟诫海锟斤拷
   document.getElementById('openFile').setAttribute('hidden', 'true');
   document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
   document.getElementById('documentProperties').setAttribute('hidden', 'true');
 
-    // 手动修改结束
+    // 锟街讹拷锟睫改斤拷锟斤拷
   var locale = PDFJS.locale || navigator.language;
 
   if (PDFViewerApplication.preferencePdfBugEnabled) {

pages/dashboard/line.html

@@ -205,12 +205,12 @@
     <script src="/lib/vue.min.js"></script>
     <script src="/lib/echarts/echarts.min.js"></script>
     <script src="/lib/echarts/theme/macarons.js"></script>
-    <script src="/js/service/person.js?_v=1"></script>
-    <script src="/js/service/material.js?_v=1"></script>
-    <script src="/js/service/product.js?_v=1"></script>
-    <script src="/js/service/workhour.js?_v=1"></script>
-    <script src="/js/service/produce-task.js?_v=1"></script>
-    <script src="/js/content/mycharts.js?_v=1"></script>
+    <script src="/js/service/person.js?_v=2"></script>
+    <script src="/js/service/material.js?_v=2"></script>
+    <script src="/js/service/product.js?_v=2"></script>
+    <script src="/js/service/workhour.js?_v=2"></script>
+    <script src="/js/service/produce-task.js?_v=2"></script>
+    <script src="/js/content/mycharts.js?_v=2"></script>
     <script type="text/javascript">
 
         //当日标准工时与实际工时对比

pages/dashboard/produce.html

@@ -201,12 +201,12 @@
     <script src="/lib/vue.min.js"></script>
     <script src="/lib/echarts/echarts.min.js"></script>
     <script src="/lib/echarts/theme/macarons.js"></script>
-    <script src="/js/service/material.js?_v=1"></script>
-    <script src="/js/service/product.js?_v=1"></script>
-    <script src="/js/service/person.js?_v=1"></script>
-    <script src="/js/service/produce-task.js?_v=1"></script>
-    <script src="/js/service/workhour.js?_v=1"></script>
-    <script src="/js/content/mycharts.js?_v=1"></script>
+    <script src="/js/service/material.js?_v=2"></script>
+    <script src="/js/service/product.js?_v=2"></script>
+    <script src="/js/service/person.js?_v=2"></script>
+    <script src="/js/service/produce-task.js?_v=2"></script>
+    <script src="/js/service/workhour.js?_v=2"></script>
+    <script src="/js/content/mycharts.js?_v=2"></script>
     <script type="text/javascript">
 
         // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")

pages/dashboard/warehouse.html

@@ -442,10 +442,10 @@
     <script src="/lib/vue.min.js"></script>
     <script src="/lib/echarts/echarts.min.js"></script>
     <script src="/lib/echarts/theme/macarons.js"></script>
-    <script src="/js/service/person.js?_v=1"></script>
-    <script src="/js/service/material.js?_v=1"></script>
-    <script src="/js/service/product.js?_v=1"></script>
-    <script src="/js/content/mycharts.js?_v=1"></script>
+    <script src="/js/service/person.js?_v=2"></script>
+    <script src="/js/service/material.js?_v=2"></script>
+    <script src="/js/service/product.js?_v=2"></script>
+    <script src="/js/content/mycharts.js?_v=2"></script>
     <script type="text/javascript">
         // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")
         const monthSend = ServiceProduct.getMonthSend();