From 0b484e9d970dab2d6902e893cb4dda15f484c1c1 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 19 Jun 2025 18:26:07 +0800
Subject: [PATCH] feat:区域显示
---
src/views/dataCenter/dataCenter.vue | 88 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 69a17cd..bcc7c58 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="所属区域" >
+ <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 />
@@ -83,7 +87,7 @@
<span
class="location"
@click="positionDetail(scope.row)"
- v-if="shouldShowLocation(scope.row)"
+ v-if="shouldShowLocation(scope.row)"
>定位</span
>
</template>
@@ -130,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
@@ -221,6 +225,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 +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';
@@ -273,7 +281,37 @@
visible: '可见光',
ir: '红外',
};
+// 判断省市区
+const areas = userInfo.value.detail.areaCode
+function processAddress(str) {
+ const parts = str.split(',');
+if(areas ==="360000000000"){
+ return parts.filter(part => !part.endsWith('省')).join(',');
+}
+ //
+ // // 检查是否有省级单位（以"省"结尾）
+ // const hasProvince = parts.some(part => part.endsWith('省'));
+ // // 检查是否有市级单位（以"市"结尾）
+ // const hasCity = parts.some(part => part.endsWith('市'));
+ // if (hasProvince) {
+ // // 移除省级部分（第一个以"省"结尾的元素）
+ // return parts.filter(part => !part.endsWith('省')).join(',');
+ // } else if (hasCity) {
+ // // 如果有市，返回空字符串
+ // return '';
+ // }
+
+ // 既没有省也没有市，返回原字符串
+ return str;
+}
+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);
@@ -480,13 +518,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) {
@@ -536,9 +574,9 @@
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('');
@@ -546,20 +584,17 @@
const orthoimageApi = 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;
+ await nextTick();
initMap();
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 +602,29 @@
}`,
// maximumLevel: 12,
})
-
);
-
yxShowBox.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 };
+ 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;
+function dialogClose() {
+ // 对话框关闭时清理资源
+ viewInstance.value?.viewerDestroy();
+ viewer = null;
+ isMapInitialized.value = false;
}
onMounted(() => {
getaiImagesPage();
--
Gitblit v1.9.3