1

pages/dashboard/video1.html

@@ -47,36 +47,25 @@
         <div id="two">
             
             <div style="width: 50%;height: 100%;float:left;margin-left: -25px;margin-right: 5px;" v-for="task in taskList">
-                <video autoplay="true" loop="true" muted="muted" id="twoVideo2"  v-if="!task.isImg" class="videoType" :src="'/upVedio/ABB/'+task.fileName"  controls width="100%" height="100%" > </video> 
+                <video autoplay="true" loop="true" muted="muted" id="twoVideo2"  v-if="task.isVideo" class="videoType" :src="'/upVedio/ABB/'+task.fileName"  controls width="100%" height="100%" > </video> 
                 <img v-if="task.isImg" class="imgType" :src="'/upVedio/ABB/'+task.fileName" width="100%" /> 
+                <iframe v-if="task.isPdf" class="pdfType" width="100%" border="0" frameborder="0" v-bind:src="'/lib/pdfjs/web/viewer.html?file=/upVedio/ABB/'+task.fileName" style="background-color:#ffffff"></iframe>
+
             </div>
             <div style="width: 49%;height: 100%;float:left;">
                 <video autoplay="true" loop="true" muted="muted" id="twoVideo" class="videoType" :src="'/upVedio/ABB/'+firstFile"  controls width="106%" height="100%" > </video> 
                 <img id="twoImg" class="imgType" :src="'/upVedio/ABB/'+firstFile" width="100%" />
-            </div>
-        </div>
-        <div class="row" v-for="task in taskList" id="one" style="margin-left: -25px"> 
-            <video autoplay="true" loop="true" muted="muted" v-if="!task.isImg" id="oneVideo"  class="videoType" :src="'/upVedio/AAA/'+task.fileName"  controls width="100%" height="100%" > </video> 
-            <img v-if="task.isImg" class="imgType" :src="'/upVedio/AAA/'+task.fileName" width="101%" />
-       </div>  
-    </div>
+                <iframe class="pdfType" id="twoPdf"  width="100%" border="0" frameborder="0" v-bind:src="'/lib/pdfjs/web/viewer.html?file=/upVedio/ABB/'+firstFile" style="background-color:#ffffff"></iframe>
 
-    <!-- <div class="my-container" id="div-main">
-        <div id="two">
-            <div style="width: 49%;height: 100%;float:left;margin-left: -20px;margin-right: 10px;">
-                <video autoplay="true" loop="true" muted="muted" id="twoVideo" class="videoType" :src="'/upVedio/ABB/'+firstFile"  controls width="100%" height="100%" > </video> 
-                <img id="twoImg" class="imgType" :src="'/upVedio/ABB/'+firstFile" width="100%" />
-            </div>
-            <div style="width: 50%;height: 100%;float:left;" v-for="task in taskList">
-                <video autoplay="true" loop="true" muted="muted" id="twoVideo2"  v-if="!task.isImg" class="videoType" :src="'/upVedio/ABB/'+task.fileName"  controls width="100%" height="100%" > </video> 
-                <img v-if="task.isImg" class="imgType" :src="'/upVedio/ABB/'+task.fileName" width="106%" /> 
             </div>
         </div>
         <div class="row" v-for="task in taskList" id="one" style="margin-left: -25px"> 
-            <video autoplay="true" loop="true" muted="muted" v-if="!task.isImg" id="oneVideo"  class="videoType" :src="'/upVedio/AAA/'+task.fileName"  controls width="100%" height="100%" > </video> 
+            <video v-if="task.isVideo" autoplay="true" loop="true" muted="muted" id="oneVideo"  class="videoType" :src="'/upVedio/AAA/'+task.fileName"  controls width="100%" height="100%" > </video> 
             <img v-if="task.isImg" class="imgType" :src="'/upVedio/AAA/'+task.fileName" width="101%" />
+            <iframe v-if="task.isPdf" class="pdfType" width="100%" border="0" frameborder="0" v-bind:src="'/lib/pdfjs/web/viewer.html?file=/upVedio/AAA/'+task.fileName" style="background-color:#ffffff"></iframe>
+
        </div>  
-    </div> -->
+    </div>
 
     <!-- jQuery  -->
     <script src="/lib/jquery.min.js"></script>
@@ -90,6 +79,7 @@
         // $(".imgType").height($(window).height()-85);
         $(".videoType").height($(window).height());
         $(".imgType").height($(window).height());
+        $(".pdfType").height($(window).height());
         var vm = new Vue({
                     el: '#div-main',
                     data: {
@@ -100,38 +90,37 @@
                         pageIndex: 0,
                         timer: '',
                         upVideo:'',
-                        firstFile:'',
-                        timer_long: '', // 定时取服务器数据
+                        firstFile:''
                     },
                     methods: {
-                        // 从服务器加载数据并显示
-                        refreshData: function () {
-                            // 刷新报表
-                            this.listInit=ServiceProduceTask.getVedioFileList();
-                            // alert(1)
-                            this.get();
-                            this.get2();
-                            // this.getVideo();
-                            console.log(ServiceProduceTask.getVedioFileList())
-                        },
+                        
                         get() {
                             this.upVideo = this.listInit[0].upVideo;
                             
                             this.firstFile = this.listInit[0].fileName;
                             if(this.listInit[0].isImg){
                                 $("#twoVideo").hide();
+                                $("#twoPdf").hide();
+                            }else if(this.listInit[0].isVideo){
+                                $("#twoImg").hide();
+                                $("#twoPdf").hide();
                             }else{
+                                $("#twoVideo").hide();
                                 $("#twoImg").hide();
                             }
                             if(this.upVideo == 'AAA'){
                                $("#two").hide();
                             }else{
                                $("#one").hide();
-                               this.listInit.splice(0, 1);
+                            //    this.listInit.splice(0, 1);
                             }
                             
                         },
                         get2(){
+                            this.listInit=ServiceProduceTask.getVedioFileList();
+                            if(this.upVideo != 'AAA'){
+                                this.listInit.splice(0, 1);
+                            }
                             this.taskList = this.listInit.slice(this.pageIndex,this.pageSize);
                             if(this.pageSize >= this.listInit.length){
                                 this.pageIndex = 0;
@@ -166,12 +155,10 @@
                         this.get();
                         this.get2();
                         this.timer = setInterval(this.get2, 7000);
-                        this.timer_long = setInterval(this.refreshData, 6000);
-                        this.refreshData();
+                        
                     },
                     beforeDestroy() {
                         clearInterval(this.timer);
-                        clearInterval(this.timer_long);
                     }
                 })