esop

js/service/produce-task.js

@@ -672,9 +672,9 @@ var ServiceProduceTask = {
         // return taskList;
     },
     //文件列表
-    getEsopFileList:function(code){
+    getEsopFileList:function(code,moCode){
 
-        return getService.methodGet("/workingStatistics/fbsWorkingStatistics/getEsopFileList?code="+code);
+        return getService.methodGet("/workingStatistics/fbsWorkingStatistics/getEsopFileList?code="+code+"&moCode="+moCode);
     },
     //视频自动播放
     getVedioFileList:function(){

pages/dashboard/esop.html

@@ -68,7 +68,7 @@
                         <!-- <div class="col-lg-2 col-md-2 center no-padding" style="width: 20%;">{{task.specs}}</div> -->
                         <div class="col-lg-2 col-md-2 center no-padding"  style="width: 12%;">{{task.qty}}</div>
                         <div class="col-lg-1 col-md-2 center no-padding" style="width: 10%;">
-                            <button type="button" class="btn btn-xs " :style="{background:task.color}" @click="selectFile(task.materialCode)">文件</button>
+                            <button type="button" class="btn btn-xs " :style="{background:task.color}" @click="selectFile(task.materialCode,task.orderSheetCode)">文件</button>
                     </div>
                     </div>
                     <div class="row" >
@@ -190,26 +190,31 @@ iframe.height = iframeWin.document.documentElement.scrollHeight || iframeWin.doc
                     if(file=='pdf'){
                         hideAll();
                         $("#frameMain").show();
-                        this.filepath = "/lib/pdfjs/web/viewer.html?file=/upFiles/"+marCode+"/"+name;
+                        // this.filepath = "/lib/pdfjs/web/viewer.html?file=/upFiles/"+marCode+"/"+name;
+                        this.filepath = "/lib/pdfjs/web/viewer.html?file=/upFiles/"+name;
                         $("#videoType").attr('src',"");
                     }else if(file=='jpg' || file=='jpeg' || file=='png'){
                         hideAll();
                         $("#imgType").show();
-                        $("#imgType").attr('src',"/upFiles/"+marCode+"/"+name);
+                        // $("#imgType").attr('src',"/upFiles/"+marCode+"/"+name);
+                        
+                        $("#imgType").attr('src',"/upFiles/"+name);
                         $("#videoType").attr('src',"");
                     }else if(file=='avi' || file=='mov' || file=='rmvb' || file=='rm' || file=='flv' || file=='mp4' || file=='3gp'){
                         hideAll();
                         $("#videoType").show();
-                        $("#videoType").attr('src',"/upFiles/"+marCode+"/"+name);
+                        // $("#videoType").attr('src',"/upFiles/"+marCode+"/"+name);
+                        $("#videoType").attr('src',"/upFiles/"+name);
                     }else{
                         alert("暂时不支持该类型文件的展示");
                     }
                     
                 },
-                selectFile: function(code){
+                selectFile: function(code,moCode){
                     marCode = code;
                     $("#marText").text("（"+code+"）");
-                    this.taskList = ServiceProduceTask.getEsopFileList(code);
+                    this.taskList = ServiceProduceTask.getEsopFileList(code,moCode);
+                    console.log(this.taskList)
                 },
                 loadData:function(){
                     // this.cacheDataObject = {};

pages/dashboard/warehouse.html

@@ -590,7 +590,7 @@
                     // ChartsService.initCommonBar("charts_22", ServiceProduct.getStockList());
                     this.loadData();
                     // 开启定时器
-                    this.timer_short = setInterval(this.scrollData, 5000);
+                    this.timer_short = setInterval(this.scrollData, 20000);
                 },
                 // 轮播数据
                 scrollData: function () {