From 2df37298dfd5b299a4c051cb544794b5241cc3a5 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 06 Dec 2025 11:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v9.0/9.0.1' into feature/v9.0/9.0.1
---
src/views/job/components/DeviceJobDetails.vue | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/views/job/components/DeviceJobDetails.vue b/src/views/job/components/DeviceJobDetails.vue
index 024f978..b143653 100644
--- a/src/views/job/components/DeviceJobDetails.vue
+++ b/src/views/job/components/DeviceJobDetails.vue
@@ -99,28 +99,7 @@
fit="cover"
/>
- <el-dialog
- class="ztzf-dialog"
- append-to-body
- modal-class="detailsOfHistoricalTasks"
- v-model="VideoShow"
- :width="pxToRem(1600)"
- :close-on-click-modal="false"
- :destroy-on-close="true"
- >
- <div class="fullscreen">
- <video
- ref="fullscreenVideo"
- class="fullscreen-video"
- :src="currentVideoUrl"
- :style="{ width: pxToRem(1567), height: '80vh' }"
- controls
- preload="auto"
- @play="handleVideoPlay"
- @ended="handleVideoEnded"
- ></video>
- </div>
- </el-dialog>
+
</div>
</template>
@@ -145,6 +124,28 @@
</div>
</div>
</el-dialog>
+ <el-dialog
+ class="ztzf-dialog"
+ append-to-body
+ modal-class="detailsOfHistoricalTasks"
+ v-model="VideoShow"
+ :width="pxToRem(1600)"
+ :close-on-click-modal="false"
+ :destroy-on-close="true"
+ >
+ <div class="fullscreen">
+ <video
+ ref="fullscreenVideo"
+ class="fullscreen-video"
+ :src="currentVideoUrl"
+ :style="{ width: pxToRem(1567), height: '80vh' }"
+ controls
+ preload="auto"
+ @play="handleVideoPlay"
+ @ended="handleVideoEnded"
+ ></video>
+ </div>
+ </el-dialog>
<!-- 全景360 -->
<PanoramaPopup
v-if="'全景'"
@@ -205,11 +206,11 @@
{ name: '任务类型', value: '', field: 'industry_type_str' },
{ name: '飞行事件', value: '', field: 'event_number' },
{ name: '所属机巢', value: '', field: 'device_names' },
+ { name: '创建人', value: '', field: 'creator_name' },
{ name: '所属部门', value: '', field: 'dept_name' },
{ name: '任务时间', value: '', field: 'cycle_time_value' },
{ name: '关联算法', value: '', field: 'ai_type_str' },
{ name: '自定义识别区', value: '', field: 'enable_custom_area' },
- { name: '创建人', value: '', field: 'creator_name' },
{ name: '任务描述', value: '', field: 'remark' },
// { name: '任务执行次数', value: '', field: 'job_num' },
])
@@ -284,8 +285,8 @@
jobTimes.value = res.data.data.job_times
infoList.value.forEach(item => {
if (item.name === '任务频次') {
- const { rep_rule_type = '', rep_rule_val = '' } = detailsData?.value || {}
- item.value = rep_rule_type + ' -- ' + rep_rule_val
+ const { rep_rule_type = '',final_cycle_frequency = '' } = detailsData?.value || {}
+ item.value = rep_rule_type ? final_cycle_frequency : '1次'
} else {
item.value = detailsData.value?.[item.field] || '--'
}
--
Gitblit v1.9.3