From 4d024646448b9c75f51045989cb52c533ceb9c10 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:19:16 +0800
Subject: [PATCH] 修复排产页甘特图渲染异常导致无法跳转其它页面
---
src/views/mes/pro/task/components/gantt-chart.vue | 76 ++++++++++++++++++++++---
src/components/file-preview/use-file-preview.ts | 35 +++++------
src/views/mes/pro/task/index.vue | 5 +
src/views/ai/chat/index/modules/message/files.vue | 6 +-
src/views/mes/pd/archive/modules/detail.vue | 5 +
5 files changed, 93 insertions(+), 34 deletions(-)
diff --git a/src/components/file-preview/use-file-preview.ts b/src/components/file-preview/use-file-preview.ts
index ca4fec0..5ac07a3 100644
--- a/src/components/file-preview/use-file-preview.ts
+++ b/src/components/file-preview/use-file-preview.ts
@@ -1,34 +1,31 @@
-import type { Ref } from 'vue';
+import { reactive } from 'vue';
-import { computed, ref } from 'vue';
-
-import { getFileNameFromUrl, getFileType } from '@vben/utils';
+import { getFileNameFromUrl } from '@vben/utils';
export function useFilePreview() {
- const visible = ref(false);
- const fileUrl = ref('');
- const fileName = ref('');
-
- const fileType = computed(() => getFileType(fileName.value || fileUrl.value));
+ /**
+ * 鐢� reactive 鑰屼笉鏄� ref 鍖呰锛氳皟鐢ㄦ柟閫氳繃 `v-bind="previewState"` 浼犲弬鏃讹紝
+ * 鏅�氬璞¢噷鐨� ref 涓嶄細琚ā鏉胯嚜鍔ㄨВ鍖咃紝浼氭妸 Ref 瀵硅薄褰� prop 浼犵粰棰勮缁勪欢銆�
+ */
+ const previewState = reactive({
+ fileUrl: '',
+ fileName: '',
+ visible: false,
+ });
function openPreview(url: string, name?: string) {
- fileUrl.value = url;
- fileName.value = name || getFileNameFromUrl(url);
- visible.value = true;
+ previewState.fileUrl = url;
+ previewState.fileName = name || getFileNameFromUrl(url);
+ previewState.visible = true;
}
function closePreview() {
- visible.value = false;
+ previewState.visible = false;
}
return {
closePreview,
openPreview,
- previewState: {
- fileUrl: fileUrl as Ref<string>,
- fileName: fileName as Ref<string>,
- fileType,
- visible: visible as Ref<boolean>,
- },
+ previewState,
};
}
diff --git a/src/views/ai/chat/index/modules/message/files.vue b/src/views/ai/chat/index/modules/message/files.vue
index 5cbc411..018db50 100644
--- a/src/views/ai/chat/index/modules/message/files.vue
+++ b/src/views/ai/chat/index/modules/message/files.vue
@@ -59,8 +59,8 @@
</div>
</div>
<FilePreviewModal
- v-model:visible="previewState.visible.value"
- :file-url="previewState.fileUrl.value"
- :file-name="previewState.fileName.value"
+ v-model:visible="previewState.visible"
+ :file-url="previewState.fileUrl"
+ :file-name="previewState.fileName"
/>
</template>
diff --git a/src/views/mes/pd/archive/modules/detail.vue b/src/views/mes/pd/archive/modules/detail.vue
index 365fad1..9f694b5 100644
--- a/src/views/mes/pd/archive/modules/detail.vue
+++ b/src/views/mes/pd/archive/modules/detail.vue
@@ -129,7 +129,10 @@
</script>
<template>
- <FilePreviewModal v-bind="previewState" />
+ <FilePreviewModal
+ v-bind="previewState"
+ @update:visible="previewState.visible = $event"
+ />
<Modal v-model:open="open" title="褰掓。璇︽儏" width="80%" :footer="null" @cancel="handleClose">
<div v-if="loading" class="flex justify-center py-8">
<Spin />
diff --git a/src/views/mes/pro/task/components/gantt-chart.vue b/src/views/mes/pro/task/components/gantt-chart.vue
index a6af9f1..f8ff285 100644
--- a/src/views/mes/pro/task/components/gantt-chart.vue
+++ b/src/views/mes/pro/task/components/gantt-chart.vue
@@ -157,6 +157,15 @@
ganttInited.value = true;
}
+/** 瑙f瀽鏃堕棿锛岄潪娉曟垨绌哄�艰繑鍥� null锛坉htmlx 鏀跺埌 null 鏃堕棿浼氬湪璁$畻鏃堕棿杞存椂宕╂簝锛� */
+function parseDate(value: any): Date | null {
+ if (value === null || value === undefined || value === '') {
+ return null;
+ }
+ const date = value instanceof Date ? value : new Date(value);
+ return Number.isNaN(date.getTime()) ? null : date;
+}
+
/** 鍔犺浇鏁版嵁鍒扮敇鐗瑰浘 */
function loadData(tasks: any[]) {
if (!ganttInited.value) {
@@ -168,22 +177,69 @@
[BarcodeBizTypeEnum.WORKORDER]: 'project',
[BarcodeBizTypeEnum.TASK]: 'task',
};
- gantt.parse({
- data: tasks.map((item: any) => ({
- ...item,
- type: typeMap[item.type] || item.type,
- start_date: item.startDate ? new Date(item.startDate) : undefined,
- end_date: item.endDate ? new Date(item.endDate) : undefined,
- })),
- links: [],
- });
+ const rows = tasks.map((item: any) => ({
+ ...item,
+ type: typeMap[item.type] || item.type,
+ start_date: parseDate(item.startDate),
+ end_date: parseDate(item.endDate),
+ }));
+
+ // 宸ュ崟(project)琛屾湰韬笉甯﹁鍒掓椂闂达紝鐢ㄥ叾浠诲姟鐨勬渶鏃╁紑濮嬨�佹渶鏅氱粨鏉熻ˉ榻�
+ const children = new Map<string, any[]>();
+ for (const row of rows) {
+ if (row.parent) {
+ const list = children.get(String(row.parent)) ?? [];
+ list.push(row);
+ children.set(String(row.parent), list);
+ }
+ }
+ for (const row of rows) {
+ if (row.type !== 'project' || (row.start_date && row.end_date)) {
+ continue;
+ }
+ const childRows: any[] = children.get(String(row.id)) ?? [];
+ const starts = childRows
+ .map((child) => child.start_date)
+ .filter((date): date is Date => date instanceof Date);
+ const ends = childRows
+ .map((child) => child.end_date)
+ .filter((date): date is Date => date instanceof Date);
+ if (!row.start_date && starts.length > 0) {
+ row.start_date = new Date(Math.min(...starts.map((date) => date.getTime())));
+ }
+ if (!row.end_date && ends.length > 0) {
+ row.end_date = new Date(Math.max(...ends.map((date) => date.getTime())));
+ }
+ }
+
+ // 娌℃湁鏈夋晥璁″垝鏃堕棿鐨勮妭鐐癸紙濡備粠鏈帓浜х殑宸ュ崟锛変笉杩涘叆鐢樼壒鍥撅紝鍚﹀垯鏁撮〉娓叉煋浼氭姏寮傚父
+ const data = rows.filter(
+ (row) =>
+ row.start_date &&
+ row.end_date &&
+ row.start_date.getTime() <= row.end_date.getTime(),
+ );
+ if (data.length === 0) {
+ return;
+ }
+ try {
+ gantt.parse({ data, links: [] });
+ } catch (error) {
+ // 绗笁鏂圭敇鐗瑰浘寮傚父涓嶈兘鍐掓场鎵撴柇璺敱/椤甸潰娓叉煋
+ console.error('鐢樼壒鍥炬覆鏌撳け璐�', error);
+ }
}
watch(
() => props.tasks,
(val) => {
- if (val?.length && ganttInited.value) {
+ if (!ganttInited.value) {
+ return;
+ }
+ if (val?.length) {
loadData(val);
+ } else {
+ gantt.clearAll();
}
},
{ deep: true },
diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index 9621fdc..3e5cfbf 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -184,7 +184,10 @@
<template #extra>
<span class="text-xs text-gray-400">灞曠ず宸茬‘璁よ嚜鍒惰鍗曠殑浠诲姟璁″垝</span>
</template>
- <GanttChart :height="350" :readonly="true" :tasks="ganttTasks" />
+ <GanttChart v-if="ganttTasks.length" :height="350" :readonly="true" :tasks="ganttTasks" />
+ <div v-else class="py-10 text-center text-sm text-gray-400">
+ 鏆傛棤宸叉帓浜х殑鐢熶骇浠诲姟
+ </div>
</Card>
<Grid>
--
Gitblit v1.9.3