From f260ee9c8d023c28f6915eb62c4d74d7f05e7d9d Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 11 Apr 2025 16:18:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
index def807b..2c44b48 100644
--- a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
+++ b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
@@ -34,8 +34,13 @@
<img src="../../../assets/images/signMachineNest/machineRight/name.png" alt="" />{{ item.creator_name || '' }}
</div>
</div>
- <div class="right">
- <img src="../../../assets/images/signMachineNest/machineRight/return.png" alt="">
+ <div class="right" v-if="tabIndex===1" @click="returnImmediately(item.id)">
+ <span>立即返航</span>
+ <img src="../../../assets/images/signMachineNest/machineRight/return-fly.png" alt="">
+ </div>
+ <div class="right" v-else @click="reExecute(item.dock_sn)">
+ <span>再次执行</span>
+ <img src="../../../assets/images/signMachineNest/machineRight/return-fly.png" alt="">
</div>
</div>
</div>
@@ -51,7 +56,12 @@
<script setup>
import { Search } from '@element-plus/icons-vue';
import CommonTitle from '@/components/CommonTitle.vue';
-import { getBeforeJob, getTodayJob } from '@/api/home'
+import { getBeforeJob, getTodayJob, flyByJobId, returnHome } from '@/api/home';
+import { useStore } from 'vuex';
+
+const store = useStore();
+// 单个机巢信息
+const singleUavHome = computed(() => store.state.home.singleUavHome);
const isMore = ref(true);
// 控制加载状态
@@ -96,7 +106,7 @@
const getJobList = async () => {
const params = {
area_code: '',
- device_sn: '',
+ device_sn: singleUavHome.value.device_sn,
job_name: searchText.value,
current: pageParams.value.current,
size: pageParams.value.size,
@@ -132,6 +142,27 @@
// 搜索数据
const searchNickName = () => {
clearData();
+};
+
+// 立即返航
+const returnImmediately = (id) => {
+ flyByJobId(id).then(result => {
+ if (result.data.code === 0) {
+ ElMessage.success('返航成功');
+ } else {
+ ElMessage.error(result.data.message);
+ }
+ });
+};
+// 重新执行
+const reExecute = (dock_sn) => {
+ returnHome(dock_sn).then(result => {
+ if (result.data.code === 0) {
+ ElMessage.success('执行成功');
+ } else {
+ ElMessage.error(result.data.message);
+ }
+ });
};
onMounted(() => {
@@ -256,6 +287,19 @@
}
}
.right {
+ cursor: pointer;
+ position: relative;
+ span {
+ position: absolute;
+ display: inline-block;
+ top: 12px;
+ left: 12px;
+ width: 26px;
+ line-height: 12px;
+ font-size: 12px;
+ font-family: YouSheBiaoTiHei, YouSheBiaoTiHei, serif;
+ color: rgb(4,18,44)
+ }
img {
width: 46px;
height: 46px
--
Gitblit v1.9.3