1

pages/dashboard/esop.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=0.5">
     <!-- 一个小时刷新一下当前页 -->
     <meta http-equiv="refresh" content="3600">
-    <title>E-SOP看板</title>
+    <title>E-SOP</title>
 
     <link href="/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="/css/dashboard.css" rel="stylesheet" />

pages/dashboard/video1.html

@@ -22,13 +22,13 @@
             overflow-x: hidden;
         }
     </style>
-     <div class="row no-padding head-bar" style="height:81px">
-        <div class="col-lg-1 col-md-1">
+     <!-- <div class="row no-padding head-bar" style="height:81px"> -->
+        <!-- <div class="col-lg-1 col-md-1">
 
         </div> 
          <div class="col-lg-4 col-md-4 page-title">
             云看板
-        </div> 
+        </div>  -->
         <!-- <div class="col-lg-3 col-md-3 block-padding">
             <button type="button" class="btn btn-warning"
                 onclick="window.location.replace('/pages/dashboard/warehouse.html');">仓库看板</button>
@@ -41,21 +41,21 @@
         </div> -->
         <!-- <div class="col-lg-4 col-md-4">
         </div>-->
-    </div> 
+    <!-- </div>  -->
     <div class="my-container" id="div-main">
         
         <div id="two">
-            <div style="width: 49%;height: 100%;float:left;margin-right: 10px;">
+            <div style="width: 49%;height: 100%;float:left;margin-left: -20px;margin-right: 10px;">
                 <video 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 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="100%" /> 
+                <video 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="110%" /> 
             </div>
         </div>
         <div class="row" v-for="task in taskList" id="one"> 
-            <video v-if="!task.isImg" class="videoType" :src="'/upVedio/AAA/'+task.fileName"  controls width="100%" height="100%" > </video> 
+            <video 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="100%" />
        </div> 
     </div>
@@ -67,9 +67,10 @@
     <script src="/lib/echarts/theme/macarons.js"></script>
     <script src="/js/service/produce-task.js"></script>
     <script type="text/javascript">
-        $(".videoType").height($(window).height()-85);
-        $(".imgType").height($(window).height()-85);
-
+        // $(".videoType").height($(window).height()-85);
+        // $(".imgType").height($(window).height()-85);
+        $(".videoType").height($(window).height());
+        $(".imgType").height($(window).height());
         var vm = new Vue({
                     el: '#div-main',
                     data: {
@@ -84,10 +85,10 @@
                         // 从服务器加载数据并显示
                         refreshData: function () {
                             // 关闭定时器
-                            clearInterval(this.timer_short);
+                            // clearInterval(this.timer_short);
                             this.loadData();
                             // 开启定时器
-                            this.timer_short = setInterval(this.scrollData, 3000);
+                            this.timer_short = setTimeout(this.scrollData, 3000);
                         }, // 轮播数据
                         scrollData: function () {
                             for (var key in this.cacheDataObject) {
@@ -130,12 +131,14 @@
                             }else{
                                 $("#twoImg").hide();
                             }
+                            taskList.splice(0, 1);
                             this.cacheDataObject.taskList = {
                                 data: taskList,
                                 pagesize: 1,
                                 pageindex: 0
                             }
                             this.taskList = taskList.slice(0, this.cacheDataObject.taskList.pagesize);
+                            getVideo();
                         }
                     },
                     mounted() {
@@ -145,7 +148,7 @@
                     },
                     beforeDestroy() {
                         clearInterval(this.timer_long);
-                        clearInterval(this.timer_short);
+                        // clearInterval(this.timer_short);
                     }
                 })
 
@@ -167,13 +170,29 @@
             
         // })
        
-        // function getVideo(){
-        //     var _video = $('#videoType')[0];
-        //     if(_video.paused){
-        //         _video.play();
-        //         //_video.pause();//暂停
-        //     }
-        // }
+        function getVideo(){
+            var _video1 = $('#twoVideo')[0];
+            var _video2 = $('#twoVideo2')[0];
+            var _video3 = $('#oneVideo')[0];
+            
+            if($('#twoVideo').is(':hidden') && _video1.paused){
+            }else{
+                _video1.play();
+            }
+            if($('#twoVideo2').is(':hidden') && _video2.paused){
+            }else{
+                _video1.play();
+            }
+            if($('#oneVideo').is(':hidden') && _video3.paused){
+            }else{
+                _video1.play();
+            }
+            
+            // if(_video3.paused){
+            //     _video3.play();
+            //     //_video.pause();//暂停
+            // }
+        }
        
         
     </script>