From e6520ae727facdad0cb8c24a7c6f2ca533d86c9d Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 26 Jun 2025 08:33:12 +0800
Subject: [PATCH] Merge branch 'test'
---
src/views/dataCenter/dataCenter.vue | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index de8e734..27963fd 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -82,7 +82,7 @@
<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"
@@ -124,7 +124,7 @@
/>
<!-- 地图 -->
<div
- v-if="dialogDetailList?.resultType === 4"
+ v-else-if="dialogDetailList?.resultType === 4"
id="detaildataCenterMap"
class="ztzf-cesium"
></div>
@@ -292,19 +292,19 @@
// 处理区域名称的函数
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 '';
}
@@ -435,18 +435,8 @@
loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' });
const fileIds = list.map(i => i.id);
let aaa = {
- areaCode: '',
attachIds: fileIds,
- dockSn: '',
- endTime: '',
- fileName: '',
- fileType: '',
- jobName: '',
- resultType: '',
- startTime: '',
- wayLineJobIds: [],
};
-
downloadApi(aaa).then(res => {
aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
loading.close();
--
Gitblit v1.9.3