From 08a18e21dcafc1d1fe225cab680b07bbb40736f6 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 17 Apr 2025 08:56:21 +0800
Subject: [PATCH] refactor: 把当前任务详情移到公共组件
---
src/components/CurrentTaskDetails/RealTimeMap.vue | 0
src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue | 2 +-
src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue | 0
src/components/CurrentTaskDetails/TaskDetailsLeft.vue | 0
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 2 +-
src/components/CurrentTaskDetails/TaskDetailsHead.vue | 0
src/components/CurrentTaskDetails/TaskDetailsRight.vue | 2 +-
src/components/CurrentTaskDetails/ControlComPass/ControlComPass.vue | 6 +++---
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 16 ++++++++--------
9 files changed, 14 insertions(+), 14 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 88%
rename from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/CurrentTaskDetails.vue
rename to src/components/CurrentTaskDetails/CurrentTaskDetails.vue
index 45ad001..4274cff 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'
@@ -170,7 +170,7 @@
.el-dialog {
border-radius: 40px;
position: relative;
- margin-top: 38px;
+ margin-top: 25px;
width: 1782px;
height: 1002px;
padding: 0;
@@ -187,8 +187,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/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 6271d34..aff1ae4 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -65,7 +65,7 @@
<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