From 0bf99978663e2d682ba611c13c8777c00632b476 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:06:55 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/wel/components/flyratio.vue | 8
src/views/wel/components/proportionStatic.vue | 13
src/views/layerManagement/components/leftList.vue | 2
src/views/wel/components/flightStatistics.vue | 8
src/views/job/components/DeviceJobDetails.vue | 972 +++++++++++++++++++++++++++------------------------------
src/views/wel/components/taskOutcome.vue | 8
6 files changed, 490 insertions(+), 521 deletions(-)
diff --git a/src/views/job/components/DeviceJobDetails.vue b/src/views/job/components/DeviceJobDetails.vue
index 7bcd21b..eb0e325 100644
--- a/src/views/job/components/DeviceJobDetails.vue
+++ b/src/views/job/components/DeviceJobDetails.vue
@@ -1,103 +1,82 @@
<!-- 历史任务详情 -->
<template>
- <el-dialog class="ztzf-dialog" append-to-body modal-class="detailsOfHistoricalTasks" v-model="isShow" title="历史任务详情"
- :width="pxToRem(1800)" :close-on-click-modal="false" :destroy-on-close="true">
- <div class="content">
- <div class="contentLeft">
- <div class="machineTableDetailsTitle"><img src="/src/assets/images/task/sign.svg" alt=""><span>详情</span></div>
- <div class="infoBox">
- <div class="itemBoxLeft">
- <div v-for="(item, index) in infoList" :key="index" class="itemCon">
- <div class="itemBox">
- <div class="itemTitle">{{ item.name }}：</div>
- <div truncated class="itemValue" v-if="item.name !== '飞行事件' && item.name !== '任务执行次数'">{{
- item.value ? item.value : '--' }}</div>
- <div class="itemValue" v-if="item.name === '任务执行次数'">{{ item.value ? item.value : '0'
- }}次</div>
- <!-- 飞行事件 -->
- <div class="flightEvents" v-if="item.name === '飞行事件'">
- <template v-if="flightEvents.length">
- <img v-for="(item, index) in flightEvents" alt="" :src="item.img"
- :title="item.name" :key="index"></img>
- </template>
- <div class="itemValue" v-else>--</div>
- </div>
- </div>
- </div>
- </div>
+ <el-dialog class="ztzf-dialog" append-to-body modal-class="detailsOfHistoricalTasks" v-model="isShow" title="历史任务详情"
+ :width="pxToRem(1800)" :close-on-click-modal="false" :destroy-on-close="true">
+ <div class="content">
+ <div class="contentLeft">
+ <div class="machineTableDetailsTitle"><img src="/src/assets/images/task/sign.svg" alt=""><span>详情</span></div>
+ <div class="infoBox">
+ <div class="itemBoxLeft">
+ <div v-for="(item, index) in infoList" :key="index" class="itemCon">
+ <div class="itemBox">
+ <div class="itemTitle">{{ item.name }}：</div>
+ <div truncated class="itemValue" v-if="item.name !== '飞行事件' && item.name !== '任务执行次数'">{{
+ item.value ? item.value : '--' }}</div>
+ <div class="itemValue" v-if="item.name === '任务执行次数'">{{ item.value ? item.value : '0'
+ }}次</div>
+ <!-- 飞行事件 -->
+ <div class="flightEvents" v-if="item.name === '飞行事件'">
+ <template v-if="flightEvents.length">
+ <img v-for="(item, index) in flightEvents" alt="" :src="item.img" :title="item.name"
+ :key="index"></img>
+ </template>
+ <div class="itemValue" v-else>--</div>
+ </div>
+ </div>
+ </div>
+ </div>
- </div>
- <JobRelatedEvents :jobTimes="jobTimes" :batchNo="batchNo" />
- <div class="devicetitle" v-if="isShow">
- <div>
- <img src="/src/assets/images/task/sign.svg" alt="">
- <p>
- 成果数据
- <span>{{ total }}</span>
- 个
- </p>
- </div>
- <div class="rightBox" v-if="total">
- <div class="downloadBtn" @click="htlsrwxq === 100 && downloadFun()">
- <el-progress v-if="htlsrwxq !== 100" :percentage="htlsrwxq" :show-text="false" striped striped-flow :duration="1" />
- <div class="downloadBtnText">
- <span v-if="htlsrwxq === 100">下载</span>
- <template v-else>
- 处理中<el-icon @click="cancelDownload"><CircleClose /></el-icon>
- </template>
- </div>
- </div>
- <div class="downloadBtn" @click="showAll = !showAll" v-if="total > 5">
- {{ showAll ? '收起' : '更多' }}
- </div>
- </div>
- </div>
- <div class="imgListBox">
- <!-- 图片显示 -->
- <template v-for="(item, index) in achievementList.slice(0, visibleCount)" :key="index">
- <div class="result-item">
- <el-checkbox v-model="item.checked" />
- <div class="itemName">{{ item.createTime }}</div>
- <!-- 正射 -->
- <el-image
- v-if="item.resultType === 4"
- :src="item.smallUrl"
- :preview-src-list="[item.showUrl]"
- fit="cover"
- preview-teleported
- />
- <!-- 全景 -->
- <img
- v-else-if="item.resultType === 5"
- class="quanjing"
- @click="clickpanorama(item)"
- :src="item?.smallUrl"
- alt=""
- />
- <!-- 视频 -->
- <div v-else-if="item.resultType === 1" class="videotime">
- <img
- class="videoDisplay"
- :src="convertVideoUrlToThumbnail(item.link)"
- alt=""
- @click="enterFullScreen(index)"
- />
- <img
- @click="enterFullScreen(index)"
- class="videobutton"
- src="@/assets/images/task/videoshow.png"
- alt=""
- />
- </div>
- <!-- 图片 -->
- <el-image
- v-else
- :src="item.smallUrl"
- :preview-src-list="[item.showUrl]"
- preview-teleported
- :initial-index="index"
- fit="cover"
- />
+ </div>
+ <JobRelatedEvents :jobTimes="jobTimes" :batchNo="batchNo" />
+ <div class="devicetitle" v-if="isShow">
+ <div>
+ <img src="/src/assets/images/task/sign.svg" alt="">
+ <p>
+ 成果数据
+ <span>{{ total }}</span>
+ 个
+ </p>
+ </div>
+ <div class="rightBox" v-if="total">
+ <div class="downloadBtn" @click="htlsrwxq === 100 && downloadFun()">
+ <el-progress v-if="htlsrwxq !== 100" :percentage="htlsrwxq" :show-text="false" striped striped-flow
+ :duration="1" />
+ <div class="downloadBtnText">
+ <span v-if="htlsrwxq === 100">下载</span>
+ <template v-else>
+ 处理中<el-icon @click="cancelDownload">
+ <CircleClose />
+ </el-icon>
+ </template>
+ </div>
+ </div>
+ <div class="downloadBtn" @click="showAll = !showAll" v-if="total > 5">
+ {{ showAll ? '收起' : '更多' }}
+ </div>
+ </div>
+ </div>
+ <div class="imgListBox">
+ <!-- 图片显示 -->
+ <template v-for="(item, index) in achievementList.slice(0, visibleCount)" :key="index">
+ <div class="result-item">
+ <el-checkbox v-model="item.checked" />
+ <div class="itemName">{{ item.createTime }}</div>
+ <!-- 正射 -->
+ <el-image v-if="item.resultType === 4" :src="item.smallUrl" :preview-src-list="[item.showUrl]" fit="cover"
+ preview-teleported />
+ <!-- 全景 -->
+ <img v-else-if="item.resultType === 5" class="quanjing" @click="clickpanorama(item)" :src="item?.smallUrl"
+ alt="" />
+ <!-- 视频 -->
+ <div v-else-if="item.resultType === 1" class="videotime">
+ <img class="videoDisplay" :src="convertVideoUrlToThumbnail(item.link)" alt=""
+ @click="enterFullScreen(index)" />
+ <img @click="enterFullScreen(index)" class="videobutton" src="@/assets/images/task/videoshow.png"
+ alt="" />
+ </div>
+ <!-- 图片 -->
+ <el-image v-else :src="item.smallUrl" :preview-src-list="[item.showUrl]" preview-teleported
+ :initial-index="index" fit="cover" />
</div>
@@ -105,68 +84,43 @@
</template>
</div>
- <el-image-viewer
- v-if="showViewer"
- :url-list="previewUrls"
- :initial-index="activeIndex"
- @close="showViewer = false"
- />
+ <el-image-viewer v-if="showViewer" :url-list="previewUrls" :initial-index="activeIndex"
+ @close="showViewer = false" />
</div>
<div class="content-right" v-if="isShow">
- <DeviceJobDetailsMap
- :detailsData="detailsData"
- :yuanImages="yuanImages"
- @showImageeclick="showImageeclick"
- :jobId="props.jobId"
- />
+ <DeviceJobDetailsMap :detailsData="detailsData" :yuanImages="yuanImages" @showImageeclick="showImageeclick"
+ :jobId="props.jobId" />
<div class="content-map-popups"></div>
</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>
+ <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="'全景'"
- v-model:panoramaParamsShow="panoramaParamsShow"
- v-model:panoramaParamsUrl="panoramaParamsUrl"
- />
+ <PanoramaPopup v-if="'全景'" v-model:panoramaParamsShow="panoramaParamsShow"
+ v-model:panoramaParamsUrl="panoramaParamsUrl" />
</template>
<script setup>
-import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue';
-import { getShowImg, getSmallImg, getzsSmallImg, getzsShowImg, aLinkDownloadUtil } from '@/utils/util';
-import { getaiImagesPageAPI,cancelDownloadApi,getDownloadStatusApi,attachDownload,aiImagesPage} from '@/api/dataCenter/dataCenter';
+import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue'
+import { getShowImg, getSmallImg, getzsSmallImg, getzsShowImg, aLinkDownloadUtil } from '@/utils/util'
+import { getaiImagesPageAPI, cancelDownloadApi, getDownloadStatusApi, attachDownload, aiImagesPage } from '@/api/dataCenter/dataCenter'
import { pxToRem } from '@/utils/rem'
import JobRelatedEvents from './JobRelatedEvents.vue'
-import { getEventMediaListApi, getJobDetails, getJobInfoFiles,getJobsAllFiles } from '@/api/job/task'
+import { getEventMediaListApi, getJobDetails, getJobInfoFiles, getJobsAllFiles } from '@/api/job/task'
import DeviceJobDetailsMap from './DeviceJobDetailsMap.vue'
import { droneEventList } from '../const/drc'
-import { ElMessage,ElLoading } from 'element-plus'
-import { useStore } from 'vuex';
-import EventBus from '@/utils/eventBus';
-const store = useStore();
+import { ElMessage, ElLoading } from 'element-plus'
+import { useStore } from 'vuex'
+import EventBus from '@/utils/eventBus'
+const store = useStore()
const htlsrwxq = computed(() => store.state.common.downloadProgress?.htlsrwxq || 100)
const isShow = defineModel('show')
const VideoShow = ref(false)
@@ -192,13 +146,13 @@
}
// 原图
const yuanImages = ref([])
-function convertVideoUrlToThumbnail(videoUrl) {
- // 检查是否是有效的视频URL
- if (!videoUrl || typeof videoUrl !== 'string') {
- return videoUrl
- }
- // 替换文件扩展名
- return videoUrl.replace(/\.mp4$/, '_small.jpg')
+function convertVideoUrlToThumbnail (videoUrl) {
+ // 检查是否是有效的视频URL
+ if (!videoUrl || typeof videoUrl !== 'string') {
+ return videoUrl
+ }
+ // 替换文件扩展名
+ return videoUrl.replace(/\.mp4$/, '_small.jpg')
}
const infoList = ref([
{ name: '任务编号', value: '', field: 'job_info_num' },
@@ -223,7 +177,7 @@
industry_type_str: null,
area_code: null,
ai_type_str: null,
- enable_custom_area:null,
+ enable_custom_area: null,
begin_time: null,
end_time: null,
device_names: null,
@@ -236,40 +190,16 @@
// 任务成果
const total = ref(0)
const achievementList = ref([])
-const props = defineProps(['wayLineJobInfoId', 'waylineJobId', 'batchNo','jobId'])
+const props = defineProps(['wayLineJobInfoId', 'waylineJobId', 'batchNo', 'jobId'])
const wayLineJobInfoId = computed(() => props.wayLineJobInfoId)
provide('wayLineJobInfoId', wayLineJobInfoId)
// 可见数量
const visibleCount = computed(() =>
- showAll.value ? achievementList.value.length : Math.min(5, achievementList.value.length)
+ showAll.value ? achievementList.value.length : Math.min(5, achievementList.value.length)
)
-const getAchievement = () => {
- if (!props.jobId) return
- const attachmentsParams = {
- 'wayLineJobId': props.jobId,
- 'resultTypes': [0, 1, 2, 4, 5],
- 'orderByCreateTime': true,
- current: 1,
- size: 2000,
- }
- const pageParams = {
- current: 1,
- size: 2000,
- }
- aiImagesPage(attachmentsParams ).then(res => {
- achievementList.value = res.data.data.records.map(i => ({
- ...i,
- checked: false,
- smallUrl: i.resultType === 4 ? getzsSmallImg(i.link) : getSmallImg(i.link),
- showUrl: i.resultType === 4 ? getzsShowImg(i.link) : getShowImg(i.link),
- }))
- total.value = res.data.data.total
- // console.log('成果数据', res.data.data)
- })
-}
const jumpMore = () => {
- ElMessage.warning('正在加急开发中...')
+ ElMessage.warning('正在加急开发中...')
}
const flightEvents = ref([])
@@ -285,7 +215,7 @@
jobTimes.value = res.data.data.job_times
infoList.value.forEach(item => {
if (item.name === '任务频次') {
- const { rep_rule_type = '',final_cycle_frequency = '' } = detailsData?.value || {}
+ 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] || '--'
@@ -297,413 +227,435 @@
)
}
if (item.name === '自定义识别区') {
- item.value = res.data.data.enable_custom_area ? '是': '否'
+ item.value = res.data.data.enable_custom_area ? '是' : '否'
}
- getJobsAllFiles({
- wayLineJobId: detailsData.value.way_lines.map(item => item.job_id).join(','),
- resultTypes: [0, 2, 4, 5],
- }).then(result => {
- if (result.data.code !== 200) return
- yuanImages.value = result.data.data.records
+ getJobsAllFiles({
+ wayLineJobId: detailsData.value.way_lines.map(item => item.job_id).join(','),
+ resultTypes: [0, 1, 2, 4, 5],
+ orderByCreateTime: true,
+ }).then(result => {
+ if (result.data.code !== 200) return
+ achievementList.value = res.data.data.records.map(i => ({
+ ...i,
+ checked: false,
+ smallUrl: i.resultType === 4 ? getzsSmallImg(i.link) : getSmallImg(i.link),
+ showUrl: i.resultType === 4 ? getzsShowImg(i.link) : getShowImg(i.link),
+ }))
+ total.value = res.data.data.total
-
- })
- })
- // flystatus.value = res.data.data.ai_type_str
- })
+ yuanImages.value = res.data.data.records.filter(item => item.resultType !== 1)
+ })
+ })
+ // flystatus.value = res.data.data.ai_type_str
+ })
}
// 播放
-const videoRef = ref(null);
+const videoRef = ref(null)
const currentVideoIndex = ref(-1)
const enterFullScreen = (index) => {
- currentVideoIndex.value = index
- VideoShow.value = true
+ currentVideoIndex.value = index
+ VideoShow.value = true
}
// 计算当前视频URL
const currentVideoUrl = computed(() => {
- return achievementList.value[currentVideoIndex.value]?.link || ''
+ return achievementList.value[currentVideoIndex.value]?.link || ''
})
// 关闭弹窗处理
const handleClose = () => {
- if (fullscreenVideo.value) {
- fullscreenVideo.value.pause()
- fullscreenVideo.value.currentTime = 0
- }
+ if (fullscreenVideo.value) {
+ fullscreenVideo.value.pause()
+ fullscreenVideo.value.currentTime = 0
+ }
}
// 下载
const downloadFun = async () => {
- const list = achievementList.value.filter(i => i.checked)
- console.log('list',list);
- if (!list?.length) return ElMessage.warning('请选择文件')
- if (list.length === 1) {
- list.forEach((item, index) => {
- const suffix = item.link.split('.').pop()
- aLinkDownloadUtil(item.link, item.nickName + '.' + suffix)
- })
- } else {
- loadingData = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })
- const fileIds = list.map(i => i.id)
- const res = await getDownloadStatusApi({type: 'htlsrwxq'})
- if (!['CANCELLED','COMPLETED'].includes(res.data.data?.status || 'COMPLETED')){
- return ElMessage.warning('还有正在处理的')
- }
- attachDownload({ attachIds: fileIds,type:'htlsrwxq' }).finally(()=>{
- loadingData.close()
- })
- }
+ const list = achievementList.value.filter(i => i.checked)
+ console.log('list', list)
+ if (!list?.length) return ElMessage.warning('请选择文件')
+ if (list.length === 1) {
+ list.forEach((item, index) => {
+ const suffix = item.link.split('.').pop()
+ aLinkDownloadUtil(item.link, item.nickName + '.' + suffix)
+ })
+ } else {
+ loadingData = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })
+ const fileIds = list.map(i => i.id)
+ const res = await getDownloadStatusApi({ type: 'htlsrwxq' })
+ if (!['CANCELLED', 'COMPLETED'].includes(res.data.data?.status || 'COMPLETED')) {
+ return ElMessage.warning('还有正在处理的')
+ }
+ attachDownload({ attachIds: fileIds, type: 'htlsrwxq' }).finally(() => {
+ loadingData.close()
+ })
+ }
}
// 全景预览
const panoramaParamsShow = ref(false)
const panoramaParamsUrl = ref(null)
const clickpanorama = val => {
- panoramaParamsShow.value = true
- panoramaParamsUrl.value = val.link
+ panoramaParamsShow.value = true
+ panoramaParamsUrl.value = val.link
}
// 从地图点击图片预览
const showViewer = ref(false)
const activeIndex = ref(0)
const previewUrls = ref([])
const showImageeclick = (list, index, categoriestype) => {
- if (categoriestype === 5) {
- panoramaParamsShow.value = true
- panoramaParamsUrl.value = list[0]
- } else {
- previewUrls.value = list
- activeIndex.value = 0
- showViewer.value = true
- }
+ if (categoriestype === 5) {
+ panoramaParamsShow.value = true
+ panoramaParamsUrl.value = list[0]
+ } else {
+ previewUrls.value = list
+ activeIndex.value = 0
+ showViewer.value = true
+ }
}
// 取消下载
-function cancelDownload() {
- cancelDownloadApi({ type:'htlsrwxq' }).then(res =>{
- ElMessage.success('取消成功')
- }).catch(e =>{
- EventBus.emit('useGlobalWS-messageHandler', {biz_code: 'DOWNLOAD_PROGRESS',data:{status: 'CANCELLED',type:'htlsrwxq'}})
+function cancelDownload () {
+ cancelDownloadApi({ type: 'htlsrwxq' }).then(res => {
+ ElMessage.success('取消成功')
+ }).catch(e => {
+ EventBus.emit('useGlobalWS-messageHandler', { biz_code: 'DOWNLOAD_PROGRESS', data: { status: 'CANCELLED', type: 'htlsrwxq' } })
})
}
onMounted(() => {
- getDetails()
- getAchievement()
+ getDetails()
})
</script>
<style lang="scss">
.detailsOfHistoricalTasks {
- .el-dialog {
- --el-dialog-margin-top: 5vh;
- }
+ .el-dialog {
+ --el-dialog-margin-top: 5vh;
+ }
- .el-pagination {
- justify-content: center;
- padding: 20px;
- }
+ .el-pagination {
+ justify-content: center;
+ padding: 20px;
+ }
- .el-dialog__body {
- height: 80vh;
- }
+ .el-dialog__body {
+ height: 80vh;
+ }
}
</style>
<style lang="scss" scoped>
.content {
- display: flex;
- height: 100%;
-.contentLeft {
- margin-left: 35px;
- margin-right: 24px;
- width: 1150px;
- overflow: auto;
+ display: flex;
+ height: 100%;
- .machineTableDetailsTitle {
- margin-bottom: 10px;
- // background: url('/src/assets/images/task/detailtitle.png') no-repeat center;
- border-bottom: 2px solid #e4e7ed;
- background-size: 100% 100%;
- img{
- width: 15px;
- height: 15px;}
- span {
- display: inline-block;
- margin-left: 10px;
- font-size: 16px;
- // color: #0282ff;
- color: #303133;
- line-height: 20px;
- text-align: left;
- margin-bottom: 8px;
- }
- }
+ .contentLeft {
+ margin-left: 35px;
+ margin-right: 24px;
+ width: 1150px;
+ overflow: auto;
- .devicetitle {
- margin-bottom: 16px;
- // background: url('/src/assets/images/task/detailtitle.png') no-repeat center;
- border-bottom: 2px solid #e4e7ed;
- background-size: 100% 100%;
- display: flex;
- justify-content: space-between;
- align-content: center;
- .rightBox{
- display: flex;
- align-items: center;
- padding-right: 10px;
- gap: 0 10px;
+ .machineTableDetailsTitle {
+ margin-bottom: 10px;
+ // background: url('/src/assets/images/task/detailtitle.png') no-repeat center;
+ border-bottom: 2px solid #e4e7ed;
+ background-size: 100% 100%;
- .downloadBtn{
- position: relative;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 28px;
- padding: 0 15px;
- background: rgba(28, 92, 255, 0.14);
- border-radius: 4px 4px 4px 4px;
- border: 1px solid #1c5cff;
- cursor: pointer;
- color: #1C5CFF;
+ img {
+ width: 15px;
+ height: 15px;
+ }
- .downloadBtnText{
- display: flex;
- align-items: center;
- gap: 5px;
- z-index: 5;
- }
- .el-progress{
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
+ span {
+ display: inline-block;
+ margin-left: 10px;
+ font-size: 16px;
+ // color: #0282ff;
+ color: #303133;
+ line-height: 20px;
+ text-align: left;
+ margin-bottom: 8px;
+ }
+ }
- :deep(){
- .el-progress-bar__outer{
- height: 28px !important;
- border-radius: 0 !important;
- background: transparent !important;
+ .devicetitle {
+ margin-bottom: 16px;
+ // background: url('/src/assets/images/task/detailtitle.png') no-repeat center;
+ border-bottom: 2px solid #e4e7ed;
+ background-size: 100% 100%;
+ display: flex;
+ justify-content: space-between;
+ align-content: center;
- .el-progress-bar__inner{
- border-radius: 0 !important;
- }
- }
- }
- }
+ .rightBox {
+ display: flex;
+ align-items: center;
+ padding-right: 10px;
+ gap: 0 10px;
- }
- }
- img{
- width: 15px;
- height: 15px;}
- p {
- display: inline-block;
- margin-left: 10px;
- font-size: 16px;
- color: #363636;
- line-height: 20px;
- text-align: left;
- margin-bottom: 8px;
+ .downloadBtn {
+ position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 28px;
+ padding: 0 15px;
+ background: rgba(28, 92, 255, 0.14);
+ border-radius: 4px 4px 4px 4px;
+ border: 1px solid #1c5cff;
+ cursor: pointer;
+ color: #1C5CFF;
- span {
- font-size: 26px;
- color: #0282ff;
- font-weight: bold;
- }
- }
+ .downloadBtnText {
+ display: flex;
+ align-items: center;
+ gap: 5px;
+ z-index: 5;
+ }
- .more {
- color: #2f9dff;
- font-size: 14px;
- padding-top: 5px;
- cursor: pointer;
- }
- }
+ .el-progress {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
- .infoBox {
- display: flex;
- justify-content: space-between;
+ :deep() {
+ .el-progress-bar__outer {
+ height: 28px !important;
+ border-radius: 0 !important;
+ background: transparent !important;
- .itemBoxLeft {
- flex: 1;
- display: grid;
- grid-template-columns: repeat(2, 1fr);
- column-gap: 10px;
- /* 只设置列间距 */
- row-gap: 0;
- /* 取消行间距 */
- padding: 10px;
- font-size: 14px;
+ .el-progress-bar__inner {
+ border-radius: 0 !important;
+ }
+ }
+ }
+ }
- .itemBox {
- display: flex;
- align-items: center;
- background: #fff;
- height: 43px;
- border-top: 2px solid #EFEFEF;
+ }
+ }
- }
+ img {
+ width: 15px;
+ height: 15px;
+ }
- }
+ p {
+ display: inline-block;
+ margin-left: 10px;
+ font-size: 16px;
+ color: #363636;
+ line-height: 20px;
+ text-align: left;
+ margin-bottom: 8px;
- .itemCon:nth-last-child(-n+2) {
- border-bottom: 2px solid #EFEFEF;
- }
+ span {
+ font-size: 26px;
+ color: #0282ff;
+ font-weight: bold;
+ }
+ }
- .itemBox:nth-last-child(-n+2) .itemTitle {
- border-bottom: 1px solid #EFEFEF;
- }
+ .more {
+ color: #2f9dff;
+ font-size: 14px;
+ padding-top: 5px;
+ cursor: pointer;
+ }
+ }
- .itemTitle {
- color: #0B1D38;
- width: 26%;
- text-align: right;
- background: #F3F6FF;
- height: 43px;
- line-height: 43px;
- padding-right: 10px;
- border-top: 1px solid #EFEFEF;
- }
+ .infoBox {
+ display: flex;
+ justify-content: space-between;
- .itemValue {
- font-size: 14px;
- color: #747e91;
- text-align: center;
- width: 74%;
+ .itemBoxLeft {
+ flex: 1;
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ column-gap: 10px;
+ /* 只设置列间距 */
+ row-gap: 0;
+ /* 取消行间距 */
+ padding: 10px;
+ font-size: 14px;
- }
+ .itemBox {
+ display: flex;
+ align-items: center;
+ background: #fff;
+ height: 43px;
+ border-top: 2px solid #EFEFEF;
- .flightEvents {
- display: flex;
- flex-wrap: wrap;
- gap: 10px 10px;
- width: 74%;
- justify-content: center;
+ }
- img {
- width: 30px;
- height: 30px;
- }
- }
+ }
- }
+ .itemCon:nth-last-child(-n+2) {
+ border-bottom: 2px solid #EFEFEF;
+ }
- .imgListBox {
- display: grid;
- grid-template-columns: repeat(5, 1fr);
- gap: 10px;
- margin-bottom: 49px;
+ .itemBox:nth-last-child(-n+2) .itemTitle {
+ border-bottom: 1px solid #EFEFEF;
+ }
- > * {
- width: 100%;
- height: 200px;
- position: relative;
- border-radius: 0px 0px 4px 4px;
- overflow: hidden;
- }
- :deep(.el-checkbox__inner) {
- width: 17px !important;
- height: 17px !important;
- background: rgba(37, 36, 36, 0.63) !important;
- border-radius: 4px 4px 4px 4px;
- border: 1px solid #ffffff !important;
- }
- .el-checkbox {
- position: absolute;
- top: 0;
- left: 6px;
- }
- :deep(.el-checkbox__inner:after) {
- position: absolute;
- left: 50% !important;
- top: 40% !important;
- transform: translate(-50%, -50%) rotate(45deg) !important;
- }
- :deep(.el-checkbox.is-checked .el-checkbox__inner) {
- background-color: #09297b !important;
- border-color: #1c5cff !important;
- }
- .el-image {
- width: 100%;
- height: 100%;
- cursor: pointer;
- position: relative;
- }
+ .itemTitle {
+ color: #0B1D38;
+ width: 26%;
+ text-align: right;
+ background: #F3F6FF;
+ height: 43px;
+ line-height: 43px;
+ padding-right: 10px;
+ border-top: 1px solid #EFEFEF;
+ }
- .quanjing {
- width: 100%;
- height: 100%;
- object-fit: cover;
- cursor: pointer;
- position: relative;
- }
+ .itemValue {
+ font-size: 14px;
+ color: #747e91;
+ text-align: center;
+ width: 74%;
- .videotime {
- width: 100%;
- height: 100%;
- position: relative;
+ }
- .videoDisplay {
- width: 100%;
- height: 100%;
- object-fit: cover;
- }
- }
- .itemName {
- position: absolute;
- bottom: 0;
- left: 0;
- height: 23px;
- width: 100%;
- background: rgba(22, 22, 22, 0.68);
- border-radius: 0px 0px 4px 4px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 14px;
- color: #ffffff;
- line-height: 23px;
- z-index: 9;
- padding: 0 6px;
- }
- }
+ .flightEvents {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 10px 10px;
+ width: 74%;
+ justify-content: center;
-.videobutton {
- position: absolute;
- top: 40%;
- left: 50%;
- transform: translate(-50%);
- cursor: pointer;
- width: 40px;
- height: 40px;
- display: inline-block;
- background: #999;
- border-radius: 50%;
- }
- .videoDisplay {
- display: flex;
- flex-wrap: wrap;
- width: 200px;
- height: 200px;
+ img {
+ width: 30px;
+ height: 30px;
+ }
+ }
- }
+ }
- .videotime {
- position: relative;
- }
+ .imgListBox {
+ display: grid;
+ grid-template-columns: repeat(5, 1fr);
+ gap: 10px;
+ margin-bottom: 49px;
- }
+ >* {
+ width: 100%;
+ height: 200px;
+ position: relative;
+ border-radius: 0px 0px 4px 4px;
+ overflow: hidden;
+ }
- .content-right {
- position: relative;
- width: 0;
- flex-grow: 1;
- background: #19ad8d;
- margin-right: 17px;
- overflow: hidden;
+ :deep(.el-checkbox__inner) {
+ width: 17px !important;
+ height: 17px !important;
+ background: rgba(37, 36, 36, 0.63) !important;
+ border-radius: 4px 4px 4px 4px;
+ border: 1px solid #ffffff !important;
+ }
- .content-map-popups {
- pointer-events: none;
+ .el-checkbox {
+ position: absolute;
+ top: 0;
+ left: 6px;
+ }
- > * {
- pointer-events: auto !important;
- }
- }
- }
+ :deep(.el-checkbox__inner:after) {
+ position: absolute;
+ left: 50% !important;
+ top: 40% !important;
+ transform: translate(-50%, -50%) rotate(45deg) !important;
+ }
+
+ :deep(.el-checkbox.is-checked .el-checkbox__inner) {
+ background-color: #09297b !important;
+ border-color: #1c5cff !important;
+ }
+
+ .el-image {
+ width: 100%;
+ height: 100%;
+ cursor: pointer;
+ position: relative;
+ }
+
+ .quanjing {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ cursor: pointer;
+ position: relative;
+ }
+
+ .videotime {
+ width: 100%;
+ height: 100%;
+ position: relative;
+
+ .videoDisplay {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ }
+ }
+
+ .itemName {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ height: 23px;
+ width: 100%;
+ background: rgba(22, 22, 22, 0.68);
+ border-radius: 0px 0px 4px 4px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #ffffff;
+ line-height: 23px;
+ z-index: 9;
+ padding: 0 6px;
+ }
+ }
+
+ .videobutton {
+ position: absolute;
+ top: 40%;
+ left: 50%;
+ transform: translate(-50%);
+ cursor: pointer;
+ width: 40px;
+ height: 40px;
+ display: inline-block;
+ background: #999;
+ border-radius: 50%;
+ }
+
+ .videoDisplay {
+ display: flex;
+ flex-wrap: wrap;
+ width: 200px;
+ height: 200px;
+
+ }
+
+ .videotime {
+ position: relative;
+ }
+
+ }
+
+ .content-right {
+ position: relative;
+ width: 0;
+ flex-grow: 1;
+ background: #19ad8d;
+ margin-right: 17px;
+ overflow: hidden;
+
+ .content-map-popups {
+ pointer-events: none;
+
+ >* {
+ pointer-events: auto !important;
+ }
+ }
+ }
}
</style>
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index 4047f90..20e4163 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -301,7 +301,7 @@
}
})
.catch(() => {
- ElMessage.warning('已取消删除');
+
});
};
// 新增围栏
diff --git a/src/views/wel/components/flightStatistics.vue b/src/views/wel/components/flightStatistics.vue
index 6034068..d37d615 100644
--- a/src/views/wel/components/flightStatistics.vue
+++ b/src/views/wel/components/flightStatistics.vue
@@ -493,15 +493,19 @@
margin-left: 15px;
border-radius: 4px;
- .card-item {
+.card-item {
width: 94px;
height: 100%;
- line-height: 28px;
+ // line-height: 28px;
cursor: pointer;
font-family: 'Source Han Sans CN';
font-weight: 400;
font-size: 14px;
color: #7c8091;
+ border: 1px solid transparent;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.card-item:first-child {
diff --git a/src/views/wel/components/flyratio.vue b/src/views/wel/components/flyratio.vue
index 1488c6a..9847840 100644
--- a/src/views/wel/components/flyratio.vue
+++ b/src/views/wel/components/flyratio.vue
@@ -326,15 +326,19 @@
margin-left: 15px;
border-radius: 4px;
- .card-item {
+.card-item {
width: 94px;
height: 100%;
- line-height: 28px;
+ // line-height: 28px;
cursor: pointer;
font-family: 'Source Han Sans CN';
font-weight: 400;
font-size: 14px;
color: #7c8091;
+ border: 1px solid transparent;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.card-item:first-child {
diff --git a/src/views/wel/components/proportionStatic.vue b/src/views/wel/components/proportionStatic.vue
index 4a063df..5ffee27 100644
--- a/src/views/wel/components/proportionStatic.vue
+++ b/src/views/wel/components/proportionStatic.vue
@@ -28,7 +28,7 @@
<div class="ratio">
占比
<span :style="{ color: item.color }"
- >{{ ((item.rate * 100) / 100).toFixed(2) }}%</span
+ >{{ item.rate || 0 }}%</span
>
</div>
</div>
@@ -133,12 +133,13 @@
let { chart } = useEchartsResize(echartsRef);
const initChart = val => {
let totalNum = val[0].num //val.reduce((sum, item) => sum + item.num, 0);
+ let filteredData = val.filter(item => item.name !== "全部状态");
const data = {
total: {
title: '总计',
figure: totalNum.toString(), // 动态计算总数
},
- data: val.map(item => ({
+ data: filteredData.map(item => ({
value: item.num,
name: item.name,
rate: _.round((item.num/totalNum)*100, 1),
@@ -147,7 +148,7 @@
const containerWidth = chart.value.clientWidth;
const isSmallScreen = containerWidth < 768; // 移动端判断
const echartsOption = {
- color: ['#FF472F', '#FF7411', '#FFC300', '#0291A1'],
+ color: ['#0291A1', '#FF7411', '#FFC300', '#FF472F'],
tooltip: {
trigger: 'item',
padding: 0,
@@ -366,12 +367,16 @@
.card-item {
width: 94px;
height: 100%;
- line-height: 28px;
+ // line-height: 28px;
cursor: pointer;
font-family: 'Source Han Sans CN';
font-weight: 400;
font-size: 14px;
color: #7c8091;
+ border: 1px solid transparent;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.card-item:first-child {
diff --git a/src/views/wel/components/taskOutcome.vue b/src/views/wel/components/taskOutcome.vue
index 773c115..e1ea1ad 100644
--- a/src/views/wel/components/taskOutcome.vue
+++ b/src/views/wel/components/taskOutcome.vue
@@ -278,15 +278,19 @@
margin-left: 15px;
border-radius: 4px;
- .card-item {
+.card-item {
width: 94px;
height: 100%;
- line-height: 28px;
+ // line-height: 28px;
cursor: pointer;
font-family: 'Source Han Sans CN';
font-weight: 400;
font-size: 14px;
color: #7c8091;
+ border: 1px solid transparent;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.card-item:first-child {
--
Gitblit v1.9.3