diff --git a/src/assets/board/boardBg3-3.jpg b/src/assets/board/boardBg3-3.jpg new file mode 100644 index 0000000..5ed8ada Binary files /dev/null and b/src/assets/board/boardBg3-3.jpg differ diff --git a/src/assets/board/boardBg3.jpg b/src/assets/board/boardBg3.jpg index 5ed8ada..ee56d83 100644 Binary files a/src/assets/board/boardBg3.jpg and b/src/assets/board/boardBg3.jpg differ diff --git a/src/assets/board/cardBg1.png b/src/assets/board/cardBg1.png new file mode 100644 index 0000000..4d0ed0e Binary files /dev/null and b/src/assets/board/cardBg1.png differ diff --git a/src/assets/board/cardBg2.png b/src/assets/board/cardBg2.png new file mode 100644 index 0000000..8fcc086 Binary files /dev/null and b/src/assets/board/cardBg2.png differ diff --git a/src/assets/board/cardBg3.png b/src/assets/board/cardBg3.png new file mode 100644 index 0000000..16a46aa Binary files /dev/null and b/src/assets/board/cardBg3.png differ diff --git a/src/assets/board/cardBg4.png b/src/assets/board/cardBg4.png new file mode 100644 index 0000000..248234d Binary files /dev/null and b/src/assets/board/cardBg4.png differ diff --git a/src/assets/board/cardBg5.png b/src/assets/board/cardBg5.png new file mode 100644 index 0000000..15df5d1 Binary files /dev/null and b/src/assets/board/cardBg5.png differ diff --git a/src/views/board/board1/index.vue b/src/views/board/board1/index.vue index ad01888..d8a6030 100644 --- a/src/views/board/board1/index.vue +++ b/src/views/board/board1/index.vue @@ -31,7 +31,7 @@
- 停机 + 暂停 {{ runningData.STOPPEDCOUNT }} @@ -49,7 +49,7 @@
- 未开机 + 停机 {{ Math.max((runningData.NOTSTARTEDCOUNT || 0) - runNum, 0) }} @@ -559,7 +559,9 @@ export default { color: #DCDFDF; .text { - letter-spacing: 1vw; + width: 5vw; + letter-spacing: 2vw; + //letter-spacing: 1vw; } } diff --git a/src/views/board/board4/index.vue b/src/views/board/board4/index.vue index 40cb41a..a0d17fa 100644 --- a/src/views/board/board4/index.vue +++ b/src/views/board/board4/index.vue @@ -18,17 +18,24 @@
日累计产量
月累计产量
年累计产量
+
+
+
+
正常: {{ form.isSimulate ? form.text8 : Math.min((runningData.RUNNINGCOUNT || 0) + 5, (runningData.TOTALCOUNT || 0)) }}
-
停机: {{ +
暂停: {{ form.isSimulate ? form.text10 : runningData.STOPPEDCOUNT }}
-
报警: {{ form.isSimulate ? form.text9 : runningData.ALARMCOUNT }} +
报警: {{ form.isSimulate ? form.text9 : runningData.ALARMCOUNT }} +
+
停机: {{ form.isSimulate ? form.text9 : runningData.NOTSTARTEDCOUNT }}
{{ (form.isSimulate ? form.text5 : productionTotalData.dayTotal) || '00000' }} @@ -1350,6 +1357,50 @@ export default { } } +.bg1{ + position: absolute; + top: 16.4%; + left: 74%; + width: 5%; + height: 5.7%; + background-image: url("~@/assets/board/cardBg1.png"); + background-size: 100% 100%; + background-repeat: no-repeat; +} + + +.bg2{ + position: absolute; + top: 16.4%; + left: 79.5%; + width: 5%; + height: 5.7%; + background-image: url("~@/assets/board/cardBg5.png"); + background-size: 100% 100%; + background-repeat: no-repeat; +} + +.bg3{ + position: absolute; + top: 16.4%; + left: 85%; + width: 5%; + height: 5.7%; + background-image: url("~@/assets/board/cardBg2.png"); + background-size: 100% 100%; + background-repeat: no-repeat; +} + +.bg4{ + position: absolute; + top: 16.4%; + left: 90.5%; + width: 5%; + height: 5.7%; + background-image: url("~@/assets/board/cardBg4.png"); + background-size: 100% 100%; + background-repeat: no-repeat; +} .chart1 { position: absolute; top: 66%;