From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/dataCenter/dataCenter.vue | 228 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 149 insertions(+), 79 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index b6e1a15..df187a9 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -4,18 +4,61 @@
>
<div class="dataCenter-table">
<searchData
+ ref="searchBoxRef"
+ :searchjobId="searchjobId"
+ :switchFolders="switchFolders"
@search="searchClick"
@downFun="downloadFile"
@allDownFun="aLLDownloadFile"
@handleswitchFolders="handleswitchFolders"
+ @handleBack ="handleBack"
+ :viewDetails ="viewDetails"
+
></searchData>
- <!-- 表格部分 -->
- <div class="dataTable" v-if="!switchFolders" >
- <el-table
- border
- stripe
+ <!-- 文件夹 -->
+ <div v-if="switchFolders" class="dataTable">
+ <el-table
+ class="custom-header custom-body"
v-loading="loadings"
- element-loading-text="加载中"
+ element-loading-text=""
+ :data="folderList"
+ @selection-change="foldersSelectionChange"
+ >
+ <el-table-column type="selection" width="55" />
+ <el-table-column label="序号" type="index" width="60">
+ <template #default="{ $index }">
+ {{
+ ($index + 1 + (FolderListParams.page - 1) * FolderListParams.page_size)
+ .toString()
+ .padStart(2, '0')
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column property="name" label="任务名称" show-overflow-tooltip />
+ <el-table-column property="regionName" label="所属区域">
+ <template #default="scope">
+ <span>{{scope.row.city_name ? scope.row.city_name :'--'}},{{scope.row.area_name ? scope.row.area_name :'--'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column property="nickname" label="所属机巢" >
+ <template #default="scope">
+ <span>{{scope.row.nickname ? scope.row.nickname :'--'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" align="center">
+ <template #default="scope">
+ <el-button icon="el-icon-view" type="text" @click="foldersOpen(scope.row)"
+ >查看</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!-- 表格部分 -->
+ <div class="dataTable" v-else>
+ <el-table
+ v-loading="loadings"
+ element-loading-text=""
:data="tableData"
class="custom-header"
@selection-change="handleSelectionChange"
@@ -123,25 +166,9 @@
</el-table-column>
</el-table>
</div>
- <!-- 文件夹 -->
- <div class="fileshow" v-else v-loading="loadings ">
- <div
- class="filePackage"
- v-for="(folderItem, fileIndex) in folderList"
- :key="fileIndex"
- @click.stop="foldersOpen(folderItem)"
- >
- <img :src="fileimg" alt="" />
- <el-checkbox v-model="folderItem.checked" @click.stop />
- <div class="itemName" :title="folderItem.name">
- <div>{{ folderItem.name }}</div>
- </div>
- </div>
- </div>
-
<!-- 分页 -->
<div class="pagination">
- <el-pagination
+ <el-pagination
:current-page="switchFolders ? FolderListParams.page : jobListParams.current"
:page-size="switchFolders ? FolderListParams.page_size : jobListParams.size"
:page-sizes="[10, 20, 30, 40]"
@@ -151,7 +178,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
- </div>
+ </div>
<!-- 查看弹框 -->
<el-dialog
v-model="dialogVisible"
@@ -309,14 +336,6 @@
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;
-const viewInstance = shallowRef(null);
-const store = useStore();
-const currentAreaPosition = ref({ height: 1987280, latitude: 27.636112, longitude: 115.732975 });
-let handler = null;
import EventBus from '@/utils/eventBus';
import dataCenterMap from '@/views/dataCenter/components/dataCenterMap.vue';
import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue'; //全景
@@ -332,8 +351,15 @@
updataTitleApi,
getOrthoimageInfo, getDownloadStatusApi,getJobIdsBySnApi
} from '@/api/dataCenter/dataCenter';
+const userInfo = computed(() => store.getters.userInfo);
+const isShow = defineModel('show');
+const viewerRef = shallowRef(null);
+let viewer = null;
+const viewInstance = shallowRef(null);
+const store = useStore();
+const currentAreaPosition = ref({ height: 1987280, latitude: 27.636112, longitude: 115.732975 });
+let handler = null;
const switchFolders = ref(false)
-
function bytesToMB(bytes, decimalPlaces = 2) {
if (typeof bytes !== 'number' || bytes < 0) return '0';
return (bytes / 1048576).toFixed(decimalPlaces) + ' MB';
@@ -417,15 +443,15 @@
searchParams: { startTime: timeRange[0], endTime: timeRange[1] },
});
const FolderListParams = reactive({
- page: 1,
- page_size: 30,
-startTime: jobListParams.searchParams.startTime?.slice(0, 10),
+ page: 1,
+ page_size: 10,
+ startTime: jobListParams.searchParams.startTime?.slice(0, 10),
endTime: jobListParams.searchParams.endTime?.slice(0, 10),
- waylineName:'',
-
+ waylineName:'',
+ dockSn:'',
+ areaCode:''
});
const tableData = ref([]);
-
// 获取列表数据
const getaiImagesPage = () => {
loadings.value = true;
@@ -433,6 +459,9 @@
orderByCreateTime: jobListParams.orderByCreateTime,
...jobListParams.searchParams,
};
+ if( searchjobId.value === ''){
+ params.wayLineJobId = ''
+ }
getaiImagesPageAPI(params, {
current: jobListParams.current,
size: jobListParams.size,
@@ -455,14 +484,15 @@
loadings.value = false;
});
};
+
const folderList = ref([])
// 获取文件夹数据
const getFolderList=()=>{
- const apiParams = {
- ...FolderListParams,
- // type:'0'
- };
- getJobIdsBySnApi(apiParams)
+ loadings.value = true;
+ const apiParams = {
+ ...FolderListParams,
+ };
+ getJobIdsBySnApi(apiParams)
.then(res => {
folderList.value = res.data.data.records.map(i => ({ ...i, checked: false }))
total.value = res.data.data.total
@@ -471,44 +501,65 @@
loadings.value = false;
})
}
+const searchjobId = ref('')
+const viewDetails = ref('')
+// 文件夹查看
+const foldersOpen = (val)=>{
+ loadings.value = true;
+ tableData.value=[]
+ searchjobId.value = val.job_id
+ switchFolders.value = false
+ viewDetails.value = true
+}
// 获取数据时使用各自的分页参数
const fetchData = () => {
if (switchFolders.value) {
getFolderList();
} else {
- getaiImagesPage();
+ getaiImagesPage();
}
};
// 切换文件夹
const handleswitchFolders = () => {
+ searchjobId.value = ''
switchFolders.value = !switchFolders.value;
jobListParams.current = 1;
FolderListParams.page = 1;
- fetchData();
+
+ searchBoxRef.value?.handleReset();
+ fetchData();
};
-// 查询
-const searchClick = async (params) => {
- loadings.value = true;
- total.value = 0;
-
- if (switchFolders.value) {
- // 文件夹逻辑
- FolderListParams.page = 1;
- FolderListParams.page_size = 30;
- FolderListParams.startTime = params.startTime?.slice(0, 10);
- FolderListParams.endTime = params.endTime?.slice(0, 10);
- FolderListParams.waylineName=params.jobName,
- // FolderListParams.deviceSn = params.deviceSn
- await getFolderList();
- } else {
- // 表格逻辑
+ const handleBack =()=>{
+ searchjobId.value = ''
+ switchFolders.value = true
+ viewDetails.value = false
jobListParams.current = 1;
- jobListParams.size = 10;
- jobListParams.searchParams = params;
- await getaiImagesPage();
- }
+ FolderListParams.page = 1;
+ fetchData();
+
+ }
+ const searchBoxRef = ref(null);
- loadings.value = false;
+// 查询
+const searchClick = params => {
+ if(switchFolders.value){
+ FolderListParams.page = 1;
+ FolderListParams.page_size = 10;
+ FolderListParams.startTime = params?.startTime?.slice(0, 10);
+ FolderListParams.endTime = params?.endTime?.slice(0, 10);
+ FolderListParams.waylineName=params?.jobName,
+ FolderListParams.dockSn = params?.deviceSn
+ FolderListParams.areaCode = params?.areaCode
+ getFolderList()
+ }else{
+ jobListParams.current = 1;
+ jobListParams.size = 10;
+ jobListParams.searchParams = {
+ ...jobListParams.searchParams,
+ ...params
+ };
+ getaiImagesPage()
+ }
};
const handleSizeChange = (val) => {
if (switchFolders.value) {
@@ -533,9 +584,16 @@
tableData.value.forEach(item => {
item.checked = val.some(selected => selected.id === item.id);
});
-
selectedRows.value = val;
};
+// 文件夹多选
+const foldersSelectedRows = ref([]);
+const foldersSelectionChange =(val)=>{
+ folderList.value.forEach(item => {
+ item.checked = val.some(foldersselected => foldersselected.id === item.id);
+ });
+ foldersSelectedRows.value = val;
+}
// 删除
const deleteDetail = val => {
ElMessageBox.confirm('您确定删除吗?', '提示', {
@@ -600,17 +658,16 @@
};
// 文件夹打包下载
async function folderDownload() {
- const jobId = folderList.value.filter(i => i.checked).map(i => i.job_id)
+ const jobId = foldersSelectedRows.value.filter(i => i.checked).map(i => i.job_id)
if (!jobId?.length) return ElMessage.warning('请选择文件夹')
const res = await getDownloadStatusApi({type: 'dpsjzx'})
if (!['CANCELLED','COMPLETED'].includes(res.data.data?.status || 'COMPLETED')){
return ElMessage.warning('还有正在处理的')
}
- await downloadApi({ wayLineJobIds:jobId, withFolder: true, resultType: 0, type:'dpsjzx' })
+ await downloadApi({ wayLineJobIds:jobId, withFolder: true, resultType: 0, type:'htsjzx' })
}
// 下载
const downloadFile = () => {
-
switchFolders.value?folderDownload(): fileDownload();
};
const detailDownLoad = val => {
@@ -824,7 +881,6 @@
}
onMounted(() => {
getaiImagesPage();
- getFolderList()
// 监听打开全景事件
EventBus.on('open-panorama', params => {
panoramaParamsShow.value = params.show;
@@ -838,7 +894,6 @@
viewInstance.value?.viewerDestroy();
});
</script>
-
<style scoped lang="scss">
.dataCenter-table {
height: 0;
@@ -874,11 +929,16 @@
}
}
.fileshow {
- display: grid;
- grid-template-columns: repeat(6, 1fr);
- gap: 10px;
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
+ gap: 10px;
overflow: auto;
+ flex: 1;
+ min-height: 0; /* 关键：解决 flex 容器中的最小高度问题 */
+ align-content: flex-start; /* 让内容从顶部开始排列 */
.filePackage {
+ display: flex;
+ justify-content: center;
width: 260px;
height: 146px;
border-radius: 4px 4px 4px 4px;
@@ -888,7 +948,7 @@
img {
width: 111px;
height: 111px;
- margin-left: 56px;
+
}
.el-checkbox {
@@ -903,6 +963,8 @@
left: 0;
height: 23px;
width: 100%;
+ padding: 0 10px;
+ box-sizing: border-box;
background: rgba(22, 56, 101, 0.3);
border-radius: 0px 0px 4px 4px;
font-family: Source Han Sans CN, Source Han Sans CN;
@@ -976,8 +1038,11 @@
:deep(.custom-header th.el-table__cell) {
color: rgba(0, 0, 0, 0.85);
background: #fafafa;
+ height: 60px !important;
}
-
+:deep(.custom-body .el-table__body tr) {
+ height: 53px !important;
+}
// 弹框
.detailContainer {
display: flex;
@@ -1012,6 +1077,11 @@
.editname {
cursor: pointer;
+ :deep(.el-icon) {
+ width: 20px; // 调整图标宽度（默认通常14px左右）
+ height: 20px; // 调整图标高度（与宽度保持一致）
+ font-size: 20px; // 部分图标可能依赖font-size控制大小，同步设置
+ }
}
.inputEdit {
@@ -1083,4 +1153,4 @@
}
}
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3