Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-ui

src/views/board/foaming/index2.vue

@@ -7,7 +7,7 @@
 
     <div class="supplementInfo">注射压力标准范围：10.0-12.0Mpa A、B组份枪头压力差＜1Mpa</div>
     <div class="supplementInfo1">发泡料温度标准范围:18.0-24.0℃</div>
-    <div style="position: absolute;top: 62%; left: 16%;color:#FFF">正在生产： <div
+    <div style="position: absolute;top: 62%; left: 19%;color:#FFF">正在生产： <div
         style="width: 12px;height: 12px;background-color:  #5dfd36;display: inline-block;border-radius: 50%;">
       </div> 停机：<div
         style="width: 12px;height: 12px;background-color:  #ffffff88;display: inline-block;border-radius: 50%;"></div>
@@ -736,26 +736,26 @@
       <!--      </div>-->
     </div>
     <div class="tableOne">
-      <div style="height: 9%;color: #fff;text-align: center;background-color: #38a2de">
+      <div style="height: 9%;line-height:2.6vh;color: #fff;text-align: center;background-color: #38a2de">
         <div style="width: 33%;display: inline-block">台车号</div>
         <div style="width: 33%;display: inline-block">型号</div>
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
       <div v-for="i in 10"
-        :style="'height: 9%;color: #000;text-align: center;background-color:' + (i === 2 ? '#ffffff88' : '#5dfd36')">
+        :style="'height: 9%;line-height:2.6vh;color: #000;text-align: center;background-color:' + (i === 2 ? '#ffffff88' : '#5dfd36')">
         <div style="width: 33%;display: inline-block">{{ i }}</div>
         <div style="width: 33%;display: inline-block">487JFY</div>
         <div style="width: 33%;display: inline-block">15-15</div>
       </div>
     </div>
     <div class="tableTwo">
-      <div style="height: 9%;color: #fff;text-align: center;background-color: #38a2de">
+      <div style="height: 9%;line-height:2.6vh;color: #fff;text-align: center;background-color: #38a2de">
         <div style="width: 33%;display: inline-block">台车号</div>
         <div style="width: 33%;display: inline-block">型号</div>
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
       <div v-for="i in 10"
-        :style="'height: 9%;color: #000;text-align: center;background-color:' + (i === 2 ? '#ff0000' : '#5dfd36')">
+        :style="'height: 9%;line-height:2.6vh;color: #000;text-align: center;background-color:' + (i === 2 ? '#ff0000' : '#5dfd36')">
         <div style="width: 33%;display: inline-block">{{ i }}</div>
         <div style="width: 33%;display: inline-block">487JFY</div>
         <div style="width: 33%;display: inline-block">15-15</div>
@@ -1303,7 +1303,7 @@ export default {
 </script>
 <style scoped>
 .app-container {
-  background-image: url("../../../assets/board/foaming.jpg");
+  background-image: url("../../../assets/board/foaming1.jpg");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   width: 100%;