From 503c45f8fd117ca58d56dcaceb44d8f95b3e2527 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 16 八月 2024 12:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreen/largescreen.vue | 340 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 216 insertions(+), 124 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index abbf44e..a58ecaa 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -25,26 +25,42 @@
</el-table-column>
</el-table>
</div> -->
-<div id="parent" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
- <img src="../../assets/dpxsa.png" alt="" style="margin-left: -10px; width: 100%;height: 100%;position: relative;">
- <div id="lipiana" v-show="woshia"></div>
- <div id="lipianb" v-show="woshia"></div>
- <div id="lipianc" v-show="woshic"></div>
- <div id="lipiand" v-show="woshic"></div>
- <div id="overlay" v-show="flake"></div>
- <div id="overlayb" v-show="flakeb"></div>
- <div id="overlayc" v-show="flakec"></div>
- <div id="overlayd" v-show="flaked"></div>
- <div id="longa" v-show="dalipiana"></div>
- <div id="longb" v-show="dalipianb"></div>
- <div id="shangpianji" v-show="shangpian"></div>
- <div id="xiapianji1" v-show="xiapian1"></div>
- <div id="xiapianji2" v-show="xiapian2"></div>
- <div id="xiapianji3" v-show="xiapian3"></div>
- <div id="xiapianji4" v-show="xiapian4"></div>
- <div id="xiapianji5" v-show="xiapian5"></div>
- <div id="xiapianji6" v-show="xiapian6"></div>
+<div class="parter" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
+ <img src="../../assets/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
+ <div class="moving-rect lipiana" v-show="woshia"></div>
+ <div class="moving-rect lipianb" v-show="woshia"></div>
+ <div class="moving-rect lipianc" v-show="woshic"></div>
+ <div class="moving-rect lipiand" v-show="woshic"></div>
+ <div class="moving-rect overlaya" v-show="flake"></div>
+ <div class="moving-rect overlayb" v-show="flakeb"></div>
+ <div class="moving-rect overlayc" v-show="flakec"></div>
+ <div class="moving-rect overlayd" v-show="flaked"></div>
+ <div class="moving-rect longa" v-show="dalipiana"></div>
+ <div class="moving-rect longb" v-show="dalipianb"></div>
+ <div class="moving-rect shangpianji" v-show="shangpian"></div>
+ <div class="moving-rect xiapianji" v-show="xiapian"></div>
+ <div class="moving-rect xiapianji1" v-show="xiapian1"></div>
+ <div class="moving-rect xiapianji2" v-show="xiapian2"></div>
+ <div class="moving-rect xiapianji3" v-show="xiapian3"></div>
+ <div class="moving-rect xiapianji4" v-show="xiapian4"></div>
+ <div class="moving-rect xiapianji5" v-show="xiapian5"></div>
+ <div class="moving-rect xiapianji6" v-show="xiapian6"></div>
</div>
+<!-- <div class="parter" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
+ <img src="../../assets/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
+ <div class="moving-rect vertical"></div>
+ <div class="moving-rect all"></div>
+ <div class="moving-rect horizontal"></div>
+ <div class="moving-rect xiao"></div>
+ <div class="moving-rect zhan"></div>
+ <div class="moving-rect tu"></div>
+ <div class="moving-rect zi"></div>
+ <div class="moving-rect xia"></div>
+ <div class="moving-rect zan"></div>
+ <div class="moving-rect fa"></div>
+ <div class="moving-rect hua"></div>
+ <div class="moving-rect shui"></div>
+</div> -->
<!-- <div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
<el-table height="240" ref="table" width="340px"
@selection-change="handleSelectionChange"
@@ -130,6 +146,7 @@
const dalipiana = ref(false)
const dalipianb = ref(false)
const shangpian = ref(false)
+const xiapian = ref(false)
const xiapian1 = ref(false)
const xiapian2 = ref(false)
const xiapian3 = ref(false)
@@ -251,6 +268,7 @@
const handleMessage6 = (data) => {
const tasks = data.downWorkstation[0];
if (tasks && tasks.length >= 6) {
+ xiapian.value = tasks.some(task => task.racksNumber!== 0);
xiapian1.value = tasks[0].racksNumber !== 0;
xiapian2.value = tasks[1].racksNumber !== 0;
xiapian3.value = tasks[2].racksNumber !== 0;
@@ -355,162 +373,236 @@
width: 100%;
height: 100%;
}
-#parent{
- position: relative;
+.parter {
+ position: relative;
+ display: inline-block; /* 浣垮鍣ㄥぇ灏忛�傚簲鍥剧墖澶у皬 */
width: 1500px;
margin-left: -300px
}
-#overlay{
- position: absolute;
- z-index: 1;
- width: 36px;
- height: 10px;
- background-color: #529b2e;
- margin-top: -34px;
- margin-left: -2px;
+img {
+ display: block; /* 璁╁浘鐗囦互鍧楃骇鍏冪礌鏄剧ず */
+ max-width: 100%; /* 纭繚鍥剧墖涓嶈秴鍑哄鍣� */
}
-#overlayb{
- position: absolute;
- z-index: 1;
- width: 17px;
- height: 115px;
- background-color: #529b2e;
- margin-top: -197px;
- margin-left:4px;
+.moving-rect {
+ width: 100px;
+ height: 50px;
+ position: absolute;
}
-#overlayc{
- position: absolute;
- z-index: 1;
- width: 16px;
- height: 16px;
- background-color: #529b2e;
- margin-top: -243px;
- margin-left: 5px;
-}
-#overlayd{
- position: absolute;
- z-index: 1;
- width: 37px;
- height: 10px;
- background-color: #529b2e;
- margin-top: -238px;
- margin-left: 70px;
-}
-#lipiana{
- position: absolute;
- z-index: 1;
- width: 100px;
- height: 10px;
- background-color: #529b2e;
- margin-top: -57px;
- margin-left: 365px;
-}
-#lipianb{
- position: absolute;
- z-index: 1;
- width: 20px;
- height: 10px;
- background-color: #529b2e;
- margin-top: -72px;
- margin-left: 492px;
-}
-#lipianc{
- position: absolute;
- z-index: 1;
- width: 100px;
- height: 10px;
- background-color: #529b2e;
- margin-top: -32px;
- margin-left: 410px;
-}
-#lipiand{
- position: absolute;
- z-index: 1;
- width: 30px;
- height: 10px;
- background-color: #529b2e;
- margin-top: -47px;
- margin-left: 539px;
-}
-#longa{
- position: absolute;
+.longa{
z-index: 1;
width: 33px;
height: 5px;
background-color: #529b2e;
- margin-top: -20px;
+ margin-top: -15px;
margin-left: 130px;
}
-#longb{
- position: absolute;
+.longb{
z-index: 1;
width: 33px;
height: 5px;
background-color: #529b2e;
- margin-top: -20px;
+ margin-top: -15px;
margin-left: 235px;
}
-#shangpianji{
- position: absolute;
- z-index: 1;
- width: 29px;
- height: 10px;
- background-color: #529b2e;
- margin-top: -90px;
- margin-left: 868px;
-}
-#xiapianji1{
- position: absolute;
+.xiapianji1{
z-index: 1;
width: 12px;
height: 7px;
background-color: #529b2e;
- margin-top: -213px;
+ margin-top: -206px;
margin-left: 173px;
}
-#xiapianji2{
- position: absolute;
+.xiapianji2{
z-index: 1;
width: 12px;
height: 7px;
background-color: #529b2e;
- margin-top: -213px;
+ margin-top: -206px;
margin-left: 217px;
}
-#xiapianji3{
- position: absolute;
+.xiapianji3{
z-index: 1;
width: 12px;
height: 7px;
background-color: #529b2e;
- margin-top: -202px;
+ margin-top: -195px;
margin-left: 196px;
}
-#xiapianji4{
- position: absolute;
+.xiapianji4{
z-index: 1;
width: 12px;
height: 7px;
background-color: #529b2e;
- margin-top: -213px;
+ margin-top: -206px;
margin-left: 270px;
}
-#xiapianji5{
- position: absolute;
+.xiapianji5{
z-index: 1;
width: 12px;
height: 7px;
background-color: #529b2e;
- margin-top: -213px;
+ margin-top: -206px;
margin-left: 314px;
}
-#xiapianji6{
- position: absolute;
+.xiapianji6{
z-index: 1;
width: 12px;
height: 7px;
background-color: #529b2e;
- margin-top: -202px;
+ margin-top: -195px;
margin-left: 293px;
}
+.xiapianji {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 9px;
+ left: 200px;
+ transform: translateX(-50%);
+ animation: move-xiapianji 6s infinite;
+}
+@keyframes move-xiapianji {
+ 0% {
+ left: 200px;
+ }
+ 100% {
+ left: calc(100% - 700px);
+ }
+}
+.lipiana {
+ width: 15px;
+ height: 9px;
+ background-color: #529b2e;
+ top: 190px;
+ right: 530px;
+ transform: translateX(-50%);
+ animation: move-lipiana 6s infinite;
+}
+@keyframes move-lipiana {
+ 0% {
+ right: 530px;
+ }
+ 100% {
+ right: calc(100% - 350px);
+ }
+}
+.lipianb {
+ width: 18px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 160px;
+ left: 502px;
+ transform: translateX(-50%);
+ animation: move-lipianb 6s infinite;
+}
+@keyframes move-lipianb {
+ 0% {
+ top: 160px;
+ }
+ 100% {
+ top: calc(100% - 55px);
+ }
+}
+.lipianc {
+ width: 15px;
+ height: 9px;
+ background-color: #529b2e;
+ top: 215px;
+ right: 490px;
+ transform: translateX(-50%);
+ animation: move-lipianc 6s infinite;
+}
+@keyframes move-lipianc {
+ 0% {
+ right: 490px;
+ }
+ 100% {
+ right: calc(100% - 350px);
+ }
+}
+.lipiand {
+ width: 25px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 160px;
+ left: 555px;
+ transform: translateX(-50%);
+ animation: move-lipiand 6s infinite;
+}
+@keyframes move-lipiand {
+ 0% {
+ top: 160px;
+ }
+ 100% {
+ top: calc(100% - 40px);
+ }
+}
+.overlaya {
+ width: 15px;
+ height: 9px;
+ background-color: #529b2e;
+ top: 213px;
+ right: 800px;
+ transform: translateX(-50%);
+ animation: move-overlaya 6s infinite;
+}
+@keyframes move-overlaya {
+ 0% {
+ right: 880px;
+ }
+ 100% {
+ right: calc(100% - 15px);
+ }
+}
+.overlayb {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 110px;
+ left: 13px;
+ transform: translateX(-50%);
+ animation: move-overlayb 6s infinite;
+}
+@keyframes move-overlayb {
+ 0% {
+ top: 160px;
+ }
+ 100% {
+ top: calc(100% - 190px);
+ }
+}
+.overlayc {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 7px;
+ left: 13px;
+ transform: translateX(-50%);
+ animation: move-overlayc 6s infinite;
+}
+@keyframes move-overlayc {
+ 0% {
+ left: 20px;
+ }
+ 100% {
+ left: calc(100% - 900px);
+ }
+}
+.shangpianji {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 157px;
+ right: 90px;
+ transform: translateX(-50%);
+ animation: move-shangpianji 6s infinite;
+}
+@keyframes move-shangpianji {
+ 0% {
+ right: 90px;
+ }
+ 100% {
+ right: calc(100% - 770px);
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0