diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index 43b1ea247c..82ce2779fd 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -12,6 +12,7 @@ import io.dataease.chart.server.ChartDataServer;
import io.dataease.exception.DEException;
import io.dataease.exportCenter.dao.auto.entity.CoreExportTask;
import io.dataease.exportCenter.dao.auto.mapper.CoreExportTaskMapper;
+import io.dataease.license.config.XpackInteract;
import io.dataease.system.manage.SysParameterManage;
import io.dataease.utils.*;
import io.dataease.visualization.server.DataVisualizationServer;
@@ -177,14 +178,11 @@ public class ExportCenterManage {
exportTasks.forEach(exportTask -> {
ExportTaskDTO exportTaskDTO = new ExportTaskDTO();
BeanUtils.copyBean(exportTaskDTO, exportTask);
- if (status.equalsIgnoreCase("ALL")) {
+ if (status.equalsIgnoreCase("ALL") || status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
setExportFromAbsName(exportTaskDTO);
}
- if (status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
- setExportFromAbsName(exportTaskDTO);
- }
- if (status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
- setOrgName(exportTaskDTO);
+ if (status.equalsIgnoreCase("ALL") || status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
+ proxy().setOrg(exportTaskDTO);
}
result.add(exportTaskDTO);
});
@@ -192,10 +190,11 @@ public class ExportCenterManage {
return result;
}
- private void setOrgName(ExportTaskDTO exportTaskDTO) {
- if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) {
- exportTaskDTO.setOrgName(dataVisualizationServer.getAbsPath(exportTaskDTO.getExportFrom()));
- }
+ @XpackInteract(value = "exportCenter", before = false)
+ public void setOrg(ExportTaskDTO exportTaskDTO) {}
+
+ private ExportCenterManage proxy() {
+ return CommonBeanFactory.getBean(ExportCenterManage.class);
}
private void setExportFromAbsName(ExportTaskDTO exportTaskDTO) {
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index f1bff61bc7..151adb8046 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -14,6 +14,7 @@ import {
import { useI18n } from '@/hooks/web/useI18n'
import { useEmitt } from '@/hooks/web/useEmitt'
import Icon from '@/components/icon-custom/src/Icon.vue'
+import { useCache } from '@/hooks/web/useCache'
const { t } = useI18n()
const tableData = ref([])
@@ -52,6 +53,8 @@ const handleClose = () => {
drawer.value = false
clearInterval(timer)
}
+const { wsCache } = useCache()
+const xpack = wsCache.get('xpack-model-distributed')
onUnmounted(() => {
clearInterval(timer)
@@ -428,6 +431,7 @@ defineExpose({
视图
+
{{ timestampFormatDate(scope.row.exportTime) }}