From 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 七月 2026 13:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/task/components/gantt-chart.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/pro/task/components/gantt-chart.vue b/src/views/mes/pro/task/components/gantt-chart.vue
index 69e2af3..a6af9f1 100644
--- a/src/views/mes/pro/task/components/gantt-chart.vue
+++ b/src/views/mes/pro/task/components/gantt-chart.vue
@@ -1,7 +1,7 @@
锘�<script lang="ts" setup>
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
-import { BarcodeBizTypeEnum } from '../../../../../packages/constants/src';
+import { BarcodeBizTypeEnum } from '@vben/constants';
import { gantt } from 'dhtmlx-gantt';
@@ -13,7 +13,7 @@
* 1. 鎸夎鍗曞垎缁勫睍绀虹敓浜т换鍔★紝璁㈠崟涓� project 琛岋紝浠诲姟涓哄瓙琛�
* 2. 鏀寔鍙棰勮鍜屾嫋鎷界紪杈戜袱绉嶆ā寮�
* 3. 鎷栨嫿鍚庤Е鍙� taskUpdate 浜嬩欢锛岄�氱煡鐖剁粍浠舵壒閲忎繚瀛�
- * 4. 鏃堕棿鍒诲害锛氬懆 鈫� 鏃� 鈫� 8 灏忔椂锛�1 宸ヤ綔鏃� = 8 灏忔椂锛�
+ * 4. 鏃堕棿鍒诲害锛氬懆 鈫� 鏃� 鈫� 灏忔椂
*/
defineOptions({ name: 'GanttChart', inheritAttrs: false });
@@ -47,8 +47,8 @@
gantt.config.readonly = props.readonly;
gantt.config.date_format = '%Y-%m-%d %H:%i:%s';
- gantt.config.duration_unit = 'hour'; // 鎸佺画鏃堕棿鍗曚綅涓哄皬鏃讹紝閰嶅悎 duration_step 瀹炵幇宸ヤ綔鏃ュ崟浣�
- gantt.config.duration_step = 8; // 1 宸ヤ綔鏃� = 8 灏忔椂
+ gantt.config.duration_unit = 'hour'; // 鎸佺画鏃堕棿鍗曚綅涓哄皬鏃�
+ gantt.config.duration_step = 1; // duration 瀛楁鍗充负瀹為檯灏忔椂鏁�
gantt.config.row_height = 36;
gantt.config.bar_height = 24;
gantt.config.fit_tasks = true;
@@ -70,7 +70,7 @@
gantt.config.buttons_left = ['gantt_save_btn'];
gantt.config.buttons_right = ['gantt_cancel_btn'];
- // 鏃堕棿鍒诲害锛氬懆 > 鏃� > 8 灏忔椂
+ // 鏃堕棿鍒诲害锛氬懆 > 鏃� > 灏忔椂
const weekScaleTemplate = (date: Date) => {
const dateToStr = gantt.date.date_to_str('%M %d');
const endDate = gantt.date.add(gantt.date.add(date, 1, 'week'), -1, 'day');
@@ -82,7 +82,7 @@
gantt.config.scales = [
{ unit: 'week', step: 1, format: weekScaleTemplate },
{ unit: 'day', step: 1, format: dayTemplate, css: daysStyle },
- { unit: 'hour', step: 8, format: '%H:%i' },
+ { unit: 'hour', step: 1, format: '%H:%i' },
];
gantt.config.scale_height = 50;
gantt.config.show_task_cells = true;
--
Gitblit v1.9.3