From 876dabc17c09c7c03d05f1f749d5be0a4c6eab99 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 11 Jun 2025 14:13:33 +0800
Subject: [PATCH] feat:调用列表接口
---
src/views/dataCenter/components/searchData.vue | 59 +++++++-------
src/views/dataCenter/dataCenter.vue | 105 ++++++++++++++++---------
src/api/dataCenter/dataCenter.js | 15 +++
src/views/wel/components/backlog.vue | 18 ++++
4 files changed, 125 insertions(+), 72 deletions(-)
diff --git a/src/api/dataCenter/dataCenter.js b/src/api/dataCenter/dataCenter.js
index f73dec8..588ca97 100644
--- a/src/api/dataCenter/dataCenter.js
+++ b/src/api/dataCenter/dataCenter.js
@@ -1,8 +1,19 @@
import request from '@/axios';
-export const getaiImagesPage = (data) => {
+// 列表接口
+export const getaiImagesPageAPI = (data) => {
return request({
- url: `/blade-resource/attach/aiImagesPage`,
+ url: `/blade-resource//attach/attachmentsPage`,
method: 'post',
data
})
+ };
+ // 详情接口
+export const getAttachInfoAPI = (id) => {
+ return request({
+ url: `/blade-resource/attach/getAttachInfo`,
+ method: 'get',
+ params: {
+ id,
+ },
+ })
};
\ No newline at end of file
diff --git a/src/views/dataCenter/components/searchData.vue b/src/views/dataCenter/components/searchData.vue
index a8a9ac0..b2531fb 100644
--- a/src/views/dataCenter/components/searchData.vue
+++ b/src/views/dataCenter/components/searchData.vue
@@ -5,9 +5,9 @@
<el-form-item label="行政区划:">
<el-tree-select
popper-class="custom-tree-select"
- v-model="searchForm.area_code"
+ v-model="searchForm.areaCode"
:data="deptTreeData"
- :default-expanded-keys="[searchForm.area_code]"
+ :default-expanded-keys="[searchForm.areaCode]"
check-strictly
node-key="id"
:props="treeProps"
@@ -17,7 +17,7 @@
<el-form-item label="所属机巢:">
<el-select
:teleported="false"
- v-model="searchForm.device_sn"
+ v-model="searchForm.deviceSn"
placeholder="请选择"
clearable
>
@@ -30,7 +30,7 @@
</el-select>
</el-form-item>
<el-form-item label="任务名称:">
- <el-input v-model="searchForm.taskName" placeholder="请输入" clearable />
+ <el-input v-model="searchForm.jobName" placeholder="请输入" clearable />
</el-form-item>
<el-form-item>
<el-date-picker
@@ -58,7 +58,7 @@
<el-form-item label="文件格式:">
<el-select
:teleported="false"
- v-model="searchForm.formatValue"
+ v-model="searchForm.resultType"
placeholder="请选择"
clearable
>
@@ -73,7 +73,7 @@
<el-form-item label="文件类别:">
<el-select
:teleported="false"
- v-model="searchForm.categoryValue"
+ v-model="searchForm.photoType"
placeholder="请选择"
clearable
>
@@ -88,7 +88,7 @@
</div>
<div class="search-first">
<el-form-item label="文件名称:">
- <el-input v-model="searchForm.fileName" placeholder="请输入" clearable />
+ <el-input v-model="searchForm.nickName" placeholder="请输入" clearable />
</el-form-item>
<div class="search-btn">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
@@ -122,47 +122,48 @@
};
const fileFormatOption = [
{
- value: '照片',
+ value: '0',
label: '照片',
},
{
- value: '视频',
+ value: '1',
label: '视频',
},
{
- value: 'AI识别',
+ value: '2',
label: 'AI识别',
},
{
- value: '全景',
+ value: '3',
label: '全景',
},
{
- value: '正射',
+ value: '4',
label: '正射',
},
];
const CategoryOption = [
{
- value: '可见光',
+ value: 'visible',
label: '可见光',
},
{
- value: '红外',
+ value: 'ir',
label: '红外',
},
];
+
const searchForm = reactive({
- taskName: '', //任务名称
- fileName: '', //文件名称
- area_code: userAreaCode.value, // 区域code
- create_dept: '', // 创建部门
- end_date: null, // 结束时间
- start_date: null, // 开始时间
- device_sn: '', // 所属机巢
- formatValue: '', //文件格式
- categoryValue: '', //文件类别
+ jobName: '', //任务名称
+ nickName: '', //文件名称
+ areaCode: userAreaCode.value, // 区域code
+ endTime: null, // 结束时间
+ startTime: null, // 开始时间
+ deviceSn: '', // 所属机巢
+ resultType: '', //文件格式
+ photoType: '', //文件类别
});
+
const dateRange = ref([]);
const timeFormat = 'YYYY-MM-DD HH:mm:ss';
// 部门
@@ -197,7 +198,7 @@
};
const handleNodeClick = async data => {
// 处理机巢数据
- searchForm.device_sn = '';
+ searchForm.deviceSn = '';
machineData.value = '';
const droneList = await getDeviceRegion({ areaCode: data.id });
@@ -205,7 +206,7 @@
machineData.value = droneList?.data?.data;
// 默认选中值
if (signDevice_sn.value) {
- searchForm.device_sn = signDevice_sn.value;
+ searchForm.deviceSn = signDevice_sn.value;
}
// 所属部门重新请求值
searchForm.create_dept = '';
@@ -214,7 +215,7 @@
};
// 所属部门信息
const getDeptsByAreaCode = () => {
- deptsByAreaCode(searchForm.area_code).then(res => {
+ deptsByAreaCode(searchForm.areaCode).then(res => {
if (res.code !== 0) {
deptData.value = res.data.data;
}
@@ -227,10 +228,10 @@
}
let params = {
...searchForm,
- start_date: dateRange.value.length
+ startTime: dateRange.value.length
? dayjs(dateRange?.value[0]).startOf('day').format(timeFormat)
: null,
- end_date: dateRange.value.length
+ endTime: dateRange.value.length
? dayjs(dateRange?.value[1]).endOf('day').format(timeFormat)
: null,
};
@@ -238,7 +239,7 @@
// 调用父组件方法
emit('search', params);
};
-// 重置
+// 清空
const handleReset = () => {
dateRange.value = [];
Object.keys(searchForm).forEach(key => {
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index bf997f6..43f579d 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -12,12 +12,16 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
- <el-table-column label="序号" type="index" width="60" />
+ <el-table-column label="序号" type="index" width="60">
+ <template #default="{ $index }">
+ {{ ($index + 1 + (jobListParams.current - 1) * jobListParams.size).toString().padStart(2, '0') }}
+ </template>
+ </el-table-column>
<el-table-column prop="regionName" label="所属区域" />
<el-table-column property="nestName" label="所属机巢" />
<el-table-column property="jobName" label="任务名称" show-overflow-tooltip />
<el-table-column prop="nickName" label="文件名称" show-overflow-tooltip />
- <el-table-column property="img" label="缩图" width="120">
+ <el-table-column property="link" label="缩图" width="120">
<template #default="scope">
<img
class="quanjing"
@@ -42,25 +46,15 @@
/>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="任务时间" />
+ <el-table-column prop="jobTime" label="任务时间" />
<el-table-column property="photoType" label="文件类别">
<template #default="scope">
- <span>{{ scope.row.photoType === 'visible' ? '可见光' : '红外' }}</span>
+ <span>{{photoTypeMap[scope.row.photoType] }}</span>
</template>
</el-table-column>
<el-table-column property="resultType" label="文件格式">
- <template #default="scope">
- <span>{{
- scope.row.resultType === 0
- ? '照片'
- : scope.row.resultType === 1
- ? '视频'
- : scope.row.resultType === 2
- ? 'AI识别'
- : scope.row.resultType === 3
- ? '全景'
- : '正射'
- }}</span>
+ <template #default="{ row }">
+ <span>{{ resultTypeMap[row.resultType] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center">
@@ -98,7 +92,7 @@
</div>
</template>
<div class="detailContainer">
- <div class="leftImg"><img :src="dialogDetailList.img" alt="" /></div>
+ <div class="leftImg"><img :src="dialogDetailList.link" alt="" /></div>
<div class="rightDetail">
<div class="title">
<div class="inputEdit">
@@ -123,15 +117,15 @@
</div>
</div>
</div>
- <div>任务名称：{{ dialogDetailList?.taskname }}</div>
- <div>所属区域：{{ dialogDetailList?.address }}</div>
- <div>拍摄机巢：{{ dialogDetailList?.nest }}</div>
- <div>照片位置：{{}}</div>
- <div>任务时间：{{ dialogDetailList?.date }}</div>
+ <div>任务名称：{{ dialogDetailList?.jobName }}</div>
+ <div>所属区域：{{ dialogDetailList?.regionName }}</div>
+ <div>拍摄机巢：{{ dialogDetailList?.nickName }}</div>
+ <div>照片位置：{{dialogDetailList?.longitude}},{{dialogDetailList?.latitude}}</div>
+ <div>任务时间：{{ dialogDetailList?.executeTime }}</div>
<div>拍摄时间：{{ dialogDetailList?.date }}</div>
- <div>文件类型：{{ dialogDetailList?.fileclass }}</div>
- <div>文件格式：{{ dialogDetailList?.fileformat }}</div>
- <div>照片文件大小：2M</div>
+ <div>文件类型：{{photoTypeMap[dialogDetailList?.photoType] }}</div>
+ <div>文件格式：{{ resultTypeMap[dialogDetailList?.resultType] }}</div>
+ <div>照片文件大小：{{dialogDetailList?.attachSize}}</div>
</div>
</div>
</el-dialog>
@@ -173,8 +167,10 @@
import { ElMessage, ElMessageBox } from 'element-plus';
import searchData from '@/views/dataCenter/components/searchData.vue';
import fy1 from '@/assets/images/dataCenter/1.jpeg';
-import { getaiImagesPage } from '@/api/dataCenter/dataCenter';
+import { getaiImagesPageAPI, getAttachInfoAPI } from '@/api/dataCenter/dataCenter';
+import { getShowImg, getSmallImg } from '@/utils/util';
import { onMounted } from 'vue';
+import dayjs from 'dayjs';
function convertVideoUrlToThumbnail(videoUrl) {
// 检查是否是有效的视频URL
if (!videoUrl || typeof videoUrl !== 'string') {
@@ -184,23 +180,49 @@
const thumbnailUrl = videoUrl.replace(/\.mp4$/, '_small.jpg');
return thumbnailUrl;
}
+const resultTypeMap = {
+ 0: '照片',
+ 1: '视频',
+ 2: 'AI识别',
+ 3: '全景',
+ 4:'正射'
+};
+const photoTypeMap ={
+ visible:'可见光',
+ ir:'红外'
+}
const loading = ref(true);
const total = ref(0);
+const startTime = dayjs().subtract(6, 'day').startOf('day')
+const endTime = dayjs().endOf('day')
+const timeRange = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')]
+console.log('11',timeRange);
+
const jobListParams = reactive({
current: 1,
size: 10,
- searchParams: {},
+ searchParams: {startTime:timeRange[0],endTime:timeRange[1]},
});
const tableData = ref([]);
// 获取列表数据
-const getgetaiImagesPage = () => {
- getaiImagesPage(jobListParams).then(res => {
+const getaiImagesPage = () => {
+ getaiImagesPageAPI({
+ current: jobListParams.current,
+ size: jobListParams.size,
+ ...jobListParams.searchParams,
+ }).then(res => {
loading.value = true;
total.value = res.data.data.total;
-
- tableData.value = res.data.data?.records;
- console.log('res', tableData.value, total.value);
+ tableData.value = res.data.data.records.map(i => ({
+ ...i,
+ checked: false,
+ url: i.domainUrl,
+ smallUrl: getSmallImg(i.domainUrl),
+ showUrl: getShowImg(i.domainUrl),
+ file_name: i.name.split('/').pop(),
+ }));
+ console.log('res', tableData.value);
loading.value = false;
});
};
@@ -211,15 +233,15 @@
jobListParams.searchParams = params;
console.log('jobListParams', jobListParams);
- // getgetaiImagesPage()
+ getaiImagesPage();
};
const handleSizeChange = val => {
jobListParams.size = val;
- getgetaiImagesPage();
+ getaiImagesPage();
};
const handleCurrentChange = val => {
jobListParams.current = val;
- getgetaiImagesPage();
+ getaiImagesPage();
};
// 多选
const selectedRows = ref([]);
@@ -227,13 +249,18 @@
// console.log('多选',val);
};
-// 弹框
+// 查看弹框
const dialogVisible = ref(false);
const dialogDetailList = ref(null);
const lookDetail = val => {
- dialogDetailList.value = val;
- // console.log('弹框', dialogDetailList.value);
+ // dialogDetailList.value = val;
+getAttachInfoAPI(val.id).then(res=>{
+dialogDetailList.value = res.data.data
+ console.log('red',res.data.data);
+
+})
dialogVisible.value = true;
+ console.log('弹框', val.id);
};
// 删除
const deleteDetail = () => {
@@ -273,7 +300,7 @@
dataCenterMapVisible.value = true;
};
onMounted(() => {
- getgetaiImagesPage();
+ getaiImagesPage();
});
</script>
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index bf71fa1..926994b 100644
--- a/src/views/wel/components/backlog.vue
+++ b/src/views/wel/components/backlog.vue
@@ -13,7 +13,8 @@
>
<div>
{{ item.name }}
- <div class="dots">{{ item.number >= 100 ? '99+' : item.number }}</div>
+ <div class="dots" :class="item.number >= 100 ? 'dots1':''">{{ item.number >= 100 ? '99+' : item.number }}</div>
+ <!-- <div class="dots">99+</div> -->
</div>
</div>
</div>
@@ -277,7 +278,7 @@
width: 17px;
height: 17px;
border-radius: 50%;
- background: #366fff;
+ background: #366fff;
color: #fff;
font-size: 9px;
position: absolute;
@@ -286,6 +287,19 @@
padding: 1px;
line-height: 17px;
}
+ .dots1 {
+ width: 17px;
+ height: 17px;
+ border-radius: 50%;
+ background: none !important;
+ color: #366fff !important;
+ font-size: 9px;
+ position: absolute;
+ top: -10px;
+ right: -13px;
+ padding: 1px;
+ line-height: 17px;
+ }
}
.todo-items {
margin-top: 10px;
--
Gitblit v1.9.3