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

pages/dashboard/produce.html

@@ -343,7 +343,7 @@
                 }
             },
             mounted() {
-                this.timer_long = setInterval(this.refreshData, 60000);
+                this.timer_long = setInterval(this.refreshData, 100000);
                 this.refreshData();
 
             },

pages/dashboard/quality.html

@@ -160,7 +160,7 @@
             <!-- <div class="col-md-1 col-lg-1 center block-title" style="padding-top: 80px">
                 质<br />量<br />异<br />常<br />信<br />息
             </div> -->
-            <d class="col-md-6 col-lg-6" style="margin-top:-30px ;">
+            <d class="col-md-6 col-lg-6" style="margin-top:-40px ;">
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">质量异常信息</div>
                 </div>
@@ -201,10 +201,10 @@
             </d>
             <div class="col-md-5 col-lg-5 center" style="margin-left: 50px;">
                 <div class="row">
-                    <div class="col-md-6 col-lg-6 center " style="padding-bottom: 5px;margin-top:12px;"
+                    <div class="col-md-6 col-lg-6 center " style="padding-bottom: 5px;margin-top:-10px;"
                         v-for="showimage in showImageList">
                         {{showimage }}
-                        <img :src="'/upAnomalous/'+showimage" border="0" style="width:350px;height:300px;"/>
+                        <img :src="'/upAnomalous/'+showimage" border="0" style="width:350px;height:290px;"/>
                     </div>
                 </div>
             </div>

pages/dashboard/video1.html

@@ -42,23 +42,38 @@
         <!-- <div class="col-lg-4 col-md-4">
         </div>-->
     <!-- </div>  -->
+
     <div class="my-container" id="div-main">
-        
+        <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> 
+                <img v-if="task.isImg" class="imgType" :src="'/upVedio/ABB/'+task.fileName" width="100%" /> 
+            </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>
+
+    <!-- <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" id="twoVideo" class="videoType" :src="'/upVedio/ABB/'+firstFile"  controls width="100%" height="100%" > </video> 
+                <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"  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.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" v-if="!task.isImg" id="oneVideo"  class="videoType" :src="'/upVedio/AAA/'+task.fileName"  controls width="100%" height="100%" > </video> 
+            <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>
+       </div>  
+    </div> -->
 
     <!-- jQuery  -->
     <script src="/lib/jquery.min.js"></script>

pages/dashboard/warehouse.html

@@ -126,20 +126,20 @@
                 </div>
                 <div class="row">
                     <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">物料编码</div>
-                    <div style="width: 45%;" class="col-lg-4 col-md-4 center no-padding">物料名称</div>
+                    <div style="width: 42%;" class="col-lg-4 col-md-4 center no-padding">物料名称</div>
                     <div style="width: 25%;" class="col-lg-2 col-md-2 center no-padding">现存量</div>
-                    <div style="width: 10%;" class="col-lg-2 col-md-2 center no-padding">安全库存</div>
+                    <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding">安全库存</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">总数量</div> -->
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height: 30%;min-height:140px;height:140px">
                         <div class="row" v-for="material in materialStockList">
                             <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div style="width: 45%;overflow:hidden; word-break:break-all;white-space:nowrap;padding-left: 40px;" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
+                            <div style="width: 42%;overflow:hidden; word-break:break-all;white-space:nowrap;padding-left: 40px;" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
                             <div style="width: 25%;" class="col-lg-2 col-md-2 center no-padding"
                                 :class="getMaterialStockNotEnoughClass(material)">
                                 {{material.realStockSum}}</div>
-                            <div style="width: 10%;" class="col-lg-2 col-md-2 center no-padding">{{material.safeStockSum}}</div>
+                            <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding">{{material.safeStockSum}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.realStockSum+material.safeStockSum}}</div> -->
                         </div>
                     </div>