From b5bf355a9551f954ba7bb1d4e9ba0904fa3be6f3 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 19 Jun 2025 18:38:57 +0800
Subject: [PATCH] feat:区域显示
---
src/views/dataCenter/dataCenter.vue | 490 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 376 insertions(+), 114 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 131a552..4e8ae71 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -8,7 +8,7 @@
<!-- 表格部分 -->
<div class="dataTable">
<el-table
- v-loading="loading"
+ v-loading="loadings"
element-loading-text="加载中"
stripe
:data="tableData"
@@ -25,7 +25,11 @@
}}
</template>
</el-table-column>
- <el-table-column prop="regionName" label="所属区域" />
+ <el-table-column prop="regionName" label="所属区域" v-if="!isDistrictLevel">
+ <template #default="scope">
+ <span>{{processAddress(scope.row.regionName)}}</span>
+ </template>
+ </el-table-column>
<el-table-column property="nestName" label="所属机巢" />
<el-table-column property="jobName" label="任务名称" show-overflow-tooltip />
<el-table-column prop="nickName" label="文件名称" show-overflow-tooltip />
@@ -34,21 +38,28 @@
<img
class="quanjing"
@click="clickpanorama(scope.row)"
- v-if="scope.row?.resultType === 3"
- :src="scope.row.link"
+ v-if="scope.row?.resultType === 5"
+ :src="scope.row?.smallUrl"
alt=""
/>
<img
v-else-if="scope.row?.resultType === 1"
- :src="convertVideoUrlToThumbnail(scope.row.link)"
+ :src="convertVideoUrlToThumbnail(scope.row?.link)"
alt=""
class="imageBox"
@click="enterFullScreen(scope.row)"
/>
+ <!-- 正射 -->
+ <img
+ v-else-if="scope.row?.resultType === 4"
+ :src="getzsSmallImg(scope.row?.link)"
+ alt=""
+ class="imageBox"
+ />
<el-image
v-else
- :src="scope.row.smallUrl"
- :preview-src-list="[scope.row.showUrl]"
+ :src="scope.row?.smallUrl"
+ :preview-src-list="[scope.row?.showUrl]"
fit="cover"
preview-teleported
/>
@@ -68,13 +79,15 @@
<el-table-column label="操作" width="150" align="center">
<template #default="scope">
<span class="look" @click="lookDetail(scope.row)">查看</span>
- <span
- class="delete"
- @click="deleteDetail(scope.row)"
- v-if="scope.row.fileformat !== 'AI识别'"
+ <span class="delete" @click="deleteDetail(scope.row)" v-if="scope.row.resultType !== 2"
>删除</span
>
- <span class="location" @click="positionDetail()" v-if="scope.row.fileformat !== '视频'"
+ <!-- && !isTifFile(scope.row.nickName)
+ scope.row.resultType !== 1-->
+ <span
+ class="location"
+ @click="positionDetail(scope.row)"
+ v-if="shouldShowLocation(scope.row)"
>定位</span
>
</template>
@@ -95,56 +108,74 @@
/>
</div>
<!-- 查看弹框 -->
- <el-dialog v-model="dialogVisible" width="60%" append-to-body>
+ <el-dialog v-model="dialogVisible" width="60%" append-to-body @close="dialogClose">
<template #header="{ titleId, titleClass }">
<div class="my-header">
- <h4 :id="titleId" :class="titleClass">{{ dialogDetailList?.filename }}</h4>
- <el-button type="success" plain icon="el-icon-download">下载</el-button>
+ <h4 :id="titleId" :class="titleClass">{{ detailTitle }}</h4>
</div>
</template>
<div class="detailContainer">
<div class="leftImg">
<img
v-if="dialogDetailList?.resultType === 1"
- :src="convertVideoUrlToThumbnail(dialogDetailList.link)"
+ :src="convertVideoUrlToThumbnail(dialogDetailList?.link)"
alt=""
class="imageBox"
/>
- <img v-else :src="dialogDetailList.link" alt="" />
+ <!-- 地图 -->
+ <div
+ v-if="dialogDetailList?.resultType === 4"
+ id="detaildataCenterMap"
+ class="ztzf-cesium"
+ ></div>
+ <img v-else :src="getSmallImg(dialogDetailList?.link)" alt="" />
</div>
<div class="rightDetail">
<div class="title">
<div class="inputEdit">
- 文件名称：<span v-if="!dialogDetailList.checkedinput">{{
- dialogDetailList?.filename
+ 文件名称：<span class="fileTitle" v-if="!dialogDetailList?.checkedinput">{{
+ dialogDetailList?.editName
}}</span>
<el-input
v-else
- v-model="dialogDetailList.filename"
+ v-model="dialogDetailList.editName"
@keyup.enter="saveTitle()"
class="title-input"
clearable
/>
</div>
- <div class="editname" @click="editTitle(dialogDetailList)">
- <span v-if="!dialogDetailList.checkedinput"
+ <div class="editname">
+ <span v-if="!dialogDetailList?.checkedinput" @click="editTitle(dialogDetailList)"
><el-icon><Edit /></el-icon
></span>
<div v-else class="suffixBoxEdit">
- <div class="editText" @click="submitEditSuffix(item, index)">✔</div>
- <div class="editText" @click="cancelEditSuffix(item, index)">✖</div>
+ <div class="editText" @click="submitEditSuffix(dialogDetailList)">✔</div>
+ <div class="editText" @click="cancelEditSuffix(dialogDetailList)">✖</div>
</div>
</div>
</div>
<div>任务名称：{{ dialogDetailList?.jobName }}</div>
<div>所属区域：{{ dialogDetailList?.regionName }}</div>
- <div>拍摄机巢：{{ dialogDetailList?.nickName }}</div>
- <div>照片位置：{{ dialogDetailList?.longitude }},{{ dialogDetailList?.latitude }}</div>
+ <div>拍摄机巢：{{ dialogDetailList?.nestName }}</div>
+ <div>
+ 照片位置：{{ _.round(dialogDetailList?.longitude, 3) }},{{
+ _.round(dialogDetailList?.latitude, 3)
+ }}
+ </div>
<div>任务时间：{{ dialogDetailList?.jobTime }}</div>
<div>拍摄时间：{{ dialogDetailList?.createTime }}</div>
<div>文件类型：{{ photoTypeMap[dialogDetailList?.photoType] }}</div>
<div>文件格式：{{ resultTypeMap[dialogDetailList?.resultType] }}</div>
- <div>照片文件大小：{{ dialogDetailList?.attachSize }}</div>
+ <div>照片文件大小：{{ bytesToMB(dialogDetailList?.attachSize) }}</div>
+ <div>
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-download"
+ @click="detailDownLoad(dialogDetailList)"
+ >下载</el-button
+ >
+ </div>
</div>
</div>
</el-dialog>
@@ -176,25 +207,59 @@
</div>
</el-dialog>
<!-- 地图弹框 -->
- <dataCenterMap v-model:show="dataCenterMapVisible"></dataCenterMap>
+ <dataCenterMap
+ ref="mapComponent"
+ v-model:show="dataCenterMapVisible"
+ :jobId="jobId"
+ @lookDetail="lookDetail"
+ :dotData="mapList"
+ ></dataCenterMap>
</div>
</template>
<script setup>
+import { useStore } from 'vuex';
+import { PublicCesium } from '@/utils/cesium/publicCesium';
+import { Cartesian3 } from 'cesium';
+import * as Cesium from 'cesium';
+import EventPopUpBox from '@/hooks/components/EventPopUpBox.vue';
+import { nextTick, render } from 'vue';
+import defaultIcon from '@/assets/images/dataCenter/datamap/eventCompleted.png';
+const userInfo = computed(() => store.getters.userInfo);
+const isShow = defineModel('show');
+const viewerRef = shallowRef(null);
+let viewer = null;
+
+const viewInstance = shallowRef(null);
+const store = useStore();
+const currentAreaPosition = ref({ height: 1987280, latitude: 27.636112, longitude: 115.732975 });
+let handler = null;
+
+import EventBus from '@/utils/eventBus';
import dataCenterMap from '@/views/dataCenter/components/dataCenterMap.vue';
import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue'; //全景
import { ElMessage, ElMessageBox, ElLoading } from 'element-plus';
import searchData from '@/views/dataCenter/components/searchData.vue';
import fy1 from '@/assets/images/dataCenter/1.jpeg';
+import _ from 'lodash';
import {
getaiImagesPageAPI,
getAttachInfoAPI,
deleteFileMultipleApi,
downloadApi,
+ updataTitleApi,
+ getOrthoimageInfo,
} from '@/api/dataCenter/dataCenter';
-import { getShowImg, getSmallImg } from '@/utils/util';
-import { onMounted } from 'vue';
+import { getShowImg, getSmallImg, getzsSmallImg } from '@/utils/util';
+import { onMounted, watch } from 'vue';
import dayjs from 'dayjs';
+
+
+
+function bytesToMB(bytes, decimalPlaces = 2) {
+ if (typeof bytes !== 'number' || bytes < 0) return '无效输入';
+ return (bytes / 1048576).toFixed(decimalPlaces) + ' MB';
+}
// 视频一帧
function convertVideoUrlToThumbnail(videoUrl) {
// 检查是否是有效的视频URL
@@ -209,19 +274,69 @@
0: '照片',
1: '视频',
2: 'AI识别',
- 3: '全景',
+ 5: '全景',
4: '正射',
};
const photoTypeMap = {
visible: '可见光',
ir: '红外',
};
-const loading = ref(true);
+// 判断省市区
+const areaCode = userInfo.value?.detail?.areaCode || '';
+
+// 判断账号级别
+const isProvinceLevel = computed(() => areaCode.endsWith('00000000')); // 省级：后8位为0
+const isCityLevel = computed(() => !isProvinceLevel.value && areaCode.endsWith('000000')); // 市级：后6位为0
+const isDistrictLevel = computed(() => !isProvinceLevel.value && !isCityLevel.value); // 区县级
+
+// 处理区域名称的函数
+function processAddress(str) {
+ if (!str) return '';
+
+ const parts = str.split(',');
+
+ // 省级账号：显示市和区（去除省级）
+ if (isProvinceLevel.value) {
+ return parts.filter(part => !part.endsWith('省')).join(',');
+ }
+
+ // 市级账号：只显示区（去除省和市）
+ if (isCityLevel.value) {
+ return parts.filter(part => !part.endsWith('省') && !part.endsWith('市')).join(',');
+ }
+
+ // 区县级账号：不显示区域信息（在模板中已隐藏该列）
+ return '';
+}
+const showRegionColumn = computed(() => {
+ // 检查表格数据中是否有任何行的 regionName 处理后不为空
+ return tableData.value.some(row => {
+ const processed = processAddress(row.regionName || '');
+ return processed !== '';
+ });
+});
+const loadings = ref(true);
+let loading;
const total = ref(0);
const startTime = dayjs().subtract(6, 'day').startOf('day');
const endTime = dayjs().endOf('day');
const timeRange = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
-
+// 全景预览
+const panoramaParamsShow = ref(false);
+const panoramaParamsUrl = ref(null);
+const clickpanorama = val => {
+ panoramaParamsShow.value = true;
+ panoramaParamsUrl.value = val.link;
+};
+// 视频
+const currentVideoTitle = ref('');
+const VideoShow = ref(false);
+const currentVideoUrl = ref(null);
+const enterFullScreen = val => {
+ currentVideoTitle.value = val?.nickName;
+ currentVideoUrl.value = val?.link;
+ VideoShow.value = true;
+};
const jobListParams = reactive({
current: 1,
size: 10,
@@ -232,25 +347,26 @@
// 获取列表数据
const getaiImagesPage = () => {
- getaiImagesPageAPI({
- current: jobListParams.current,
- size: jobListParams.size,
+ loadings.value = true;
+ const params = {
orderByCreateTime: jobListParams.orderByCreateTime,
...jobListParams.searchParams,
- }).then(res => {
- loading.value = true;
- total.value = res.data.data.total;
- tableData.value = res.data.data.records.map(i => ({
- ...i,
- checked: false,
- url: i.link,
- smallUrl: getSmallImg(i.link),
- showUrl: getShowImg(i.link),
- file_name: i.name.split('/').pop(),
- }));
- console.log('res', tableData.value);
- loading.value = false;
- });
+ };
+ getaiImagesPageAPI(params, { current: jobListParams.current, size: jobListParams.size }).then(
+ res => {
+ total.value = res.data.data.total;
+ tableData.value = res.data.data.records.map(i => ({
+ ...i,
+ checked: false,
+ url: i?.link,
+ smallUrl: getSmallImg(i?.link),
+ showUrl: getShowImg(i?.link),
+ file_name: i.name.split('/').pop(),
+ }));
+ // console.log('res', tableData.value);
+ loadings.value = false;
+ }
+ );
};
// 查询
const searchClick = params => {
@@ -262,13 +378,10 @@
const handleSizeChange = val => {
jobListParams.size = val;
getaiImagesPage();
-
- console.log('jobListParams.size', jobListParams.size);
};
const handleCurrentChange = val => {
jobListParams.current = val;
getaiImagesPage();
- console.log('jobListParams.current', jobListParams.current);
};
// 多选
const selectedRows = ref([]);
@@ -279,6 +392,25 @@
});
selectedRows.value = val;
+};
+// 删除
+const deleteDetail = val => {
+ ElMessageBox.confirm('您确定删除吗?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ deleteFileMultipleApi(val.id)
+ .then(res => {
+ ElMessage.success('删除成功');
+ getaiImagesPage();
+ })
+ .catch(error => {
+ ElMessage.error('删除失败');
+ });
+ })
+ .catch(() => {});
};
// url下载
function aLinkDownload(url, name) {
@@ -296,14 +428,12 @@
if (list.length === 1) {
list.forEach((item, index) => {
setTimeout(() => {
- // console.log('item.url, item.file_name', item.url, item.nickName)
- aLinkDownload(item.url, item.nickName);
+ aLinkDownload(item.url, item?.nickName);
}, index * 500); // 每个文件下载间隔50毫秒
});
} else {
- // loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })
- const fileIds = list.map(i => Number(i.id));
- console.log('fileIds', fileIds, list);
+ loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' });
+ const fileIds = list.map(i => i.id);
let aaa = {
areaCode: '',
attachIds: fileIds,
@@ -318,9 +448,8 @@
};
downloadApi(aaa).then(res => {
- console.log('res.data.data', res.data.data);
- // aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
- // loading.close()
+ aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
+ loading.close();
});
}
};
@@ -328,70 +457,191 @@
const downloadFile = () => {
fileDownload();
};
+const detailDownLoad = val => {
+ aLinkDownload(val.link, val?.nickName);
+};
// 全部下载
const aLLDownloadFile = () => {
- console.log('全部下载');
-};
-// 查看弹框
-const dialogVisible = ref(false);
-const dialogDetailList = ref(null);
-const lookDetail = val => {
-console.log('val',val);
+ loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' });
- getAttachInfoAPI(val.id).then(res => {
- dialogDetailList.value = res.data.data;
+ const params = {
+ ...jobListParams.searchParams,
+ };
+ params.areaCode = '';
+ downloadApi(params).then(res => {
+ aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
+ loading.close();
});
- dialogVisible.value = true;
-};
-// 删除
-const deleteDetail = val => {
- ElMessageBox.confirm('您确定删除吗?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(() => {
- deleteFileMultipleApi(val.id)
- .then(res => {
- console.log('删除成功', res);
- ElMessage.success('删除成功');
- getaiImagesPage();
- })
- .catch(error => {
- ElMessage.error('删除失败');
- });
- })
- .catch(() => {});
-};
-// 编辑文件名
-const editTitle = val => {
- // console.log('val', val);
- val.checkedinput = !val.checkedinput;
-};
-// 全景预览
-const panoramaParamsShow = ref(false);
-const panoramaParamsUrl = ref(null);
-const clickpanorama = val => {
- panoramaParamsShow.value = true;
- panoramaParamsUrl.value = val.img;
- // console.log('全景', val);
-};
-// 视频
-const currentVideoTitle = ref('');
-const VideoShow = ref(false);
-const currentVideoUrl = ref(null);
-const enterFullScreen = val => {
- currentVideoTitle.value = val.nickName;
- currentVideoUrl.value = val.link;
- VideoShow.value = true;
};
// 地图弹框
+const mapComponent = ref(null); // 创建子组件引用
+const mapList = ref(null);
const dataCenterMapVisible = ref(false);
-const positionDetail = () => {
+const jobId = ref('');
+const statusType = ref(null);
+const positionDetail = val => {
+ jobId.value = val.wayLineJobId;
+ mapList.value = val;
dataCenterMapVisible.value = true;
+ // 确保地图组件加载完成
+ nextTick(() => {
+ if (mapComponent.value) {
+ // 调用子组件方法并传递数据
+ mapComponent.value.initEntityOrPopup(val);
+ }
+ });
};
+
+const fileNameedit = ref('');
+// 编辑文件名
+const editTitle = val => {
+ val.checkedinput = true;
+ fileNameedit.value = val?.nickName;
+};
+// 取消
+const cancelEditSuffix = item => {
+ item.nickName = fileNameedit.value;
+ item.checkedinput = false;
+};
+const submitEditSuffix = item => {
+ saveTitle(item);
+};
+// 通用空值检查函数
+const validateNickname = (name, fieldName) => {
+ if (!name || name.trim() === '') {
+ ElMessage.warning(`${fieldName}不能为空`);
+ return false;
+ }
+ if (name.length > 50) {
+ ElMessage.warning(`${fieldName}不能超过50个字符`);
+ return false;
+ }
+ return true;
+};
+// 保存文件名
+const saveTitle = item => {
+ const updateparams = {
+ id: item.id,
+ nickName: `${item.editName.trim()}`,
+ };
+ // 验证并提示
+ if (!validateNickname(updateparams.nickName, '名称')) return;
+ item.checkedinput = false;
+ detailTitle.value = item.editName;
+ updataTitleApi(updateparams)
+ .then(res => {
+ if (res.status === 200) {
+ ElMessage.success('修改成功');
+ } else {
+ ElMessage.error(res.data.message || '修改失败');
+ }
+ })
+ .catch(error => {
+ ElMessage.error('请求失败，请稍后重试');
+ console.error('API error:', error);
+ });
+};
+// 正射地图
+const yxShowBox = ref(false);
+
+const removeHandler = () => {
+ handler?.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ handler?.destroy();
+ handler = null;
+};
+const isMapInitialized = ref(false); //地图加载
+const initMap = () => {
+ if (viewer || isMapInitialized.value) return;
+
+ const container = document.getElementById('detaildataCenterMap');
+ if (!container) {
+ console.error('地图容器未找到');
+ return;
+ }
+ viewInstance.value = new PublicCesium({
+ dom: 'detaildataCenterMap',
+ flatMode: false,
+ terrain: false,
+ mapFilter: true,
+ });
+ viewer = viewInstance.value.getViewer();
+ viewerRef.value = viewer;
+
+ isMapInitialized.value = true;
+
+ // console.log('地图初始化完成');
+};
+// 查看弹框
+function isTifFile(filename) {
+ const lastDot = filename.lastIndexOf('.');
+ if (lastDot === -1) return false; // 无后缀
+ return filename.slice(lastDot + 1).toLowerCase() === 'tif';
+}
+const shouldShowLocation = row => {
+ return row.resultType !== 1 && row.resultType !== 4;
+};
+const dialogVisible = ref(false);
+const dialogDetailList = ref(null);
+const detailTitle = ref('');
+let curCustomImageryProvider = null;
+const orthoimageApi = ref('');
+const odmToken = ref(null);
+const lookDetail = val => {
+ if (val.resultType === 4) {
+ // 正射
+ getOrthoimageInfo(val.wayLineJobId).then(async res => {
+ dialogVisible.value = true;
+ detailTitle.value = val.nickName;
+ dialogDetailList.value = val;
+ await nextTick();
+ initMap();
+ orthoimageApi.value = res.data.data.orthoimageApi;
+ odmToken.value = res.data.data.odmToken;
+ if (res.data.data != null && isMapInitialized.value === true) {
+ curCustomImageryProvider = viewInstance.value.addCustomImageryProviderDataSource(
+ new Cesium.UrlTemplateImageryProvider({
+ url: `${import.meta.env.VITE_APP_AREA_NAME}/webodm${res.data.data.orthoimageApi}?jwt=${
+ res.data.data.odmToken.split(' ')[1]
+ }`,
+ // maximumLevel: 12,
+ })
+ );
+ yxShowBox.value = true;
+ }
+ });
+ } else {
+ getAttachInfoAPI(val.id).then(res => {
+ detailTitle.value = res.data.data.nickName.split('.jpeg')[0];
+ // dialogDetailList.value = res.data.data;
+ dialogDetailList.value = {
+ ...res.data.data,
+ checkedinput: false,
+ editName: res.data.data?.nickName?.split('.jpeg')[0],
+ };
+ dialogVisible.value = true;
+ });
+ }
+};
+
+function dialogClose() {
+ // 对话框关闭时清理资源
+ viewInstance.value?.viewerDestroy();
+ viewer = null;
+ isMapInitialized.value = false;
+}
onMounted(() => {
getaiImagesPage();
+ // 监听打开全景事件
+ EventBus.on('open-panorama', params => {
+ panoramaParamsShow.value = params.show;
+ panoramaParamsUrl.value = params.url;
+ });
+});
+onBeforeUnmount(() => {
+ // 组件卸载时移除事件监听，防止内存泄漏
+ EventBus.off('open-panorama');
+ viewInstance.value?.removeAllCustomImageryProviderDataSource(curCustomImageryProvider);
+ viewInstance.value?.viewerDestroy();
});
</script>
@@ -460,6 +710,10 @@
width: 100%;
height: 100%;
}
+ #detaildataCenterMap {
+ width: 100%;
+ height: 100%;
+ }
}
.rightDetail {
width: 30%;
@@ -473,6 +727,13 @@
.inputEdit {
display: flex;
align-items: center;
+ width: 100%;
+ .fileTitle {
+ width: 70%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
}
div {
@@ -482,6 +743,7 @@
}
.my-header :deep(.el-dialog__title) {
margin: 0 !important;
+ height: 19px;
}
.my-header {
display: flex;
--
Gitblit v1.9.3