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 | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index bcc7c58..27963fd 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -25,7 +25,7 @@
}}
</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>
@@ -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>
@@ -282,28 +282,31 @@
ir: '红外',
};
// 判断省市区
-const areas = userInfo.value.detail.areaCode
+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) {
- 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 (!str) return '';
- // if (hasProvince) {
- // // 移除省级部分（第一个以"省"结尾的元素）
- // return parts.filter(part => !part.endsWith('省')).join(',');
- // } else if (hasCity) {
- // // 如果有市，返回空字符串
- // return '';
- // }
+ const parts = str.split(',');
- // 既没有省也没有市，返回原字符串
- return str;
+ // 省级账号：显示市和区（去除省级）
+ 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 处理后不为空
@@ -432,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();
@@ -529,6 +522,7 @@
.then(res => {
if (res.status === 200) {
ElMessage.success('修改成功');
+ getaiImagesPage()
} else {
ElMessage.error(res.data.message || '修改失败');
}
--
Gitblit v1.9.3