From 431d35f7daeb4c0554acdade7e07d651d92ef331 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 31 五月 2024 09:42:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Slicecage/slicecage.vue | 155 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 125 insertions(+), 30 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index c03bae9..22d0adc 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -3,24 +3,35 @@
import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
-
+
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { tr } from "element-plus/es/locale";
const dialogFormVisible = ref(false)
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
-
-const carposition1 = ref(40);
-const carposition2 = ref(200);
+
+const carposition1 = ref(60);
+const carposition2 = ref(220);
+const carposition3 = ref(60);
+const carposition4 = ref(260);
const timers1 =ref(true);
const timers2 =ref(true);
+const timers3 =ref(true);
+const timers4 =ref(true);
const cellshow=ref(false);
+const cellshow5=ref(false);
+const c1=ref(false);
+const c2=ref(false);
const cellshow1=ref(true);
const cellshow2=ref(true);
+const cellshow3=ref(true);
+const cellshow4=ref(true);
const million=ref(0);
const million1=ref(0);
-
+const million3=ref(0);
+const million4=ref(0);
+
const currentPage4 = ref(4)
const pageSize4 = ref(100)
const tableData = [
@@ -70,16 +81,16 @@
})
})
}
-
+
var timer=setInterval(() => {
console.log(million.value,million1.value);
million.value+=1;
if(million.value-million1.value!==12){
if(million.value-million1.value>=2){
- if(carposition1.value==200){
+ if(carposition1.value==220){
timers1.value=false;
- }else if(carposition1.value==40){
+ }else if(carposition1.value==60){
timers1.value=true;
}
if(timers1.value==true){
@@ -87,11 +98,11 @@
}else{
carposition1.value=carposition1.value-16;
}
-
+
- if(carposition2.value==200){
+ if(carposition2.value==220){
timers2.value=false;
- }else if(carposition2.value==40){
+ }else if(carposition2.value==60){
timers2.value=true;
}
if(timers2.value==true){
@@ -100,7 +111,7 @@
carposition2.value-=16;
}
}else{
-
+
}
}else{
million1.value=million.value;
@@ -124,8 +135,61 @@
}
}, 1000);
-
-
+
+ var timer=setInterval(() => {
+ console.log(million3.value,million4.value);
+ million3.value+=1;
+ if(million3.value-million4.value!==12){
+
+ if(million3.value-million4.value>=2){
+ if(carposition3.value==260){
+ timers3.value=false;
+ }else if(carposition3.value==60){
+ timers3.value=true;
+ }
+ if(timers3.value==true){
+ carposition3.value=carposition3.value+20;
+ }else{
+ carposition3.value=carposition3.value-20;
+ }
+
+
+ if(carposition4.value==260){
+ timers4.value=false;
+ }else if(carposition4.value==60){
+ timers4.value=true;
+ }
+ if(timers4.value==true){
+ carposition4.value+=20;
+ }else{
+ carposition4.value-=20;
+ }
+ }else{
+
+ }
+ }else{
+ million4.value=million3.value;
+ if(cellshow5.value==true){
+ cellshow5.value=false;
+
+ }else{
+ cellshow5.value=true;
+
+ }
+ if(cellshow3.value==true){
+ cellshow3.value=false;
+ }else{
+ cellshow3.value=true;
+ }
+ if(cellshow4.value==true){
+ cellshow4.value=false;
+ }else{
+ cellshow4.value=true;
+ }
+ }
+
+ }, 1000);
+
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -139,7 +203,7 @@
}
}
}
-
+
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -178,7 +242,7 @@
],
})
</script>
-
+
<template>
<div style="height: 700px;">
<!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisible = true">鎵嬪姩杩涚墖</el-button> -->
@@ -322,17 +386,24 @@
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
<div class="img-car1" :style="'z-index:999;left:247px;top:' + carposition1 + 'px;position:absolute;'">
- <div v-show="cellshow1" style="margin-top:10px;width:200px;height:5px;background-color:red;"></div>
+ <div v-show="cellshow1" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
+ </div>
+ <div v-show="c1" class="img-car2" :style="'z-index:999;left:704px;top:' + carposition2 + 'px;position:absolute;'">
+ <div v-show="cellshow2" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
</div>
- <div class="img-car2" :style="'z-index:999;left:704px;top:' + carposition2 + 'px;position:absolute;'">
- <div v-show="cellshow2" style="margin-top:10px;width:200px;height:5px;background-color:red;"></div>
+ <div v-show="c2" class="img-car3" :style="'z-index:999;left:247px;top:' + carposition3 + 'px;position:absolute;'">
+ <div v-show="cellshow3" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
</div>
- <div v-show="cellshow" style="width: 200px;height: 5px;position: absolute;top:60px;left: 490px;background-color: red;">
-
+ <div class="img-car4" :style="'z-index:999;left:704px;top:' + carposition4 + 'px;position:absolute;'">
+ <div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
+ </div>
+ <div v-show="cellshow" style="width: 200px;height: 5px;position: absolute;top:70px;left: 480px;background-color: #409EFF;">
+ </div>
+ <div v-show="cellshow5" style="width: 200px;height: 5px;position: absolute;top:70px;left: 480px;background-color: #409EFF;">
</div>
</div>
-
+
</div>
<el-dialog v-model="dialogFormVisible" top="12vh" width="85%" title="璇风‘璁ょ幓鐠冧俊鎭�" >
<div style="margin-left: 50px;margin-bottom: 10px;">
@@ -507,10 +578,10 @@
<el-table-column prop="type" align="center" label="鎿嶄綔" min-width="120" />
</el-table>
</el-dialog>
-
+
</template>
<style scoped>
-
+
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -558,7 +629,7 @@
width: 0 !important;height: 0;
}
.img-list{
-
+
position:relative;
}
.data-img{
@@ -569,7 +640,7 @@
background: rgba(0, 0, 0, 0);
opacity: 1;
border-radius: 0.5rem 0.5rem 0px 0px;
-
+
}
.check-img{
position: absolute;
@@ -598,7 +669,7 @@
transform: translateX(-50%);
animation: move-vertical 6s infinite; /* 浠庝笂鍒颁笅鍔ㄧ敾锛屾寔缁�6绉掞紝鏃犻檺寰幆 */
}
-
+
@keyframes move-vertical {
0% {
top: 485px; /* 璧峰浣嶇疆 */
@@ -607,7 +678,7 @@
top: calc(100% - 210px); /* 浠庝笂鍒颁笅缁撴潫浣嶇疆 */
}
}
-
+
.img-dlpl{
margin-left: 200px;
background-image:url('../../assets/dlpl.png');
@@ -621,7 +692,7 @@
position:relative
}
.img-car1{
- background-image:url('../../assets/lpl.jpg');
+ background-image:url('../../assets/lp.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -633,7 +704,31 @@
position:relative
}
.img-car2{
- background-image:url('../../assets/lpla.jpg');
+ background-image:url('../../assets/lpa.png');
+ position: absolute;
+ background-repeat: no-repeat;
+ background-attachment: local;
+ min-height: 200px;
+ width: 200px;
+ max-width: 100%;
+ background-size: 200px 70px;
+ overflow: hidden;
+ position:relative
+}
+.img-car3{
+ background-image:url('../../assets/lp.png');
+ position: absolute;
+ background-repeat: no-repeat;
+ background-attachment: local;
+ min-height: 200px;
+ width: 200px;
+ max-width: 100%;
+ background-size: 200px 70px;
+ overflow: hidden;
+ position:relative
+}
+.img-car4{
+ background-image:url('../../assets/lpa.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
--
Gitblit v1.8.0