From 3eb608dbf40183b29bb31fe89aa1e3824b9929bf Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 27 Jun 2025 14:36:58 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into test
---
src/views/dataCenter/dataCenter.vue | 226 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 172 insertions(+), 54 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 69a17cd..33b0e02 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -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 />
@@ -78,12 +82,11 @@
<span class="delete" @click="deleteDetail(scope.row)" v-if="scope.row.resultType !== 2"
>删除</span
>
- <!-- && !isTifFile(scope.row.nickName)
- scope.row.resultType !== 1-->
+
<span
class="location"
@click="positionDetail(scope.row)"
- v-if="shouldShowLocation(scope.row)"
+ v-if="shouldShowLocation(scope.row)"
>定位</span
>
</template>
@@ -112,15 +115,33 @@
</template>
<div class="detailContainer">
<div class="leftImg">
- <img
+ <!-- <img
v-if="dialogDetailList?.resultType === 1"
:src="convertVideoUrlToThumbnail(dialogDetailList?.link)"
alt=""
class="imageBox"
- />
+ /> -->
+ <!-- 视频 -->
+ <video
+ v-if="dialogDetailList?.resultType === 1"
+ style="width: 100%"
+ class="imageBox"
+ ref="videoRefs"
+ controls
+ autoplay
+ :src="dialogDetailList.link"
+ ></video>
+ <!-- 全景 -->
+ <!-- <img
+ class="quanjing"
+ @click="clickpanorama(dialogDetailList)"
+ v-else-if="dialogDetailList?.resultType === 5"
+ :src="dialogDetailList?.resultType?.smallUrl"
+ alt=""
+ /> -->
<!-- 地图 -->
<div
- v-if="dialogDetailList?.resultType === 4"
+ v-else-if="dialogDetailList?.resultType === 4"
id="detaildataCenterMap"
class="ztzf-cesium"
></div>
@@ -130,7 +151,7 @@
<div class="title">
<div class="inputEdit">
文件名称：<span class="fileTitle" v-if="!dialogDetailList?.checkedinput">{{
- dialogDetailList?.nickName
+ dialogDetailList?.nickName ? dialogDetailList?.nickName : '--'
}}</span>
<el-input
v-else
@@ -150,19 +171,41 @@
</div>
</div>
</div>
- <div>任务名称：{{ dialogDetailList?.jobName }}</div>
- <div>所属区域：{{ dialogDetailList?.regionName }}</div>
- <div>拍摄机巢：{{ dialogDetailList?.nestName }}</div>
+ <div>任务名称：{{ dialogDetailList?.jobName ? dialogDetailList?.jobName : '--' }}</div>
+ <div>
+ 所属区域：{{ dialogDetailList?.regionName ? dialogDetailList?.regionName : '--' }}
+ </div>
+ <div>拍摄机巢：{{ dialogDetailList?.nestName ? 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>照片文件大小：{{ bytesToMB(dialogDetailList?.attachSize) }}</div>
+ <div>任务时间：{{ dialogDetailList?.jobTime ? dialogDetailList?.jobTime : '--' }}</div>
+ <div>
+ 拍摄时间：{{ dialogDetailList?.createTime ? dialogDetailList?.createTime : '--' }}
+ </div>
+ <div>
+ 文件类型：{{
+ photoTypeMap[dialogDetailList?.photoType]
+ ? photoTypeMap[dialogDetailList?.photoType]
+ : '--'
+ }}
+ </div>
+ <div>
+ 文件格式：{{
+ resultTypeMap[dialogDetailList?.resultType]
+ ? resultTypeMap[dialogDetailList?.resultType]
+ : '--'
+ }}
+ </div>
+ <div>
+ 照片文件大小：{{
+ bytesToMB(dialogDetailList?.attachSize)
+ ? bytesToMB(dialogDetailList?.attachSize)
+ : '--'
+ }}
+ </div>
<div>
<el-button
type="success"
@@ -221,6 +264,7 @@
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;
@@ -248,6 +292,7 @@
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';
@@ -273,7 +318,35 @@
visible: '可见光',
ir: '红外',
};
+// 判断省市区
+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(() => {
+ // 是否显示列
+ return tableData.value.some(row => {
+ const processed = processAddress(row.regionName || '');
+ return processed !== '';
+ });
+});
const loadings = ref(true);
let loading;
const total = ref(0);
@@ -311,8 +384,12 @@
orderByCreateTime: jobListParams.orderByCreateTime,
...jobListParams.searchParams,
};
- getaiImagesPageAPI(params, { current: jobListParams.current, size: jobListParams.size }).then(
- res => {
+
+ 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,
@@ -322,10 +399,14 @@
showUrl: getShowImg(i?.link),
file_name: i.name.split('/').pop(),
}));
- // console.log('res', tableData.value);
- loadings.value = false;
- }
- );
+ })
+ .catch(error => {
+ // 可选：这里可以添加错误处理逻辑
+ console.error("获取数据失败:", error);
+ })
+ .finally(() => {
+ loadings.value = false; // 无论成功失败都会执行
+ });
};
// 查询
const searchClick = params => {
@@ -384,13 +465,12 @@
const fileDownload = () => {
const list = selectedRows.value.filter(i => i.checked);
if (!list?.length) return ElMessage.warning('请选择文件');
- if (list.length === 1) {
- list.forEach((item, index) => {
- setTimeout(() => {
- aLinkDownload(item.url, item?.nickName);
- }, index * 500); // 每个文件下载间隔50毫秒
- });
- } else {
+ if (list.length === 1) {
+ list.forEach((item, index) => {
+ const suffix = item.url.split('.').pop()
+ aLinkDownload(item.url, item.nickName + '.' + suffix)
+ })
+ } else {
loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' });
const fileIds = list.map(i => i.id);
let aaa = {
@@ -417,7 +497,8 @@
fileDownload();
};
const detailDownLoad = val => {
- aLinkDownload(val.link, val?.nickName);
+ const suffix = val.url?.split('.').pop()
+ aLinkDownload(val.link, val?.nickName + '.' + suffix);
};
// 全部下载
const aLLDownloadFile = () => {
@@ -480,8 +561,8 @@
// 保存文件名
const saveTitle = item => {
const updateparams = {
- id: Number(item.id),
- nickName: item.nickName,
+ id: item.id,
+ nickName: `${item.nickName.trim()}`,
};
// 验证并提示
if (!validateNickname(updateparams.nickName, '名称')) return;
@@ -491,6 +572,7 @@
.then(res => {
if (res.status === 200) {
ElMessage.success('修改成功');
+ getaiImagesPage();
} else {
ElMessage.error(res.data.message || '修改失败');
}
@@ -502,7 +584,6 @@
};
// 正射地图
const yxShowBox = ref(false);
-
const removeHandler = () => {
handler?.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
handler?.destroy();
@@ -530,36 +611,38 @@
// 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 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 positiongeom = ref('');
const odmToken = ref(null);
const lookDetail = val => {
- // console.log('查看', val);
if (val.resultType === 4) {
// 正射
getOrthoimageInfo(val.wayLineJobId).then(async res => {
dialogVisible.value = true;
- // console.log('正射', res.data.data);
detailTitle.value = val.nickName;
- dialogDetailList.value = val;
- await nextTick()
+ dialogDetailList.value = val;
+ console.log('3333', detailTitle.value, dialogDetailList.value);
+
+ await nextTick();
initMap();
+ positiongeom.value = res.data.data.geom;
orthoimageApi.value = res.data.data.orthoimageApi;
odmToken.value = res.data.data.odmToken;
if (res.data.data != null && isMapInitialized.value === true) {
- // console.log('viewer', viewer);
curCustomImageryProvider = viewInstance.value.addCustomImageryProviderDataSource(
new Cesium.UrlTemplateImageryProvider({
url: `${import.meta.env.VITE_APP_AREA_NAME}/webodm${res.data.data.orthoimageApi}?jwt=${
@@ -567,28 +650,63 @@
}`,
// maximumLevel: 12,
})
-
);
-
yxShowBox.value = true;
+ // 添加定位
+ if (positiongeom.value) {
+ // 解析WKT格式的多边形坐标
+ const wktString = positiongeom.value;
+ const coordinates = parseWKTCoordinates(wktString);
+ if (coordinates.length > 0) {
+ // 创建多边形边界
+ const positions = coordinates.map(coord =>
+ Cesium.Cartesian3.fromDegrees(coord[0], coord[1])
+ );
+ // 计算多边形的包围球
+ const boundingSphere = Cesium.BoundingSphere.fromPoints(positions);
+ const viewer = viewInstance.value.getViewer();
+ if (viewer && viewer.camera) {
+ viewer.camera.flyToBoundingSphere(boundingSphere, {
+ duration: 0, // 飞行动画持续时间（秒）
+ offset: new Cesium.HeadingPitchRange(0, -0.5, boundingSphere.radius * 1.5),
+ });
+ } else {
+ console.error('无法获取有效的 Viewer 或 camera 对象');
+ }
+ }
+ }
}
-
});
} else {
getAttachInfoAPI(val.id).then(res => {
- detailTitle.value = res.data.data.nickName;
- dialogDetailList.value = res.data.data;
- dialogDetailList.value = { ...res.data.data, checkedinput: false };
+ detailTitle.value = res.data.data.nickName.split('.jpeg')[0];
+ 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;
+// WKT坐标解析函数
+function parseWKTCoordinates(wktString) {
+ // 解析POLYGON格式的WKT字符串
+ const regex = /POLYGON\s*\(\((.*?)\)\)/i;
+ const match = wktString.match(regex);
+ if (!match || !match[1]) return [];
+ // 分割坐标对
+ const coordinatePairs = match[1].split(/,\s*/);
+ return coordinatePairs.map(pair => {
+ const [lon, lat] = pair.trim().split(/\s+/).map(Number);
+ return [lon, lat];
+ });
+}
+function dialogClose() {
+ // 对话框关闭时清理资源
+ viewInstance.value?.viewerDestroy();
+ viewer = null;
+ isMapInitialized.value = false;
}
onMounted(() => {
getaiImagesPage();
--
Gitblit v1.9.3