From cb609646805c315e82103d32bbed56cb84229364 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 17 Apr 2025 10:25:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/components/DeviceJobDetails/DeviceJobDetails.vue | 17 +++++---
src/components/CurrentTaskDetails/TaskDetailsLeft.vue | 0
src/components/CurrentTaskDetails/ControlComPass/ControlComPass.vue | 6 +-
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 27 +++++--------
src/components/DeviceJobDetails/JobRelatedEvents.vue | 5 +-
src/components/CurrentTaskDetails/RealTimeMap.vue | 0
src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue | 2
src/components/DeviceJobDetails/DeviceJobDetailsMap.vue | 0
src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue | 0
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 4 +-
src/components/CurrentTaskDetails/TaskDetailsHead.vue | 0
src/components/CurrentTaskDetails/TaskDetailsRight.vue | 2
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue | 11 +++--
13 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlComPass/ControlComPass.vue b/src/components/CurrentTaskDetails/ControlComPass/ControlComPass.vue
similarity index 97%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlComPass/ControlComPass.vue
rename to src/components/CurrentTaskDetails/ControlComPass/ControlComPass.vue
index 3ab40ef..8ec1d8b 100644
--- a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlComPass/ControlComPass.vue
+++ b/src/components/CurrentTaskDetails/ControlComPass/ControlComPass.vue
@@ -3,7 +3,7 @@
<div class="left-img" :data-text="`${attitude_pitch}°`">
<div class="scaleImg">
<p class="scale" :style="{ top: 45 + ScaleTop + 'px' }"></p>
- <img src="@/assets/images/rightmapidentification.png" />
+ <img src="../../../assets/images/rightmapidentification.png" />
</div>
</div>
<div class="instrument-center">
@@ -14,13 +14,13 @@
</div>
</div>
<div class="center-show">
- <img src="@/assets/images/mapidentification.png" />
+ <img src="../../../assets/images/mapidentification.png" />
</div>
<div class="rotat-btn"></div>
</div>
<div class="right-img" :data-text="`${height}m`">
<div class="ident-arrow">
- <img src="@/assets/images/leftmapidentification.png" />
+ <img src="../../../assets/images/leftmapidentification.png" />
<div class="arrow-box" :style="{ bottom: realHeight }">
<div class="arrow"></div>
</div>
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/BaseControl.vue b/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
similarity index 100%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/BaseControl.vue
rename to src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/ControlPanel.vue b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
similarity index 98%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/ControlPanel.vue
rename to src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
index d11d3d6..d882049 100644
--- a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/ControlPanel.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
@@ -141,7 +141,7 @@
} from '@element-plus/icons-vue'
import controlCenterImg from '@/assets/images/taskManagement/taskIntermediateContent/controlCenter.png'
-import BaseControl from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/BaseControl.vue'
+import BaseControl from '@/components/CurrentTaskDetails/ControlPanel/BaseControl.vue'
import EventBus from '@/event-bus'
import dayjs from 'dayjs'
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/CurrentTaskDetails.vue b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
similarity index 85%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/CurrentTaskDetails.vue
rename to src/components/CurrentTaskDetails/CurrentTaskDetails.vue
index 45ad001..79e4a97 100644
--- a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/CurrentTaskDetails.vue
+++ b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
@@ -34,14 +34,14 @@
import { liveStart } from '@/api/home/machineNest'
import { getJobDetails } from '@/api/home/task'
-import RealTimeMap from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/RealTimeMap.vue'
+import RealTimeMap from '@/components/CurrentTaskDetails/RealTimeMap.vue'
import { getWebsocketUrl } from '@/websocket/util/config'
import { useConnectWebSocket } from '@/utils/websocket/connect-websocket'
import { EBizCode } from '@/utils/staticData/enums'
-import ControlPanel from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/ControlPanel.vue'
-import TaskDetailsHead from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsHead.vue'
-import TaskDetailsLeft from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsLeft.vue'
-import TaskDetailsRight from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsRight.vue'
+import ControlPanel from '@/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue'
+import TaskDetailsHead from '@/components/CurrentTaskDetails/TaskDetailsHead.vue'
+import TaskDetailsLeft from '@/components/CurrentTaskDetails/TaskDetailsLeft.vue'
+import TaskDetailsRight from '@/components/CurrentTaskDetails/TaskDetailsRight.vue'
import { ElMessage } from 'element-plus'
import EventBus from '@/event-bus'
@@ -51,13 +51,7 @@
provide('lineQuality', lineQuality)
const isShow = defineModel('show')
-const props = defineProps({
- rowData: {
- // 任务列表row数据
- type: Object,
- default: () => ({}),
- },
-})
+const props = defineProps(['id'])
const currentLiveUrl = ref('')
const machineNestUrl = ref('')
const droneLiveUrl = ref('')
@@ -106,7 +100,8 @@
// 获取任务详情获取航线文件
const getTaskDetails = () => {
- getJobDetails({ wayLineJobInfoId: props.rowData.id }).then(async res => {
+ if (!props.id) ElMessage.warning('请检查是否传入id')
+ getJobDetails({ wayLineJobInfoId: props.id }).then(async res => {
taskDetails.value = res.data.data
currentLiveUrl.value = await getDeviceLiveUrl()
taskDetails.value.workspace_id = taskDetails.value.way_lines[0]?.workspace_id
@@ -170,7 +165,7 @@
.el-dialog {
border-radius: 40px;
position: relative;
- margin-top: 38px;
+ margin-top: 25px;
width: 1782px;
height: 1002px;
padding: 0;
@@ -187,8 +182,8 @@
.el-dialog__headerbtn {
position: absolute;
- right: -40px;
- top: -40px;
+ right: -30px;
+ top: -30px;
.el-dialog__close {
font-size: 30px;
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/RealTimeMap.vue b/src/components/CurrentTaskDetails/RealTimeMap.vue
similarity index 100%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/RealTimeMap.vue
rename to src/components/CurrentTaskDetails/RealTimeMap.vue
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsHead.vue b/src/components/CurrentTaskDetails/TaskDetailsHead.vue
similarity index 100%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsHead.vue
rename to src/components/CurrentTaskDetails/TaskDetailsHead.vue
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsLeft.vue b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
similarity index 100%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsLeft.vue
rename to src/components/CurrentTaskDetails/TaskDetailsLeft.vue
diff --git a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsRight.vue b/src/components/CurrentTaskDetails/TaskDetailsRight.vue
similarity index 94%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsRight.vue
rename to src/components/CurrentTaskDetails/TaskDetailsRight.vue
index ba5c36a..32105be 100644
--- a/src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsRight.vue
+++ b/src/components/CurrentTaskDetails/TaskDetailsRight.vue
@@ -16,7 +16,7 @@
</template>
<script setup>
import droneImg from '@/assets/images/taskManagement/taskIntermediateContent/droneImg.png'
-import BaseControl from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/BaseControl.vue'
+import BaseControl from '@/components/CurrentTaskDetails/ControlPanel/BaseControl.vue'
const taskDetails = inject('taskDetails')
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue b/src/components/DeviceJobDetails/DeviceJobDetails.vue
similarity index 95%
rename from src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
rename to src/components/DeviceJobDetails/DeviceJobDetails.vue
index d4cc8c7..007edb7 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/components/DeviceJobDetails/DeviceJobDetails.vue
@@ -27,7 +27,7 @@
<div class="itemValue">{{ flystatus ? flystatus :'' }}</div>
</div>
</div>
- <JobRelatedEvents v-if="isShow" />
+ <JobRelatedEvents v-if="props.wayLineJodInfoId" />
<div class="devicetitle" v-if="isShow">
<p>
任务成果
@@ -101,7 +101,12 @@
const mediaType = ref('')
const total = ref(0)
const achievementList = ref([])
-const wayLineJodInfoId = inject('wayLineJodInfoId')
+
+const props = defineProps(['wayLineJodInfoId'])
+const wayLineJodInfoId = computed(()=> props.wayLineJodInfoId)
+provide('wayLineJodInfoId',wayLineJodInfoId)
+
+
const getAchievement = () => {
getJobInfoFiles({ jobInfoId: wayLineJodInfoId.value }).then(res => {
for (let i = 0; i < res.data.data.length; i++) {
@@ -132,11 +137,9 @@
})
}
-watch(isShow, (newValue, oldValue) => {
- if (newValue) {
- getDetails()
- getAchievement()
- }
+onMounted(() => {
+ getDetails()
+ getAchievement()
})
</script>
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetailsMap.vue b/src/components/DeviceJobDetails/DeviceJobDetailsMap.vue
similarity index 100%
rename from src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetailsMap.vue
rename to src/components/DeviceJobDetails/DeviceJobDetailsMap.vue
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
similarity index 99%
rename from src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
rename to src/components/DeviceJobDetails/JobRelatedEvents.vue
index ede419c..f2bd341 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -20,7 +20,7 @@
<div class="processing" v-if="scope.row.status === 3">处理中</div>
<div class="done" v-if="scope.row.status === 4">已完成</div>
<div class="ended" v-if="scope.row.status === 5">已完结</div>
-
+
</template>
</el-table-column>
<el-table-column label="操作" width="80">
@@ -67,13 +67,14 @@
}
const wayLineJodInfoId = inject('wayLineJodInfoId')
+
const getList = () => {
params.value.wayLineJodInfoId = wayLineJodInfoId.value
getDeviceEventList(params.value, sizeParams.value).then(res => {
const resData = res?.data?.data || {}
list.value = resData.records
total.value = resData.total
-
+
})
}
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
index 4d904db..1a7fa6b 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
@@ -36,7 +36,7 @@
<el-pagination
class="ztzf-pagination"
background
-
+
v-model:current-page="sizeParams.current"
v-model:page-size="sizeParams.size"
layout=" prev, pager, next, jumper"
@@ -45,11 +45,15 @@
/>
</div>
- <DeviceJobDetails v-model:show="deviceJobDetailsShow" />
+ <DeviceJobDetails
+ v-if="deviceJobDetailsShow"
+ v-model:show="deviceJobDetailsShow"
+ :wayLineJodInfoId="wayLineJodInfoId"
+ />
</template>
<script setup>
import { useStore } from 'vuex'
-import DeviceJobDetails from './DeviceJobDetails/DeviceJobDetails.vue'
+import DeviceJobDetails from '@/components/DeviceJobDetails/DeviceJobDetails.vue'
import { getDeviceJobList } from '@/api/home/task'
const list = ref([])
@@ -65,7 +69,6 @@
const total = ref(0)
const deviceJobDetailsShow = ref(false)
const wayLineJodInfoId = ref(null)
-provide('wayLineJodInfoId', wayLineJodInfoId)
const viewJob = row => {
wayLineJodInfoId.value = row.id
deviceJobDetailsShow.value = true
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 1e8068a..19ef1b7 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -59,13 +59,13 @@
<!-- 添加任务 -->
<AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
<!-- 当前任务详情 -->
- <CurrentTaskDetails v-if="isShowCurrentTaskDetails" v-model:show="isShowCurrentTaskDetails" :rowData="rowData"/>
+ <CurrentTaskDetails v-if="isShowCurrentTaskDetails" v-model:show="isShowCurrentTaskDetails" :id="rowData.id"/>
</template>
<script setup>
import SearchBox from '../SearchBox.vue';
import AddTask from './AddTask.vue';
-import CurrentTaskDetails from './CurrentTaskDetails/CurrentTaskDetails.vue';
+import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue';
import { jobList } from '@/api/home/task';
import { ElMessage } from 'element-plus'
--
Gitblit v1.9.3