From 52756e8a22ff5d3c5e9cf90dfa5b87742c60350d Mon Sep 17 00:00:00 2001
From: 艺术家 <10819716+q100102@user.noreply.gitee.com>
Date: 星期四, 22 五月 2025 16:24:23 +0800
Subject: [PATCH] 功能优化
---
项目代码/伸缩杆/client/src/views/tts/PickAndDrop/PickAndDrop.vue | 218 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 187 insertions(+), 31 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue"
index 213802d..394ef4c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue"
@@ -1,7 +1,7 @@
<template>
<div class="PickAndDrop">
<div class="button">
- <div class="button_l">
+ <!-- <div class="button_l">
<el-button
@click="handleAutoPickAndDrop('浼稿嚭')"
type="primary"
@@ -32,7 +32,7 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">浼稿嚭</span>
+ <span style="font-size: 2.25rem; text-align: center">瀹氫綅浼告寜閽�</span>
</el-button>
<el-button
@click="handleAutoPickAndDrop('缂╁洖')"
@@ -64,9 +64,41 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">缂╁洖</span>
+ <span style="font-size: 2.25rem; text-align: center">瀹氫綅缂╂寜閽�</span>
</el-button>
- </div>
+ <el-button
+ @click="handlePouse"
+ type="primary"
+ size="small"
+ style="
+ width: 14.69rem;
+ height: 5.06rem;
+ color: rgba(64, 253, 240, 1);
+ background-color: rgba(6, 229, 231, 0.3);
+ border: none;
+ border-top: 0.25rem solid rgba(6, 229, 231, 1);
+ "
+ >
+ <div class="btnicon">
+ <span
+ style="
+ width: 1rem;
+ height: 1rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50% 50%;
+ border: 0.1rem solid rgb(0, 0, 0);
+ color: rgb(0, 0, 0);
+ font-size: 0.75rem;
+ margin-left: 0.1rem;
+ "
+ >i</span
+ >
+ </div>
+ <span style="font-size: 2.25rem; text-align: center">鏆傚仠</span>
+ </el-button>
+ </div> -->
<div class="button_r">
<el-button
@click="jumpRouter('/Manualcontrol')"
@@ -87,7 +119,11 @@
</div>
<div v-if="isMobile" class="content">
<div class="content_l">
- <div class="model">宸︿晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -102,9 +138,21 @@
</div>
</div>
</div>
+ <div style="display: flex; flex-direction: column; align-items: center">
+ <div class="video_l">
+ <span style="color: #fff; font-size: 1.25rem; font-weight: bold"
+ >瑙嗛鐩戞帶宸︿晶</span
+ >
+ <img src="@/assets/imgs/right.png" alt="" />
+ </div>
+ </div>
</div>
<div class="content_r">
- <div class="model">鍙充晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -117,13 +165,25 @@
<div class="pulse2"></div>
<div class="pulse3"></div>
</div>
+ </div>
+ </div>
+ <div style="display: flex; flex-direction: column; align-items: center">
+ <div class="video_r">
+ <span style="color: #fff; font-size: 1.25rem; font-weight: bold"
+ >瑙嗛鐩戞帶鍙充晶</span
+ >
+ <img src="@/assets/imgs/left.png" alt="" />
</div>
</div>
</div>
</div>
<div v-else class="content_mobile">
<div class="content_l">
- <div class="model">宸︿晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.left }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -138,9 +198,21 @@
</div>
</div>
</div>
+ <div style="display: flex; flex-direction: column; align-items: center">
+ <div class="video_l">
+ <span style="color: #fff; font-size: 2.5rem; font-weight: bold"
+ >瑙嗛鐩戞帶宸︿晶</span
+ >
+ <img src="@/assets/imgs/right.png" alt="" />
+ </div>
+ </div>
</div>
<div class="content_r">
- <div class="model">鍙充晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -153,6 +225,14 @@
<div class="pulse2"></div>
<div class="pulse3"></div>
</div>
+ </div>
+ </div>
+ <div style="display: flex; flex-direction: column; align-items: center">
+ <div class="video_r">
+ <span style="color: #fff; font-size: 2.5rem; font-weight: bold"
+ >瑙嗛鐩戞帶鍙充晶</span
+ >
+ <img src="@/assets/imgs/left.png" alt="" />
</div>
</div>
</div>
@@ -163,10 +243,18 @@
import { ref, onMounted, nextTick } from "vue";
import { useRouter } from "vue-router";
import { ElMessage } from "element-plus";
-import { AutoPickAndDrop } from "@/api/newapi/Parameters.js";
+import {
+ AutoPickAndDrop,
+ Pouse,
+ GetPosition,
+} from "@/api/newapi/Parameters.js";
const router = useRouter();
const isMobile = ref(false);
+const Position = ref({
+ left: 0,
+ right: 0,
+});
const jumpRouter = (path) => {
router.push(path);
@@ -185,6 +273,29 @@
console.error(error);
ElMessage.error("鎿嶄綔澶辫触");
}
+};
+const handlePouse = async () => {
+ try {
+ const response = await Pouse();
+ if (response.code === 0) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ console.error(error);
+ ElMessage.error(error);
+ }
+};
+
+//鑾峰彇褰撳墠浣嶇疆
+const getPosition = () => {
+ GetPosition().then((res) => {
+ if (res.code == 0) {
+ Position.value.left = res.data.lift;
+ Position.value.right = res.data.right;
+ }
+ });
};
onMounted(() => {
// 鐩戝惉绐楀彛澶у皬鍙樺寲
@@ -205,6 +316,7 @@
// 濡傛灉绐楀彛瀹藉害灏忎簬绛変簬1080px锛屾墽琛岀浉搴旂殑鎿嶄綔
isMobile.value = false;
}
+ getPosition();
});
</script>
<style lang="scss" scoped>
@@ -216,11 +328,9 @@
.button {
height: 7.83rem;
display: flex;
- justify-content: space-between;
-
+ justify-content: center;
.button_l {
display: flex;
-
.btnicon {
display: flex;
justify-content: center;
@@ -319,6 +429,7 @@
.content_l {
display: flex;
+ flex-direction: column;
justify-content: space-between;
width: 50%;
height: 45rem;
@@ -326,10 +437,12 @@
color: rgba(16, 16, 16, 1);
box-shadow: 0rem 0.13rem 0.38rem 0rem rgba(6, 229, 231, 1);
border: 0.06rem solid rgba(6, 229, 231, 1);
-
+ padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
@@ -337,14 +450,15 @@
.operate {
display: flex;
flex-direction: column;
- padding: 0.88rem 0.88rem;
+ align-items: flex-end;
+ padding: 0.58rem 0.58rem;
.item {
display: flex;
flex-direction: column;
justify-content: center;
width: 8.75rem;
- height: 4.19rem;
+ height: 3.19rem;
border-radius: 0.31rem;
background: linear-gradient(
90deg,
@@ -446,10 +560,22 @@
}
}
}
+ .video_l {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 80%;
+ border: 0.25rem solid rgba(255, 255, 255, 0.8);
+ img {
+ width: 6rem;
+ height: 8rem;
+ }
+ }
}
.content_r {
display: flex;
+ flex-direction: column;
justify-content: space-between;
width: 50%;
height: 45rem;
@@ -458,10 +584,12 @@
box-shadow: 0rem 0.13rem 0.38rem 0rem rgba(6, 229, 231, 1);
border: 0.06rem solid rgba(6, 229, 231, 1);
margin-left: 2rem;
-
+ padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
@@ -469,14 +597,14 @@
.operate {
display: flex;
flex-direction: column;
- padding: 0.88rem 0.88rem;
-
+ align-items: flex-end;
+ padding: 0.58rem 0.58rem;
.item {
display: flex;
flex-direction: column;
justify-content: center;
width: 8.75rem;
- height: 4.19rem;
+ height: 3.19rem;
border-radius: 0.31rem;
background: linear-gradient(
90deg,
@@ -576,6 +704,17 @@
height: 4.375rem;
opacity: 0;
}
+ }
+ }
+ .video_r {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 80%;
+ border: 0.25rem solid rgba(255, 255, 255, 0.8);
+ img {
+ width: 6rem;
+ height: 8rem;
}
}
}
@@ -588,25 +727,26 @@
.content_l {
display: flex;
justify-content: space-between;
+ flex-direction: column;
width: 100%;
- height: 45rem;
background-color: rgba(9, 48, 104, 1);
color: rgba(16, 16, 16, 1);
box-shadow: 0rem 0.13rem 0.38rem 0rem rgba(6, 229, 231, 1);
border: 0.06rem solid rgba(6, 229, 231, 1);
-
+ padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
-
.operate {
display: flex;
flex-direction: column;
+ align-items: flex-end;
padding: 0.88rem 0.88rem;
-
.item {
display: flex;
flex-direction: column;
@@ -713,23 +853,32 @@
opacity: 0;
}
}
+ }
+ .video_l {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 70rem;
+ border: 0.75rem solid rgba(255, 255, 255, 0.8);
}
}
.content_r {
display: flex;
- justify-content: space-between;
+ flex-direction: column;
+ justify-content: space-around;
width: 100%;
- height: 45rem;
background-color: rgba(9, 48, 104, 1);
color: rgba(16, 16, 16, 1);
box-shadow: 0rem 0.13rem 0.38rem 0rem rgba(6, 229, 231, 1);
border: 0.06rem solid rgba(6, 229, 231, 1);
margin-top: 10%;
-
+ padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
@@ -737,8 +886,8 @@
.operate {
display: flex;
flex-direction: column;
+ align-items: flex-end;
padding: 0.88rem 0.88rem;
-
.item {
display: flex;
flex-direction: column;
@@ -846,6 +995,13 @@
}
}
}
+ .video_r {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 70rem;
+ border: 0.75rem solid rgba(255, 255, 255, 0.8);
+ }
}
}
}
--
Gitblit v1.9.3