From 80a8ec1cad76dc707ed2b6fc6d57e117b5f78bad Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 19 Apr 2025 09:54:38 +0800
Subject: [PATCH] feat:更新当前任务详情和历史详情
---
src/assets/images/home/useUavHome/eventAggregationImg.png | 0
src/assets/images/home/useUavHome/Group_1321315503.svg | 99 +++++++++++++++++++++++++++++++++
src/assets/images/home/useUavHome/eventAggregationImg1 (3).png | 0
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 37 +++++++++++
src/components/CurrentTaskDetails/TaskDetailsLeft.vue | 2
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 2
6 files changed, 136 insertions(+), 4 deletions(-)
diff --git a/src/assets/images/home/useUavHome/Group_1321315503.svg b/src/assets/images/home/useUavHome/Group_1321315503.svg
new file mode 100644
index 0000000..2ed5523
--- /dev/null
+++ b/src/assets/images/home/useUavHome/Group_1321315503.svg
@@ -0,0 +1,99 @@
+<svg width="65" height="51" viewBox="0 0 65 51" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315504">
+<g id="Vector">
+<path d="M46.1734 14.1245L35.6399 9.31365L40.1213 1.70947L50.6548 6.52028L46.1734 14.1245Z" fill="#DBA237"/>
+<path d="M46.1734 14.1245L35.6399 9.31365L40.1213 1.70947L50.6548 6.52028L46.1734 14.1245Z" fill="url(#paint0_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M46.1734 14.1245L35.6399 9.31365L40.1213 1.70947L50.6548 6.52028L46.1734 14.1245Z" fill="url(#paint1_linear_167_1217)" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_2">
+<path d="M50.6544 6.52037L40.1209 1.70957L53.7036 0.118896L64.2371 4.9297L50.6544 6.52037Z" fill="#B98B35"/>
+<path d="M50.6544 6.52037L40.1209 1.70957L53.7036 0.118896L64.2371 4.9297L50.6544 6.52037Z" fill="url(#paint2_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M50.6544 6.52037L40.1209 1.70957L53.7036 0.118896L64.2371 4.9297L50.6544 6.52037Z" fill="url(#paint3_linear_167_1217)" fill-opacity="0.5" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_3">
+<path d="M28.6635 16.2193L18.13 11.4085L35.6397 9.31348L46.1732 14.1243L28.6635 16.2193Z" fill="#B98B35"/>
+<path d="M28.6635 16.2193L18.13 11.4085L35.6397 9.31348L46.1732 14.1243L28.6635 16.2193Z" fill="url(#paint4_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M28.6635 16.2193L18.13 11.4085L35.6397 9.31348L46.1732 14.1243L28.6635 16.2193Z" fill="url(#paint5_linear_167_1217)" fill-opacity="0.5" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_4">
+<path d="M10.6457 11.2535L0.112183 6.44272L13.6949 4.85205L24.2284 9.66286L10.6457 11.2535Z" fill="#B98B35"/>
+<path d="M10.6457 11.2535L0.112183 6.44272L13.6949 4.85205L24.2284 9.66286L10.6457 11.2535Z" fill="url(#paint6_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M10.6457 11.2535L0.112183 6.44272L13.6949 4.85205L24.2284 9.66286L10.6457 11.2535Z" fill="url(#paint7_linear_167_1217)" fill-opacity="0.5" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_5">
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="#B9831F"/>
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="url(#paint8_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="url(#paint9_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="url(#paint10_linear_167_1217)" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_6">
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="#503C17"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="url(#paint11_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="url(#paint12_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="url(#paint13_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" stroke="url(#paint14_linear_167_1217)" style="mix-blend-mode:overlay"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_167_1217" x1="43.1473" y1="1.70947" x2="43.1473" y2="14.1245" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_167_1217" x1="43.1473" y1="1.70947" x2="43.1473" y2="14.1245" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_167_1217" x1="52.179" y1="0.118896" x2="52.179" y2="6.52037" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_167_1217" x1="52.179" y1="0.118896" x2="52.179" y2="6.52037" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint4_linear_167_1217" x1="32.1516" y1="9.31348" x2="32.1516" y2="16.2193" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_167_1217" x1="32.1516" y1="9.31348" x2="32.1516" y2="16.2193" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint6_linear_167_1217" x1="12.1703" y1="4.85205" x2="12.1703" y2="11.2535" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint7_linear_167_1217" x1="12.1703" y1="4.85205" x2="12.1703" y2="11.2535" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint8_linear_167_1217" x1="18.7306" y1="6.44312" x2="18.7306" y2="50.5939" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint9_linear_167_1217" x1="18.7306" y1="6.44312" x2="18.7306" y2="50.5939" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint10_linear_167_1217" x1="18.7306" y1="6.44312" x2="18.7306" y2="50.5939" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint11_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint12_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint13_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint14_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/images/home/useUavHome/eventAggregationImg.png b/src/assets/images/home/useUavHome/eventAggregationImg.png
index da133c4..1f5f09d 100644
--- a/src/assets/images/home/useUavHome/eventAggregationImg.png
+++ b/src/assets/images/home/useUavHome/eventAggregationImg.png
Binary files differ
diff --git "a/src/assets/images/home/useUavHome/eventAggregationImg1 \0503\051.png" "b/src/assets/images/home/useUavHome/eventAggregationImg1 \0503\051.png"
new file mode 100644
index 0000000..da133c4
--- /dev/null
+++ "b/src/assets/images/home/useUavHome/eventAggregationImg1 \0503\051.png"
Binary files differ
diff --git a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
index 0e39eca..1625ddd 100644
--- a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
+++ b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
@@ -273,7 +273,7 @@
getFileList();
}
-// 获取文件列表
+// 获取音频文件列表
function getFileList() {
getVoiceFile(searchParams.value).then((res) => {
if (res.data.code !== 0) return ElMessage.error(res.data.msg);
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;
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 8ed3524..2463a6a 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -63,7 +63,7 @@
v-if="isShowCurrentTaskDetails"
v-model:show="isShowCurrentTaskDetails"
:id="rowData.id"/>
- <!-- 历史人物详情 -->
+ <!-- 历史任务详情 -->
<DeviceJobDetails
v-if="isShowDeviceJobDetails"
v-model:show="isShowDeviceJobDetails"
--
Gitblit v1.9.3