From c06cb61f67a4d8d6d4a42bb1dcf72198ace0f8a7 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 01 Sep 2025 19:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v5.0/5.0.5' into feature/v5.0/5.0.5
---
src/views/dataCenter/dataCenter.vue | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index df187a9..7b77d2d 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -13,15 +13,16 @@
@handleswitchFolders="handleswitchFolders"
@handleBack ="handleBack"
:viewDetails ="viewDetails"
-
+
></searchData>
<!-- 文件夹 -->
<div v-if="switchFolders" class="dataTable">
<el-table
+
class="custom-header custom-body"
v-loading="loadings"
element-loading-text=""
- :data="folderList"
+ :data="folderList"
@selection-change="foldersSelectionChange"
>
<el-table-column type="selection" width="55" />
@@ -34,17 +35,17 @@
}}
</template>
</el-table-column>
- <el-table-column property="name" label="任务名称" show-overflow-tooltip />
+ <el-table-column property="recordName" 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>
<el-table-column property="nickname" label="所属机巢" >
<template #default="scope">
<span>{{scope.row.nickname ? scope.row.nickname :'--'}}</span>
</template>
- </el-table-column>
+ </el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button icon="el-icon-view" type="text" @click="foldersOpen(scope.row)"
@@ -56,7 +57,8 @@
</div>
<!-- 表格部分 -->
<div class="dataTable" v-else>
- <el-table
+ <el-table
+ border
v-loading="loadings"
element-loading-text=""
:data="tableData"
@@ -481,7 +483,7 @@
console.error('获取数据失败:', error);
})
.finally(() => {
- loadings.value = false;
+ loadings.value = false;
});
};
@@ -495,10 +497,10 @@
getJobIdsBySnApi(apiParams)
.then(res => {
folderList.value = res.data.data.records.map(i => ({ ...i, checked: false }))
- total.value = res.data.data.total
+ total.value = res.data.data.total
})
.finally(() => {
- loadings.value = false;
+ loadings.value = false;
})
}
const searchjobId = ref('')
@@ -516,7 +518,7 @@
if (switchFolders.value) {
getFolderList();
} else {
- getaiImagesPage();
+ getaiImagesPage();
}
};
// 切换文件夹
@@ -525,9 +527,9 @@
switchFolders.value = !switchFolders.value;
jobListParams.current = 1;
FolderListParams.page = 1;
-
+
searchBoxRef.value?.handleReset();
- fetchData();
+ fetchData();
};
const handleBack =()=>{
searchjobId.value = ''
@@ -535,17 +537,17 @@
viewDetails.value = false
jobListParams.current = 1;
FolderListParams.page = 1;
- fetchData();
-
+ fetchData();
+
}
const searchBoxRef = ref(null);
-
+
// 查询
const searchClick = params => {
if(switchFolders.value){
FolderListParams.page = 1;
FolderListParams.page_size = 10;
- FolderListParams.startTime = params?.startTime?.slice(0, 10);
+ FolderListParams.startTime = params?.startTime?.slice(0, 10);
FolderListParams.endTime = params?.endTime?.slice(0, 10);
FolderListParams.waylineName=params?.jobName,
FolderListParams.dockSn = params?.deviceSn
@@ -555,17 +557,17 @@
jobListParams.current = 1;
jobListParams.size = 10;
jobListParams.searchParams = {
- ...jobListParams.searchParams,
- ...params
+ ...jobListParams.searchParams,
+ ...params
};
getaiImagesPage()
}
};
const handleSizeChange = (val) => {
if (switchFolders.value) {
- FolderListParams.page_size = val;
+ FolderListParams.page_size = val;
} else {
- jobListParams.size = val;
+ jobListParams.size = val;
}
fetchData();
};
@@ -592,7 +594,7 @@
folderList.value.forEach(item => {
item.checked = val.some(foldersselected => foldersselected.id === item.id);
});
- foldersSelectedRows.value = val;
+ foldersSelectedRows.value = val;
}
// 删除
const deleteDetail = val => {
@@ -769,6 +771,7 @@
flatMode: false,
terrain: false,
mapFilter: true,
+ layerMode: 4
});
viewer = viewInstance.value.getViewer();
viewerRef.value = viewer;
@@ -948,7 +951,7 @@
img {
width: 111px;
height: 111px;
-
+
}
.el-checkbox {
@@ -972,7 +975,7 @@
font-size: 14px;
color: #ffffff;
line-height: 23px;
-
+
display: flex;
align-items: center;
justify-content: space-between;
@@ -1153,4 +1156,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3