From 683a2b1405e5b19280c27fc32f198574faf4a278 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 14 Jun 2025 13:56:02 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into test
---
src/views/dataCenter/dataCenter.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 4c52172..2991ab9 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -8,7 +8,7 @@
<!-- 表格部分 -->
<div class="dataTable">
<el-table
- v-loading="loading"
+ v-loading="loadings"
element-loading-text="加载中"
stripe
:data="tableData"
@@ -237,7 +237,8 @@
visible: '可见光',
ir: '红外',
};
-const loading = ref(true);
+const loadings = ref(true);
+let loading
const total = ref(0);
const startTime = dayjs().subtract(6, 'day').startOf('day');
const endTime = dayjs().endOf('day');
@@ -268,13 +269,14 @@
// 获取列表数据
const getaiImagesPage = () => {
- loading.value = true;
+loadings.value = true;
const params = {
orderByCreateTime: jobListParams.orderByCreateTime,
...jobListParams.searchParams,
};
getaiImagesPageAPI(params, { current: jobListParams.current, size: jobListParams.size }).then(
res => {
+
total.value = res.data.data.total;
tableData.value = res.data.data.records.map(i => ({
...i,
@@ -284,7 +286,8 @@
showUrl: getShowImg(i?.link),
file_name: i.name.split('/').pop(),
}));
- loading.value = false;
+ // console.log('res', tableData.value);
+ loadings.value = false;
}
);
};
@@ -352,7 +355,7 @@
}, index * 500); // 每个文件下载间隔50毫秒
});
} else {
- // loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })
+ loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })
const fileIds = list.map(i =>i.id);
console.log('fileIds', fileIds, list);
let aaa = {
@@ -369,9 +372,9 @@
};
downloadApi(aaa).then(res => {
- // console.log('res.data.data', res.data.data);
+ console.log('res.data.data', res.data.data);
aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
- // loading.close()
+ loading.close()
});
}
};
--
Gitblit v1.9.3