From d5e65bafff7cfe6d4c01abc6aacfd6dd2c9285f6 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 10:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
index 4df6e24..0f3114e 100644
--- a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
+++ b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
@@ -22,7 +22,7 @@
:infinite-scroll-disabled="busy"
infinite-scroll-immediate="true">>
<div class="item" v-for="(item,index) in tableList">
- <div class="left">
+ <div class="left" @click="taskClick(item)">
<div class="left-t">
<span>{{ index+1 }}.</span>{{ item.name }}
<span class="status" :class="item.status===2?'active':''">
@@ -51,16 +51,34 @@
</el-empty>
</div>
</div>
+ <!-- 当前任务详情 -->
+ <CurrentTaskDetails
+ v-if="isShowCurrentTaskDetails"
+ v-model:show="isShowCurrentTaskDetails"
+ :id="currentInfoId"/>
+ <!-- 历史任务详情 -->
+ <DeviceJobDetails
+ v-if="isShowDeviceJobDetails"
+ v-model:show="isShowDeviceJobDetails"
+ :wayLineJodInfoId="wayLineJodInfoId"/>
</template>
<script setup>
import { Search } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import CommonTitle from '@/components/CommonTitle.vue';
+import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue';
+import DeviceJobDetails from '@/components/DeviceJobDetails/DeviceJobDetails.vue'
import { getBeforeJob, getTodayJob, flyByJobId, returnHome } from '@/api/home';
import { useStore } from 'vuex';
const store = useStore();
+// 设备任务详情
+let currentInfoId = ref('');
+let isShowCurrentTaskDetails = ref(false);
+let wayLineJodInfoId = ref('');
+let isShowDeviceJobDetails = ref(false);
+
// 单个机巢信息
const singleUavHome = computed(() => store.state.home.singleUavHome);
@@ -166,6 +184,20 @@
});
};
+// 点击当前任务显示当前任务详情
+const taskClick = (item) => {
+ if (tabIndex.value === 1) {
+ // 展示当前任务详情
+ currentInfoId.value = item.wayline_job_info_id;
+ isShowCurrentTaskDetails.value = true;
+ } else {
+ // 展示历史任务详情
+ wayLineJodInfoId.value = item.wayline_job_info_id;
+ isShowDeviceJobDetails.value = true;
+ }
+
+};
+
onMounted(() => {
getJobList();
});
@@ -252,8 +284,9 @@
color: #fff;
display: flex;
justify-content: space-between;
-background: linear-gradient( 90deg, rgba(71,157,255,0) 0%, rgba(71, 157, 255, 0.12) 50%, rgba(71,157,255,0) 100%);
+ background: linear-gradient( 90deg, rgba(71,157,255,0) 0%, rgba(71, 157, 255, 0.12) 50%, rgba(71,157,255,0) 100%);
.left {
+ cursor: pointer;
.left-t {
height: 24px;
font-size: 16px;
--
Gitblit v1.9.3