From 2ddedb48ebcb4952e57aefe2fa0b2ba8094ea4c0 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 17 Apr 2025 13:52:04 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
index 2c44b48..14b2c12 100644
--- a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
+++ b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
@@ -34,11 +34,11 @@
<img src="../../../assets/images/signMachineNest/machineRight/name.png" alt="" />{{ item.creator_name || '' }}
</div>
</div>
- <div class="right" v-if="tabIndex===1" @click="returnImmediately(item.id)">
+ <div class="right" v-if="tabIndex===1" @click="reExecute(item.dock_sn)">
<span>立即返航</span>
<img src="../../../assets/images/signMachineNest/machineRight/return-fly.png" alt="">
</div>
- <div class="right" v-else @click="reExecute(item.dock_sn)">
+ <div class="right" v-else @click="returnImmediately(item.job_id)">
<span>再次执行</span>
<img src="../../../assets/images/signMachineNest/machineRight/return-fly.png" alt="">
</div>
@@ -55,6 +55,7 @@
<script setup>
import { Search } from '@element-plus/icons-vue';
+import { ElMessage } from 'element-plus';
import CommonTitle from '@/components/CommonTitle.vue';
import { getBeforeJob, getTodayJob, flyByJobId, returnHome } from '@/api/home';
import { useStore } from 'vuex';
@@ -148,7 +149,7 @@
const returnImmediately = (id) => {
flyByJobId(id).then(result => {
if (result.data.code === 0) {
- ElMessage.success('返航成功');
+ ElMessage.success('执行成功');
} else {
ElMessage.error(result.data.message);
}
@@ -158,7 +159,7 @@
const reExecute = (dock_sn) => {
returnHome(dock_sn).then(result => {
if (result.data.code === 0) {
- ElMessage.success('执行成功');
+ ElMessage.success('返航成功');
} else {
ElMessage.error(result.data.message);
}
--
Gitblit v1.9.3