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 | 179 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 111 insertions(+), 68 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 50543cd..4e8ae71 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,11 +82,12 @@
<span class="delete" @click="deleteDetail(scope.row)" v-if="scope.row.resultType !== 2"
>删除</span
>
- <!-- && !isTifFile(scope.row.nickName) -->
+ <!-- && !isTifFile(scope.row.nickName)
+ scope.row.resultType !== 1-->
<span
class="location"
@click="positionDetail(scope.row)"
- v-if="scope.row.resultType !== 1"
+ v-if="shouldShowLocation(scope.row)"
>定位</span
>
</template>
@@ -103,7 +108,7 @@
/>
</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">{{ detailTitle }}</h4>
@@ -129,11 +134,11 @@
<div class="title">
<div class="inputEdit">
文件名称：<span class="fileTitle" v-if="!dialogDetailList?.checkedinput">{{
- dialogDetailList?.nickName
+ dialogDetailList?.editName
}}</span>
<el-input
v-else
- v-model="dialogDetailList.nickName"
+ v-model="dialogDetailList.editName"
@keyup.enter="saveTitle()"
class="title-input"
clearable
@@ -218,8 +223,9 @@
import { Cartesian3 } from 'cesium';
import * as Cesium from 'cesium';
import EventPopUpBox from '@/hooks/components/EventPopUpBox.vue';
-import { render } from '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;
@@ -247,6 +253,9 @@
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';
@@ -272,6 +281,40 @@
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(() => {
+ // 检查表格数据中是否有任何行的 regionName 处理后不为空
+ return tableData.value.some(row => {
+ const processed = processAddress(row.regionName || '');
+ return processed !== '';
+ });
+});
const loadings = ref(true);
let loading;
const total = ref(0);
@@ -424,6 +467,7 @@
const params = {
...jobListParams.searchParams,
};
+ params.areaCode = '';
downloadApi(params).then(res => {
aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
loading.close();
@@ -477,13 +521,13 @@
// 保存文件名
const saveTitle = item => {
const updateparams = {
- id: Number(item.id),
- nickName: item.nickName,
+ id: item.id,
+ nickName: `${item.editName.trim()}`,
};
// 验证并提示
if (!validateNickname(updateparams.nickName, '名称')) return;
item.checkedinput = false;
- detailTitle.value = item.nickName;
+ detailTitle.value = item.editName;
updataTitleApi(updateparams)
.then(res => {
if (res.status === 200) {
@@ -497,52 +541,6 @@
console.error('API error:', error);
});
};
-
-// 查看弹框
-function isTifFile(filename) {
- const lastDot = filename.lastIndexOf('.');
- if (lastDot === -1) return false; // 无后缀
- return filename.slice(lastDot + 1).toLowerCase() === 'tif';
-}
-const dialogVisible = ref(false);
-const dialogDetailList = ref(null);
-const detailTitle = ref('');
-let curCustomImageryProvider = null;
-const lookDetail = val => {
- console.log('查看', val);
- if (val.resultType === 4) {
- // 正射
- getOrthoimageInfo(val.wayLineJobId).then(res => {
- console.log('正射', res.data.data);
- detailTitle.value = val.nickName;
- dialogDetailList.value = val;
- 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=${
- res.data.data.odmToken.split(' ')[1]
- }`,
-
- })
- );
-
- yxShowBox.value = true;
- }
- dialogVisible.value = true;
- });
- } else {
- getAttachInfoAPI(val.id).then(res => {
- detailTitle.value = res.data.data.nickName;
- dialogDetailList.value = res.data.data;
- dialogDetailList.value = { ...res.data.data, checkedinput: false };
- // console.log('detailTitle.value',dialogDetailList.value);
- dialogVisible.value = true;
- });
- }
-};
-
// 正射地图
const yxShowBox = ref(false);
@@ -568,24 +566,69 @@
});
viewer = viewInstance.value.getViewer();
viewerRef.value = viewer;
+
isMapInitialized.value = true;
- console.log('地图初始化完成');
+
+ // console.log('地图初始化完成');
};
-// 监听对话框状态
-watch(dialogVisible, newVal => {
- if (newVal) {
- nextTick(() => {
+// 查看弹框
+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 {
- // 对话框关闭时清理资源
- viewInstance.value?.viewerDestroy();
- viewer = null;
- isMapInitialized.value = false;
- // removeHandler();
+ 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();
// 监听打开全景事件
@@ -597,7 +640,7 @@
onBeforeUnmount(() => {
// 组件卸载时移除事件监听，防止内存泄漏
EventBus.off('open-panorama');
- viewInstance.value.removeAllCustomImageryProviderDataSource(curCustomImageryProvider);
+ viewInstance.value?.removeAllCustomImageryProviderDataSource(curCustomImageryProvider);
viewInstance.value?.viewerDestroy();
});
</script>
--
Gitblit v1.9.3