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 | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 17 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 8e85b24..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>
@@ -112,7 +148,11 @@
</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>
@@ -139,7 +179,11 @@
</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>
@@ -164,7 +208,11 @@
</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>
@@ -195,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);
@@ -217,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(() => {
// 鐩戝惉绐楀彛澶у皬鍙樺寲
@@ -237,6 +316,7 @@
// 濡傛灉绐楀彛瀹藉害灏忎簬绛変簬1080px锛屾墽琛岀浉搴旂殑鎿嶄綔
isMobile.value = false;
}
+ getPosition();
});
</script>
<style lang="scss" scoped>
@@ -248,7 +328,7 @@
.button {
height: 7.83rem;
display: flex;
- justify-content: space-between;
+ justify-content: center;
.button_l {
display: flex;
.btnicon {
@@ -360,7 +440,9 @@
padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
@@ -505,7 +587,9 @@
padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
@@ -650,14 +734,14 @@
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;
@@ -790,10 +874,11 @@
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;
}
--
Gitblit v1.9.3