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

src/views/board/caseShell/index2.vue

@@ -9,7 +9,7 @@
       :style="'top:' + (titlePosition[k] && titlePosition[k].top || 0) + '%;left:' + (titlePosition[k] && titlePosition[k].left || 0) + '%'">
       {{ i }}
     </div>
-    <div class="meter">平均节拍：{{ meter }}</div>
+    <div class="meter">平均节拍：{{ meter }} 秒/件</div>
 
     <div class="scrollTable">
       <div style="background-color: #094170">
@@ -95,11 +95,11 @@ export default {
       frontNum: 100,
       laterNum: 100,
       title: [
-        '生成计划',
+        '生产计划',
         '小时产量统计',
         '壳胆库存统计',
         '生产型号统计',
-        '发泡夹具状态',
+        '箱体发泡实时状态',
       ],
       titlePosition: [
         {

src/views/board/foaming/index.vue

@@ -4,6 +4,10 @@
     <div class="topNum planNum">{{ planNum }}</div>
     <div class="topNum practicalNum">{{ practicalNum }}</div>
     <div class="topNum differenceValue">{{ differenceValue }}</div>
+    <div class="title" v-for="(i,k) in title"
+         :style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
+      {{ i }}
+    </div>
 
     <div class="supplementInfo">注射压力标准范围：10.0-12.0Mpa A、B组份枪头压力差＜1Mpa</div>
     <div class="supplementInfo1">发泡料温度标准范围:18.0-24.0℃</div>
@@ -463,6 +467,40 @@ export default {
       planNum: 1000,
       practicalNum: 1000,
       differenceValue: 1000,
+      title: [
+        '生产计划',
+        '生产统计',
+        '生产统计数据',
+        '发泡注射压力监控',
+        '发泡料注料温度健康',
+        '泡前库库存',
+      ],
+      titlePosition: [
+        {
+          top: 11.5,
+          left: 5.5
+        },
+        {
+          top: 39.2,
+          left: 5.5
+        },
+        {
+          top: 62.8,
+          left: 5.5
+        },
+        {
+          top: 11.5,
+          left: 75
+        },
+        {
+          top: 39.3,
+          left: 75
+        },
+        {
+          top: 62.9,
+          left: 75
+        },
+      ],
       scrollTableOption: {
         step: 0.5, // 数值越大速度滚动越快
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
@@ -958,8 +996,15 @@ export default {
 };
 </script>
 <style scoped>
+.title {
+  position: absolute;
+  transform: translateY(-50%);
+  color: #dddddd;
+  font-size: 1vw;
+  letter-spacing: 2px;
+}
 .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%;

src/views/board/foaming/index2.vue

@@ -4,16 +4,23 @@
     <div class="topNum planNum">{{ planNum }}</div>
     <div class="topNum practicalNum">{{ practicalNum }}</div>
     <div class="topNum differenceValue">{{ differenceValue }}</div>
+    <div class="title" v-for="(i,k) in title"
+         :style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
+      {{ i }}
+    </div>
+    <div style="position: absolute; top: 23%;left: 60%;width:10vw;text-align:center;color: #fff;font-size: 1vw;line-height: 1.5vw">
+      <div>生产节拍</div>
+      <div>线体1圈 1s</div>
+      <div>台车1位 1s</div>
+    </div>
 
     <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: 19%;color:#FFF">正在生产： <div
+    <div style="position: absolute;top: 62%; left: 40%;color:#FFF">
-        style="width: 12px;height: 12px;background-color:  #5dfd36;display: inline-block;border-radius: 50%;">
+      <div style="width: 12px;height: 12px;background-color:  #5dfd36;display: inline-block;margin: 0 8px;"></div> 启用
-      </div> 停机：<div
+      <div style="width: 12px;height: 12px;background-color:  #ffffff88;display: inline-block;margin: 0 8px;"></div>停用
-        style="width: 12px;height: 12px;background-color:  #ffffff88;display: inline-block;border-radius: 50%;"></div>
+      <div style="width: 12px;height: 12px;background-color:  #ff0000;display: inline-block;margin: 0 8px;"></div> 注料位
-      注料位置台车：<div style="width: 12px;height: 12px;background-color:  #ff0000;display: inline-block;border-radius: 50%;">
+      <div style="width: 12px;height: 12px;background-color:  #FF8000;display: inline-block;margin: 0 8px;"></div>出模位
-      </div> 出模位置台车：<div
-        style="width: 12px;height: 12px;background-color:  #FF8000;display: inline-block;border-radius: 50%;"></div>
     </div>
 
     <div class="scrollTable">
@@ -804,6 +811,40 @@ export default {
   name: "Liner",
   data() {
     return {
+      title: [
+        '箱体队列',
+        '箱体队列统计',
+        '生产统计数据',
+        '发泡注射压力监控',
+        '发泡料注料温度健康',
+        '门体发泡生产统计',
+      ],
+      titlePosition: [
+        {
+          top: 11.5,
+          left: 5.5
+        },
+        {
+          top: 39.2,
+          left: 5.5
+        },
+        {
+          top: 62.8,
+          left: 5.5
+        },
+        {
+          top: 11.5,
+          left: 75
+        },
+        {
+          top: 39.3,
+          left: 75
+        },
+        {
+          top: 62.9,
+          left: 75
+        },
+      ],
       show: 0,
       planNum: 1000,
       practicalNum: 1000,
@@ -1484,4 +1525,11 @@ export default {
   width: 16.8%;
   height: 29%;
 }
+.title {
+  position: absolute;
+  transform: translateY(-50%);
+  color: #dddddd;
+  font-size: 1vw;
+  letter-spacing: 2px;
+}
 </style>

src/views/board/liner/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">内胆数据监控平台</div>
+    <div class="headTitle">内胆生产数据监控平台</div>
     <div class="topNum team">{{ team }}</div>
     <div class="topNum planNum">{{ planNum }}</div>
     <div class="topNum practicalNum">{{ practicalNum }}</div>
@@ -72,7 +72,7 @@
         </div>
       </vue-seamless-scroll>
     </div>
-    <div class="meter">平均节拍：{{meter}}</div>
+    <div class="meter">平均节拍：{{meter}} 秒/件</div>
     <div class="chart1">
       <Chart ref="chart1"></Chart>
     </div>
@@ -171,17 +171,6 @@ export default {
           top: 20,
           containLabel: true,
         },
-        legend: {
-          data: e.liner.ImportAndExportStatistics.y.map(val => val.name),
-          right: 'center',
-          top: 0,
-          textStyle: {
-            color: "#fff",
-          },
-          itemWidth: 12,
-          itemHeight: 10,
-          // itemGap: 35
-        },
         xAxis: {
           type: "category",
           data: e.liner.ImportAndExportStatistics.x,