diff --git a/src/locales/en.ts b/src/locales/en.ts
index de7ad477..fcf7fbfc 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -4541,6 +4541,8 @@ export default {
       warningCompleteDeviceDate: 'Please complete device and start date',
       warningValidTime: 'Please select a valid time',
       columnTaskName: 'Task Name',
+      columnDeviceName: 'Device Name',
+      columnPlanInfo: 'Plan Info',
       columnStartTime: 'Start Time',
       columnDays: 'Days',
       scaleMonthFormat: 'MMM YYYY',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index de80fcf7..7d5bfeb7 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -4752,6 +4752,8 @@ export default {
       warningCompleteDeviceDate: '请完善设备和开始日期',
       warningValidTime: '请选择有效的时间',
       columnTaskName: '任务名称',
+      columnDeviceName: '设备名称',
+      columnPlanInfo: '计划信息',
       columnStartTime: '开始时间',
       columnDays: '天数',
       scaleMonthFormat: 'YYYY年M月',
diff --git a/src/views/mes/components/ScheduleGanttPanel.vue b/src/views/mes/components/ScheduleGanttPanel.vue
index c51ad95f..3a6e624e 100644
--- a/src/views/mes/components/ScheduleGanttPanel.vue
+++ b/src/views/mes/components/ScheduleGanttPanel.vue
@@ -21,19 +21,13 @@
             }}</el-descriptions-item>
           <el-descriptions-item :label="t('GanttChart.GanttPanel.capacityLabel')">{{ activePreviewDevice.ratedCapacity
             ?? '-' }}</el-descriptions-item>
-          <el-descriptions-item v-if="'dailyAverageValue' in activePreviewDevice"
-            :label="t('GanttChart.GanttPanel.dailyAvgLabel')">{{ activePreviewDevice.dailyAverageValue ?? '-'
-            }}</el-descriptions-item>
-          <el-descriptions-item v-if="'dataCollectionCapacity' in activePreviewDevice"
-            :label="t('GanttChart.GanttPanel.dataCollectionCapacityLabel')">{{
-              activePreviewDevice.dataCollectionCapacity ?? '-' }}</el-descriptions-item>
           <el-descriptions-item :label="t('GanttChart.GanttPanel.planCountLabel')">{{ activePreviewDevice.plans?.length
             ?? 0 }}</el-descriptions-item>
         </el-descriptions>
         <div class="schedule-plan-list-title">{{ t('GanttChart.GanttPanel.planDetailTitle') }}</div>
         <div class="schedule-plan-list">
           <div v-for="(plan, index) in activePreviewTask ? [activePreviewTask] : (activePreviewDevice?.plans ?? [])"
-            :key="`${activePreviewDevice?.deviceId}-${plan.taskDetailId}-${index}`"
+            :key="`${activePreviewDevice?.deviceId}-${plan.planId}-${index}`"
             :class="['schedule-plan-item', { 'schedule-plan-item-active': plan.sourceType === 'CURRENT' }]">
             <div class="schedule-plan-item-head">
               <span class="schedule-plan-item-title">{{ plan.productCode ?? '-' }} / {{ plan.productName ?? '-'
@@ -55,45 +49,6 @@
       <el-empty v-else :description="t('GanttChart.GanttPanel.emptyDescription')" :image-size="80" />
     </div>
   </div>
-
-  <el-dialog v-if="props.editable" v-model="taskAdjustDialogVisible" :title="t('GanttChart.GanttPanel.adjustTaskTitle')"
-    width="420px" append-to-body>
-    <el-form label-width="90px">
-      <el-form-item :label="t('GanttChart.GanttPanel.deviceLabel')">
-        <el-select v-model="taskAdjustForm.deviceTaskId" :placeholder="t('GanttChart.GanttPanel.devicePlaceholder')"
-          class="!w-full">
-          <el-option v-for="item in previewDeviceOptions" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('GanttChart.GanttPanel.startDateLabel')">
-        <el-date-picker v-model="taskAdjustForm.startDate" type="date" value-format="YYYY-MM-DD"
-          :placeholder="t('GanttChart.GanttPanel.startDatePlaceholder')" class="!w-full" />
-      </el-form-item>
-      <el-form-item :label="t('GanttChart.GanttPanel.durationLabel')">
-        <el-input-number v-model="taskAdjustForm.duration" :min="1" :max="365" class="!w-full" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="taskAdjustDialogVisible = false">{{ t('GanttChart.GanttPanel.buttonCancel') }}</el-button>
-      <el-button type="primary" @click="handleTaskAdjustSubmit">{{ t('GanttChart.GanttPanel.buttonConfirm')
-        }}</el-button>
-    </template>
-  </el-dialog>
-
-  <el-dialog v-if="props.editable" v-model="startDateEditorVisible"
-    :title="t('GanttChart.GanttPanel.editStartDateTitle')" width="360px" append-to-body>
-    <el-form label-width="80px">
-      <el-form-item :label="t('GanttChart.GanttPanel.startTimeLabel')">
-        <el-date-picker v-model="startDateEditorValue" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-          :placeholder="t('GanttChart.GanttPanel.startTimePlaceholder')" class="!w-full" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="startDateEditorVisible = false">{{ t('GanttChart.GanttPanel.buttonCancel') }}</el-button>
-      <el-button type="primary" @click="handleStartDateEditorSubmit">{{ t('GanttChart.GanttPanel.buttonConfirm')
-        }}</el-button>
-    </template>
-  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -131,33 +86,12 @@ const props = withDefaults(
   }
 )
 
-const message = useMessage()
 const ganttContainerRef = ref<HTMLDivElement>()
 const activePreviewDevice = ref<any>()
 const activePreviewTask = ref<any>()
-const startDateEditorVisible = ref(false)
-const startDateEditorTaskId = ref<string | number | null>(null)
-const startDateEditorValue = ref('')
-const tooltipCleanupFns = ref<(() => void)[]>([])
 const ganttEventIds = ref<string[]>([])
-const ganttSyncing = ref(false)
-const taskAdjustDialogVisible = ref(false)
-const taskAdjustTaskId = ref<string | number | null>(null)
-const taskAdjustForm = reactive({
-  deviceTaskId: '',
-  startDate: '',
-  duration: 1
-})
-const taskMoveFromParentMap = ref<Record<string, string | number | undefined>>({})
-const taskDragDurationMap = ref<Record<string, number>>({})
 
 const previewScheduleList = computed(() => (Array.isArray(props.scheduleList) ? props.scheduleList : []))
-const previewDeviceOptions = computed(() =>
-  previewScheduleList.value.map((device: any) => ({
-    label: device?.deviceName ?? '-',
-    value: `device-${device?.deviceId}`
-  }))
-)
 
 const getGlobalDateRange = (scheduleList: any[]) => {
   const allPlans = scheduleList.flatMap((item: any) => item?.plans ?? [])
@@ -182,27 +116,10 @@ const formatGanttDate = (value: unknown) => {
   return date.format('YYYY-MM-DD HH:mm')
 }
 
-const getDeviceTaskRangeByChildren = (planTasks: any[]) => {
-  const starts = planTasks.map((item: any) => dayjs(item?.start_date)).filter((item: any) => item.isValid())
-  const ends = planTasks.map((item: any) => dayjs(item?.end_date)).filter((item: any) => item.isValid())
-  if (!starts.length || !ends.length) return undefined
-  const earliestStart = starts.reduce((min: any, current: any) => (current.valueOf() < min.valueOf() ? current : min))
-  const latestEnd = ends.reduce((max: any, current: any) => (current.valueOf() > max.valueOf() ? current : max))
-  const duration = Math.max(latestEnd.endOf('day').diff(earliestStart.startOf('day'), 'day') + 1, 1)
-  return {
-    start_date: earliestStart.toDate(),
-    end_date: latestEnd.toDate(),
-    duration
-  }
-}
-
 const buildPreviewGanttData = (scheduleList: any[]) => {
   const tasks: any[] = []
-  const links: any[] = []
-  let linkIndex = 1
 
   scheduleList.forEach((device: any) => {
-    const deviceId = `device-${device.deviceId}`
     const plans = (device?.plans ?? []).map((plan: any) => ({
       ...plan,
       _start: dayjs(plan?.planStartTimeStr),
@@ -211,551 +128,215 @@ const buildPreviewGanttData = (scheduleList: any[]) => {
     const validPlans = plans
       .filter((plan: any) => plan._start.isValid() && plan._end.isValid())
       .sort((a: any, b: any) => a._start.valueOf() - b._start.valueOf())
-    const firstPlan = validPlans[0]
-    const deviceRange = getDeviceTaskRangeByChildren(
-      validPlans.map((item: any) => ({
-        start_date: item?._start,
-        end_date: item?._end
-      }))
-    )
 
+    if (!validPlans.length) return
+
+    const allStarts = validPlans.map((p: any) => p._start.valueOf())
+    const allEnds = validPlans.map((p: any) => p._end.valueOf())
+    const earliestStart = dayjs(Math.min(...allStarts))
+    const latestEnd = dayjs(Math.max(...allEnds))
+    const totalDays = Math.max(latestEnd.endOf('day').diff(earliestStart.startOf('day'), 'day') + 1, 1)
+
+    const deviceTaskId = `device-${device.deviceId}`
     tasks.push({
-      id: deviceId,
-      text: `${device.deviceName ?? '-'}`,
-      start_date: formatGanttDate(deviceRange?.start_date ?? firstPlan?._start),
-      end_date: formatGanttDate(deviceRange?.end_date ?? firstPlan?._end),
-      duration: deviceRange?.duration ?? 1,
+      id: deviceTaskId,
+      text: device.deviceName ?? '-',
+      start_date: formatGanttDate(earliestStart),
+      end_date: formatGanttDate(latestEnd),
+      duration: totalDays,
       parent: 0,
       progress: 0,
-      open: true,
       readonly: true,
       deviceName: device.deviceName ?? '-',
-      _deviceData: device
-    })
-
-    let previousPlanTaskId: string | null = null
-    validPlans.forEach((plan: any, index: number) => {
-      const startDate = formatGanttDate(plan.planStartTimeStr)
-      const endDate = formatGanttDate(plan.planEndTimeStr)
-      const duration = Number(plan.scheduleDays) > 0 ? Number(plan.scheduleDays) : Math.max(plan._end.diff(plan._start, 'day') + 1, 1)
-      if (!startDate || !endDate) return
-      const isHistory = String(plan.sourceType ?? '').toUpperCase() === 'HISTORY'
-      const planTaskId = `plan-${device.deviceId}-${plan.taskDetailId ?? index}-${index}`
-      tasks.push({
-        id: planTaskId,
-        text: `${plan.productCode ?? '-'} / ${plan.productName ?? '-'} / ${plan.taskCode ?? '-'}`,
-        start_date: startDate,
-        end_date: endDate,
-        duration,
-        parent: deviceId,
-        progress: 0,
-        readonly: isHistory || !props.editable,
-        _planData: plan,
-        _deviceData: device
-      })
-      if (previousPlanTaskId) {
-        links.push({
-          id: `link-${linkIndex++}`,
-          source: previousPlanTaskId,
-          target: planTaskId,
-          type: '0'
-        })
-      }
-      previousPlanTaskId = planTaskId
+      totalDays,
+      _deviceData: device,
+      _validPlans: validPlans
     })
   })
 
-  return { data: tasks, links }
-}
-
-const cleanupTaskTooltips = () => {
-  const tooltipsExt = (gantt.ext as any)?.tooltips
-  const tooltip = tooltipsExt?.tooltip
-  if (tooltipsExt?.detach) {
-    tooltipsExt.detach('.gantt_task_line')
-    tooltipsExt.detach('.gantt_task_content')
-  }
-  if (tooltip?.hide) {
-    tooltip.hide()
-  }
-  const node = tooltip?.getNode?.()
-  if (node) {
-    node.style.display = 'none'
-    node.style.visibility = 'hidden'
-    node.style.opacity = '0'
-  }
-  tooltipCleanupFns.value.forEach((fn) => fn())
-  tooltipCleanupFns.value = []
+  return { data: tasks, links: [] }
 }
 
 const destroyGantt = () => {
-  cleanupTaskTooltips()
   ganttEventIds.value.forEach((eventId) => gantt.detachEvent(eventId))
   ganttEventIds.value = []
   gantt.clearAll()
 }
 
-const formatGridDateText = (value: unknown) => {
-  const date = dayjs(value)
-  if (!date.isValid()) return '-'
-  return date.format('YYYY-MM-DD HH:mm:ss')
-}
 const formatTooltipDateTime = (value: unknown) => {
   const date = dayjs(value)
   if (!date.isValid()) return '-'
   return date.format('YYYY-MM-DD HH:mm:ss')
 }
-const getDeviceTaskSummary = (task: any) => {
-  if (!task) {
-    return {
-      planCount: 0,
-      totalPlanNumber: 0,
-      earliestStart: '-',
-      latestEnd: '-'
-    }
-  }
-  const childTaskIds = gantt.getChildren(task.id)
-  const childTasks = (Array.isArray(childTaskIds) ? childTaskIds : [])
-    .map((childId: string | number) => gantt.getTask(childId))
-    .filter((child: any) => child?._planData)
-  if (!childTasks.length) {
-    return {
-      planCount: 0,
-      totalPlanNumber: 0,
-      earliestStart: '-',
-      latestEnd: '-'
-    }
-  }
-  const starts = childTasks.map((child: any) => dayjs(child.start_date).valueOf()).filter((val: number) => Number.isFinite(val))
-  const ends = childTasks.map((child: any) => dayjs(child.end_date).valueOf()).filter((val: number) => Number.isFinite(val))
-  const totalPlanNumber = childTasks.reduce((sum: number, child: any) => sum + Number(child?._planData?.planNumber ?? 0), 0)
-  return {
-    planCount: childTasks.length,
-    totalPlanNumber,
-    earliestStart: starts.length ? formatTooltipDateTime(Math.min(...starts)) : '-',
-    latestEnd: ends.length ? formatTooltipDateTime(Math.max(...ends)) : '-'
-  }
-}
-const buildTaskTooltipHtml = (task: any, start?: Date, end?: Date) => {
-  const plan = task?._planData
-  if (plan) {
-    return `
-      <div><b>${t('GanttChart.GanttPanel.tooltipTaskDetail')}</b></div>
-      <div>${t('GanttChart.GanttPanel.tooltipTaskCode')}${plan.taskCode ?? '-'}</div>
-      <div>${t('GanttChart.GanttPanel.tooltipProduct')}${plan.productCode ?? '-'} / ${plan.productName ?? '-'}</div>
-      <div>${t('GanttChart.GanttPanel.tooltipDetailId')}${plan.taskDetailId ?? '-'}</div>
-      <div>${t('GanttChart.GanttPanel.tooltipPlanNumber')}${plan.planNumber ?? '-'}</div>
-      <div>${t('GanttChart.GanttPanel.tooltipStart')}${formatTooltipDateTime(start ?? task?.start_date)}</div>
-      <div>${t('GanttChart.GanttPanel.tooltipEnd')}${formatTooltipDateTime(end ?? task?.end_date)}</div>
-      <div>${t('GanttChart.GanttPanel.tooltipLatestStart')}${formatTooltipDateTime(plan.latestStartTimeStr)}</div>
-    `
-  }
-  const device = task?._deviceData
-  const summary = getDeviceTaskSummary(task)
-  return `
-    <div><b>${t('GanttChart.GanttPanel.tooltipSummary')}</b></div>
-    <div>${t('GanttChart.GanttPanel.tooltipDevice')}${device?.deviceName ?? '-'}</div>
-    <div>${t('GanttChart.GanttPanel.tooltipDetailCount')}${summary.planCount}</div>
-    <div>${t('GanttChart.GanttPanel.tooltipTotalPlanNumber')}${summary.totalPlanNumber}</div>
-    <div>${t('GanttChart.GanttPanel.tooltipEarliestStart')}${summary.earliestStart}</div>
-    <div>${t('GanttChart.GanttPanel.tooltipLatestEnd')}${summary.latestEnd}</div>
-  `
-}
-const getTaskByTooltipNode = (node: HTMLElement) => {
-  const holder = node.closest('[task_id]') || node.closest('[data-task-id]') || node.closest('.gantt_task_line') || node
-  const taskId = holder?.getAttribute('task_id') || holder?.getAttribute('data-task-id')
-  if (!taskId) return undefined
-  try {
-    return gantt.getTask(taskId)
-  } catch {
-    return undefined
-  }
+const clearCustomPlanBars = () => {
+  if (!ganttContainerRef.value) return
+  const existing = ganttContainerRef.value.querySelectorAll('.custom-plan-bar')
+  existing.forEach((el) => el.remove())
 }
 
-const initTaskTooltips = () => {
-  const tooltipsExt = (gantt.ext as any)?.tooltips
-  const tooltip = tooltipsExt?.tooltip
-  if (!tooltipsExt || !tooltip || !ganttContainerRef.value) return
+const renderCustomPlanBars = () => {
+  clearCustomPlanBars()
+  if (!ganttContainerRef.value) return
 
-  let tooltipHideTimer: ReturnType<typeof setTimeout> | null = null
+  const taskRows = ganttContainerRef.value.querySelectorAll('.gantt_task_row')
+  taskRows.forEach((row: Element) => {
+    const taskId = row.getAttribute('task_id')
+    if (!taskId) return
+    const task = gantt.getTask(taskId)
+    if (!task?._validPlans) return
+
+    const plans = task._validPlans as any[]
+    const rowHeight = gantt.config.row_height
+    const barHeight = Math.min(gantt.config.bar_height, rowHeight - 8)
+    const barTop = (rowHeight - barHeight) / 2
+
+    plans.forEach((plan: any) => {
+      const planStart = dayjs(plan.planStartTimeStr)
+      const planEnd = dayjs(plan.planEndTimeStr)
+      if (!planStart.isValid() || !planEnd.isValid()) return
+
+      const leftPos = gantt.posFromDate(planStart.toDate())
+      const rightPos = gantt.posFromDate(planEnd.toDate())
+      const width = Math.max(rightPos - leftPos, 4)
+
+      const bar = document.createElement('div')
+      bar.className = 'custom-plan-bar'
+      bar.style.cssText = `
+        position: absolute;
+        left: ${leftPos}px;
+        top: ${barTop}px;
+        width: ${width}px;
+        height: ${barHeight}px;
+        border-radius: 10px;
+        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+        cursor: pointer;
+        z-index: 2;
+        display: flex;
+        align-items: center;
+        padding: 0 8px;
+        font-size: 12px;
+        font-weight: 500;
+        color: #ffffff;
+        text-shadow: 0 1px 2px rgba(0,0,0,0.1);
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        box-sizing: border-box;
+      `
+
+      const planStatus = plan.planStatus
+      const statusColors: Record<number, string> = {
+        1: '#3b82f6',
+        8: '#10b981',
+        3: '#f59e0b',
+        4: '#f56c6c',
+        5: '#8e7cc3'
+      }
+      bar.style.backgroundColor = statusColors[planStatus] || '#6b7280'
 
-  const forceHideTooltip = () => {
-    if (tooltipHideTimer) {
-      clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = null
-    }
-    tooltip.hide()
-    const node = tooltip.getNode?.()
-    if (node) {
-      node.style.display = 'none'
-      node.style.visibility = 'hidden'
-      node.style.opacity = '0'
-    }
-  }
+      bar.textContent = `${plan.productCode ?? '-'} / ${plan.productName ?? '-'}`
 
-  const showTooltip = (event: MouseEvent, html: string) => {
-    if (tooltipHideTimer) {
-      clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = null
-    }
-    tooltip.setContent(html)
-    tooltip.show(event)
-    const node = tooltip.getNode?.()
-    if (node) {
-      node.style.display = 'block'
-      node.style.visibility = 'visible'
-      node.style.opacity = '1'
-      node.style.zIndex = '10000'
-      node.style.pointerEvents = 'none'
-    }
-  }
+      bar.setAttribute('data-plan-id', String(plan.planId ?? ''))
+      bar.setAttribute('data-device-id', String(task._deviceData?.deviceId ?? ''))
 
-  tooltipsExt.detach('.gantt_task_line')
-  tooltipsExt.detach('.gantt_task_content')
-  tooltipsExt.attach({
-    selector: '.gantt_task_line,.gantt_task_content',
-    onmouseenter: (event: MouseEvent, node: HTMLElement) => {
-      const task = getTaskByTooltipNode(node)
-      if (!task) return
-      showTooltip(event, buildTaskTooltipHtml(task))
-    },
-    onmousemove: (event: MouseEvent, node: HTMLElement) => {
-      const task = getTaskByTooltipNode(node)
-      if (!task) return
-      showTooltip(event, buildTaskTooltipHtml(task))
-    },
-    onmouseleave: () => {
-      forceHideTooltip()
-    }
-  })
+      bar.addEventListener('click', (e) => {
+        e.stopPropagation()
+        activePreviewTask.value = plan
+        activePreviewDevice.value = task._deviceData
+      })
 
-  const containerEl = ganttContainerRef.value
-  const containerMouseLeaveHandler = () => {
-    forceHideTooltip()
-  }
-  containerEl.addEventListener('mouseleave', containerMouseLeaveHandler)
-
-  const documentMouseMoveHandler = (e: MouseEvent) => {
-    const target = e.target as HTMLElement
-    if (!target) return
-    const isOverTask = target.closest('.gantt_task_line') || target.closest('.gantt_task_content')
-    if (!isOverTask) {
-      if (tooltipHideTimer) clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = setTimeout(forceHideTooltip, 150)
-    } else {
-      if (tooltipHideTimer) {
-        clearTimeout(tooltipHideTimer)
-        tooltipHideTimer = null
-      }
-    }
-  }
-  document.addEventListener('mousemove', documentMouseMoveHandler)
-
-  tooltipCleanupFns.value.push(() => {
-    containerEl.removeEventListener('mouseleave', containerMouseLeaveHandler)
-    document.removeEventListener('mousemove', documentMouseMoveHandler)
-    if (tooltipHideTimer) {
-      clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = null
-    }
-  })
-}
+      bar.addEventListener('mouseenter', (e) => {
+        const tooltipsExt = (gantt.ext as any)?.tooltips
+        const tooltip = tooltipsExt?.tooltip
+        if (!tooltip) return
+        const html = buildPlanBarTooltipHtml(plan, task._deviceData)
+        tooltip.setContent(html)
+        tooltip.show(e)
+        const node = tooltip.getNode?.()
+        if (node) {
+          node.style.display = 'block'
+          node.style.visibility = 'visible'
+          node.style.opacity = '1'
+          node.style.zIndex = '10000'
+          node.style.pointerEvents = 'none'
+        }
+      })
 
-const syncPlanTimeFromTask = (task: any) => {
-  if (!task?._planData || !props.editable) return
-  if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return
-  const start = dayjs(task.start_date)
-  const end = dayjs(task.end_date)
-  if (!start.isValid() || !end.isValid()) return
-  const duration = Math.max(Number(task.duration) || end.diff(start, 'day') + 1, 1)
-  task.duration = duration
-  task._planData.planStartTimeStr = start.format('YYYY-MM-DD HH:mm:ss')
-  task._planData.planEndTimeStr = end.format('YYYY-MM-DD HH:mm:ss')
-  task._planData.scheduleDays = duration
-  activePreviewDevice.value = task._deviceData
-  if (activePreviewTask.value && String(activePreviewTask.value.taskDetailId) === String(task._planData.taskDetailId)) {
-    activePreviewTask.value = task._planData
-  }
-}
+      bar.addEventListener('mouseleave', () => {
+        const tooltipsExt = (gantt.ext as any)?.tooltips
+        const tooltip = tooltipsExt?.tooltip
+        if (tooltip) {
+          tooltip.hide()
+        }
+      })
 
-const syncDeviceTaskRangeFromChildren = (task: any) => {
-  if (!task?._planData) return
-  const deviceTaskId = task.parent
-  if (!deviceTaskId) return
-  const childTaskIds = gantt.getChildren(deviceTaskId)
-  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return
-  const childTasks = childTaskIds.map((childId: string | number) => gantt.getTask(childId)).filter((item: any) => item?._planData)
-  if (!childTasks.length) return
-  const deviceRange = getDeviceTaskRangeByChildren(childTasks)
-  if (!deviceRange) return
-  const deviceTask = gantt.getTask(deviceTaskId)
-  deviceTask.start_date = deviceRange.start_date
-  deviceTask.end_date = deviceRange.end_date
-  deviceTask.duration = deviceRange.duration
-  gantt.updateTask(deviceTaskId)
-}
-
-const movePlanDataToDevice = (task: any, targetDeviceTaskId: string | number, sourceDeviceTaskId?: string | number) => {
-  if (!task?._planData || !props.editable) return
-  const targetDeviceTask = gantt.getTask(targetDeviceTaskId)
-  const targetDeviceData = targetDeviceTask?._deviceData
-  if (!targetDeviceData) return
-  const planIdentity = `${task?._planData?.taskId ?? ''}-${task?._planData?.taskDetailId ?? ''}`
-  const sourceDeviceTask = sourceDeviceTaskId ? gantt.getTask(sourceDeviceTaskId) : undefined
-  const sourceDeviceData = sourceDeviceTask?._deviceData
-  if (sourceDeviceData?.plans && Array.isArray(sourceDeviceData.plans)) {
-    sourceDeviceData.plans = sourceDeviceData.plans.filter((item: any) => {
-      const itemIdentity = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
-      return itemIdentity !== planIdentity
+      row.appendChild(bar)
     })
-  }
-  if (!Array.isArray(targetDeviceData.plans)) {
-    targetDeviceData.plans = []
-  }
-  const targetExists = targetDeviceData.plans.some((item: any) => {
-    const itemIdentity = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
-    return itemIdentity === planIdentity
   })
-  if (!targetExists) {
-    targetDeviceData.plans.push(task._planData)
-  }
-  task._planData.deviceId = targetDeviceData.deviceId
-  task._planData.feedingPipeline = targetDeviceData.deviceId
-  task._deviceData = targetDeviceData
-}
-
-const normalizeDeviceChildren = (deviceTaskId: string | number, priorityTaskId?: string | number) => {
-  const childTaskIds = gantt.getChildren(deviceTaskId)
-  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return
-  const childTasks = childTaskIds
-    .map((childId: string | number) => gantt.getTask(childId))
-    .filter((item: any) => item?._planData)
-    .sort((a: any, b: any) => {
-      const startDiff = dayjs(a.start_date).valueOf() - dayjs(b.start_date).valueOf()
-      if (startDiff !== 0) return startDiff
-      if (priorityTaskId !== undefined && String(a.id) === String(priorityTaskId)) return -1
-      if (priorityTaskId !== undefined && String(b.id) === String(priorityTaskId)) return 1
-      return 0
-    })
-  childTasks.forEach((item: any) => {
-    syncPlanTimeFromTask(item)
-    gantt.updateTask(item.id)
-  })
-  const fakePlanTask = { _planData: true, parent: deviceTaskId }
-  syncDeviceTaskRangeFromChildren(fakePlanTask)
-}
-
-const refreshPlanLinksByRowOrder = () => {
-  const allLinks = gantt.getLinks()
-  allLinks.forEach((item: any) => gantt.deleteLink(item.id))
-  let linkIndex = 1
-  const deviceTaskIds = gantt.getChildren(0)
-  deviceTaskIds.forEach((deviceTaskId: string | number) => {
-    const childTaskIds = gantt.getChildren(deviceTaskId).filter((childId: string | number) => {
-      const task = gantt.getTask(childId)
-      return !!task?._planData
-    })
-    let previousTaskId: string | number | null = null
-    childTaskIds.forEach((taskId: string | number) => {
-      if (previousTaskId !== null) {
-        gantt.addLink({
-          id: `link-${linkIndex++}`,
-          source: previousTaskId,
-          target: taskId,
-          type: '0'
-        })
-      }
-      previousTaskId = taskId
-    })
-  })
-}
-
-const getDeviceInsertIndex = (deviceTaskId: string | number, startDate: dayjs.Dayjs) => {
-  const childTaskIds = gantt.getChildren(deviceTaskId)
-  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return 0
-  const targetStart = startDate.startOf('day').valueOf()
-  for (let index = 0; index < childTaskIds.length; index += 1) {
-    const childTask = gantt.getTask(childTaskIds[index])
-    if (!childTask?._planData) continue
-    const childStart = dayjs(childTask.start_date).startOf('day').valueOf()
-    if (childStart >= targetStart) return index
-  }
-  return childTaskIds.length
-}
-
-const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDate: string, durationValue: number) => {
-  const targetDeviceTask = gantt.getTask(targetDeviceTaskId)
-  if (!targetDeviceTask || targetDeviceTask?._planData) return
-  const sourceDeviceTaskId = task.parent
-  const nextStart = dayjs(startDate).startOf('day')
-  const duration = Math.max(Number(durationValue) || 1, 1)
-  task.parent = targetDeviceTaskId
-  task.start_date = nextStart.toDate()
-  task.end_date = nextStart.add(duration - 1, 'day').endOf('day').toDate()
-  task.duration = duration
-  movePlanDataToDevice(task, targetDeviceTaskId, sourceDeviceTaskId)
-  const targetIndex = getDeviceInsertIndex(targetDeviceTaskId, nextStart)
-  gantt.moveTask(task.id, targetIndex, targetDeviceTaskId)
-  gantt.updateTask(task.id)
-  syncPlanTimeFromTask(task)
-  normalizeDeviceChildren(targetDeviceTaskId, task.id)
-  if (sourceDeviceTaskId && sourceDeviceTaskId !== targetDeviceTaskId) {
-    normalizeDeviceChildren(sourceDeviceTaskId)
-  }
-  refreshPlanLinksByRowOrder()
-  refreshTimelineRangeByTasks()
 }
 
-const openTaskAdjustDialog = (task: any) => {
-  if (!task?._planData || !props.editable) return
-  taskAdjustTaskId.value = task.id
-  taskAdjustForm.deviceTaskId = String(task.parent ?? '')
-  taskAdjustForm.startDate = dayjs(task.start_date).format('YYYY-MM-DD')
-  taskAdjustForm.duration = Math.max(Number(task.duration) || 1, 1)
-  taskAdjustDialogVisible.value = true
-}
-
-const handleTaskAdjustSubmit = () => {
-  if (!taskAdjustTaskId.value || !props.editable) return
-  if (!taskAdjustForm.deviceTaskId || !taskAdjustForm.startDate) {
-    message.warning(t('GanttChart.GanttPanel.warningCompleteDeviceDate'))
-    return
-  }
-  const task = gantt.getTask(taskAdjustTaskId.value)
-  if (!task?._planData) return
-  ganttSyncing.value = true
-  try {
-    applyTaskAdjust(task, taskAdjustForm.deviceTaskId, taskAdjustForm.startDate, taskAdjustForm.duration)
-  } finally {
-    ganttSyncing.value = false
-  }
-  taskAdjustDialogVisible.value = false
-}
-
-const handleStartDateEditorSubmit = () => {
-  if (!startDateEditorTaskId.value || !startDateEditorValue.value) {
-    startDateEditorVisible.value = false
-    return
-  }
-  const task = gantt.getTask(startDateEditorTaskId.value)
-  if (!task?._planData) {
-    startDateEditorVisible.value = false
-    return
-  }
-  const newStart = dayjs(startDateEditorValue.value)
-  if (!newStart.isValid()) {
-    message.warning(t('GanttChart.GanttPanel.warningValidTime'))
-    return
-  }
-  const duration = Math.max(Number(task.duration) || 1, 1)
-  const newEnd = newStart.add(duration - 1, 'day').endOf('day')
-  ganttSyncing.value = true
-  try {
-    task.start_date = newStart.toDate()
-    task.end_date = newEnd.toDate()
-    task.duration = duration
-    syncPlanTimeFromTask(task)
-    normalizeDeviceChildren(task.parent)
-    refreshPlanLinksByRowOrder()
-    refreshTimelineRangeByTasks()
-    gantt.updateTask(task.id)
-  } finally {
-    ganttSyncing.value = false
-  }
-  startDateEditorVisible.value = false
-}
-
-const refreshTimelineRangeByTasks = () => {
-  let minStart = Number.POSITIVE_INFINITY
-  let maxEnd = Number.NEGATIVE_INFINITY
-  gantt.eachTask((task: any) => {
-    if (!task?._planData) return
-    const start = dayjs(task.start_date).valueOf()
-    const end = dayjs(task.end_date).valueOf()
-    if (!Number.isFinite(start) || !Number.isFinite(end)) return
-    minStart = Math.min(minStart, start)
-    maxEnd = Math.max(maxEnd, end)
-  })
-  if (!Number.isFinite(minStart) || !Number.isFinite(maxEnd)) return
-
-  const nextStartDate = dayjs(minStart).startOf('day').toDate()
-  const nextEndDate = dayjs(maxEnd).endOf('day').toDate()
-  const currentStart = dayjs(gantt.config.start_date).valueOf()
-  const currentEnd = dayjs(gantt.config.end_date).valueOf()
-  const nextStart = dayjs(nextStartDate).valueOf()
-  const nextEnd = dayjs(nextEndDate).valueOf()
-  if (currentStart === nextStart && currentEnd === nextEnd) return
-
-  gantt.config.start_date = nextStartDate
-  gantt.config.end_date = nextEndDate
-  gantt.render()
+const buildPlanBarTooltipHtml = (plan: any, device: any) => {
+  return `
+    <div><b>${t('GanttChart.GanttPanel.tooltipTaskDetail')}</b></div>
+    <div>${t('GanttChart.GanttPanel.tooltipDevice')}${device?.deviceName ?? '-'}</div>
+    <div>${t('GanttChart.GanttPanel.tooltipTaskCode')}${plan.taskCode ?? '-'}</div>
+    <div>${t('GanttChart.GanttPanel.tooltipProduct')}${plan.productCode ?? '-'} / ${plan.productName ?? '-'}</div>
+    <div>${t('GanttChart.GanttPanel.tooltipPlanNumber')}${plan.planNumber ?? '-'}</div>
+    <div>${t('GanttChart.GanttPanel.tooltipStart')}${formatTooltipDateTime(plan.planStartTimeStr)}</div>
+    <div>${t('GanttChart.GanttPanel.tooltipEnd')}${formatTooltipDateTime(plan.planEndTimeStr)}</div>
+    <div>${t('GanttChart.GanttPanel.tooltipLatestStart')}${formatTooltipDateTime(plan.latestStartTimeStr)}</div>
+  `
 }
 
 const initGanttPreview = () => {
   if (!ganttContainerRef.value) return
   destroyGantt()
+  clearCustomPlanBars()
   if (!previewScheduleList.value.length) {
     activePreviewDevice.value = undefined
     activePreviewTask.value = undefined
     return
   }
 
-  // 加载甘特图插件
-  gantt.plugins({ tooltip: true, inline_edit: true, undo: true })
-
-  // 编辑相关配置
-  gantt.config.readonly = !props.editable         // 是否只读模式
-  gantt.config.drag_move = !!props.editable       // 是否允许拖动任务
-  gantt.config.drag_links = false                 // 是否允许拖动链接
-  gantt.config.drag_progress = false              // 是否允许拖动进度
-  gantt.config.drag_resize = !!props.editable     // 是否允许调整任务大小
-  gantt.config.order_branch = !!props.editable    // 是否允许分支内排序
-  gantt.config.order_branch_free = !!props.editable // 是否允许跨分支排序
-  gantt.config.details_on_dblclick = false        // 双击是否显示详情
-  gantt.config.show_progress = false              // 是否显示进度条
-
-  // 布局相关配置
-  gantt.config.row_height = 48                    // 任务行高度
-  gantt.config.scale_height = 70                  // 时间轴高度
-  gantt.config.xml_date = '%Y-%m-%d %H:%i'        // 日期格式
-  gantt.config.task_height = 36                   // 任务条高度
-  gantt.config.min_column_width = 80              // 最小列宽
-  gantt.config.column_width = 90                  // 默认列宽
-  gantt.config.bar_height = 34                   // 任务条实际高度
-  gantt.config.resize_step = 15                   // 调整步长
+  gantt.plugins({ tooltip: true })
+
+  gantt.config.tooltip_timeout = 0
+  gantt.templates.tooltip_text = () => ''
+
+  gantt.config.readonly = true
+  gantt.config.drag_move = false
+  gantt.config.drag_links = false
+  gantt.config.drag_progress = false
+  gantt.config.drag_resize = false
+  gantt.config.order_branch = false
+  gantt.config.order_branch_free = false
+  gantt.config.details_on_dblclick = false
+  gantt.config.show_progress = false
+
+  gantt.config.row_height = 48
+  gantt.config.scale_height = 70
+  gantt.config.xml_date = '%Y-%m-%d %H:%i'
+  gantt.config.task_height = 36
+  gantt.config.min_column_width = 80
+  gantt.config.column_width = 90
+  gantt.config.bar_height = 34
+  gantt.config.resize_step = 15
 
   gantt.config.columns = [
     {
       name: 'text',
-      label: t('GanttChart.GanttPanel.columnTaskName'),
-      tree: true,
+      label: t('GanttChart.GanttPanel.columnDeviceName'),
+      tree: false,
       width: '*',
-      min_width: 200
-    },
-    {
-      name: 'start_date',
-      label: t('GanttChart.GanttPanel.columnStartTime'),
-      align: 'center',
-      width: 210,
-      template: (task: any) =>
-        props.editable && task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
-          ? `<span class="gantt-inline-editor-trigger" data-field="start_date" data-task-id="${task.id}">${formatGridDateText(task.start_date)}</span>`
-          : formatGridDateText(task.start_date)
+      min_width: 160,
+      template: (task: any) => task.deviceName ?? task.text ?? '-'
     },
     {
       name: 'duration',
       label: t('GanttChart.GanttPanel.columnDays'),
       align: 'center',
-      width: 60,
-      template: (task: any) =>
-        props.editable && task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
-          ? `<span class="gantt-inline-editor-trigger" data-field="duration">${task.duration ?? 0}</span>`
-          : String(task.duration ?? 0),
-      editor: {
-        type: 'number',
-        map_to: 'duration',
-        min: 1
-      }
+      width: 80,
+      template: (task: any) => String(task.totalDays ?? task.duration ?? 0)
     }
   ]
 
@@ -764,33 +345,9 @@ const initGanttPreview = () => {
     { unit: 'day', step: 1, format: (date) => dayjs(date).format('MM-DD') }
   ]
 
-  gantt.templates.tooltip_text = (start, end, task: any) => buildTaskTooltipHtml(task, start, end)
   gantt.templates.task_class = (_start, _end, task: any) => {
-    if (!task?._planData) return ''
-
-    // 当 editable 为 false 时，根据 planStatus 显示对应的颜色
-    if (!props.editable) {
-      const planStatus = task._planData?.planStatus
-      const statusMap: Record<number | string, string> = {
-        '1': 'schedule-plan-task-status-1',
-        1: 'schedule-plan-task-status-1',
-        '8': 'schedule-plan-task-status-8',
-        8: 'schedule-plan-task-status-8',
-        '3': 'schedule-plan-task-status-3',
-        3: 'schedule-plan-task-status-3',
-        '4': 'schedule-plan-task-status-4',
-        4: 'schedule-plan-task-status-4',
-        '5': 'schedule-plan-task-status-5',
-        5: 'schedule-plan-task-status-5',
-        '2': 'schedule-plan-task-status-2',
-        2: 'schedule-plan-task-status-2'
-      }
-      return statusMap[planStatus] || 'schedule-plan-task-default'
-    }
-
-    // 当 editable 为 true 时，使用原来的逻辑
-    const sourceType = String(task?._planData?.sourceType ?? '').toUpperCase()
-    return sourceType === 'HISTORY' ? 'schedule-plan-task-history' : 'schedule-plan-task'
+    if (task._validPlans) return 'schedule-device-row'
+    return ''
   }
 
   const globalRange = getGlobalDateRange(previewScheduleList.value)
@@ -802,13 +359,6 @@ const initGanttPreview = () => {
   const ganttData = buildPreviewGanttData(previewScheduleList.value)
   gantt.parse(ganttData)
 
-  // 强制刷新所有任务的样式，确保颜色正确应用
-  gantt.eachTask((task: any) => {
-    gantt.refreshTask(task.id)
-  })
-
-  initTaskTooltips()
-
   if (ganttData.data.length) {
     activePreviewDevice.value = ganttData.data[0]._deviceData
     const today = dayjs().startOf('day').toDate()
@@ -822,146 +372,26 @@ const initGanttPreview = () => {
     }
   }
 
-  const clickEventId = gantt.attachEvent('onTaskClick', (id, event: MouseEvent) => {
+  const clickEventId = gantt.attachEvent('onTaskClick', (id) => {
     const task = gantt.getTask(id)
-    if (task?._planData) {
-      activePreviewTask.value = task._planData
-      activePreviewDevice.value = task._deviceData
-    } else {
+    if (task?._deviceData) {
       activePreviewTask.value = undefined
-      activePreviewDevice.value = task?._deviceData
-    }
-    if (!props.editable) return true
-    const target = event?.target as HTMLElement | null
-    const editableNode = target?.closest('.gantt-inline-editor-trigger') as HTMLElement | null
-    const field = editableNode?.dataset?.field
-    if (!field || !task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return true
-    if (field === 'start_date') {
-      startDateEditorTaskId.value = id
-      startDateEditorValue.value = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
-      startDateEditorVisible.value = true
-      return false
-    }
-    const inlineEditors = (gantt.ext as any)?.inlineEditors
-    if (inlineEditors?.startEdit) {
-      inlineEditors.startEdit(id, field)
-      return false
+      activePreviewDevice.value = task._deviceData
     }
     return true
   })
   ganttEventIds.value.push(clickEventId)
 
-  if (props.editable && ganttContainerRef.value) {
-    const gridClickHandler = (e: MouseEvent) => {
-      const target = e.target as HTMLElement
-      const trigger = target.closest('.gantt-inline-editor-trigger[data-field="start_date"]') as HTMLElement | null
-      if (!trigger) return
-      const taskId = trigger.getAttribute('data-task-id')
-      if (!taskId) return
-      try {
-        const task = gantt.getTask(taskId)
-        if (!task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return
-        e.stopPropagation()
-        startDateEditorTaskId.value = taskId
-        startDateEditorValue.value = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
-        startDateEditorVisible.value = true
-      } catch { }
-    }
-    ganttContainerRef.value.addEventListener('click', gridClickHandler, true)
-    tooltipCleanupFns.value.push(() => {
-      ganttContainerRef.value?.removeEventListener('click', gridClickHandler, true)
-    })
-  }
-
-  if (!props.editable) return
-
-  const beforeDragEventId = gantt.attachEvent('onBeforeTaskDrag', (id) => {
-    const task = gantt.getTask(id)
-    if (!task?._planData) return false
-    taskDragDurationMap.value[String(id)] = Math.max(Number(task.duration) || 1, 1)
-    return String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
-  })
-
-  const beforeMoveEventId = gantt.attachEvent('onBeforeTaskMove', (id, parent) => {
-    const task = gantt.getTask(id)
-    if (!task?._planData) return false
-    if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return false
-    const targetTask = gantt.getTask(parent)
-    if (!targetTask || targetTask?._planData) return false
-    taskMoveFromParentMap.value[String(id)] = task.parent
-    return true
-  })
-
-  const afterMoveEventId = gantt.attachEvent('onAfterTaskMove', (id, parent) => {
-    const task = gantt.getTask(id)
-    if (!task?._planData) return
-    const sourceParent = taskMoveFromParentMap.value[String(id)]
-    delete taskMoveFromParentMap.value[String(id)]
-    if (!sourceParent && sourceParent !== 0) return
-    if (sourceParent === parent) {
-      refreshPlanLinksByRowOrder()
-      return
-    }
-    if (ganttSyncing.value) return
-    ganttSyncing.value = true
-    try {
-      movePlanDataToDevice(task, parent, sourceParent)
-      syncPlanTimeFromTask(task)
-      normalizeDeviceChildren(parent)
-      normalizeDeviceChildren(sourceParent)
-      refreshPlanLinksByRowOrder()
-      refreshTimelineRangeByTasks()
-    } finally {
-      ganttSyncing.value = false
-    }
-  })
-
-  const contextMenuEventId = gantt.attachEvent('onContextMenu', (taskId, _linkId, event: MouseEvent) => {
-    const task = gantt.getTask(taskId)
-    if (!task?._planData) return true
-    if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return false
-    event.preventDefault()
-    openTaskAdjustDialog(task)
-    return false
-  })
-
-  const dragEventId = gantt.attachEvent('onAfterTaskDrag', (id, mode) => {
-    if (ganttSyncing.value) return
-    const task = gantt.getTask(id)
-    const taskId = String(id)
-    const originalDuration = taskDragDurationMap.value[taskId]
-    delete taskDragDurationMap.value[taskId]
-    ganttSyncing.value = true
-    try {
-      if (mode === gantt.config.drag_mode.move && Number(originalDuration) > 0) {
-        task.duration = originalDuration
-      }
-      syncPlanTimeFromTask(task)
-      normalizeDeviceChildren(task.parent)
-      refreshPlanLinksByRowOrder()
-      refreshTimelineRangeByTasks()
-    } finally {
-      ganttSyncing.value = false
-    }
+  nextTick(() => {
+    renderCustomPlanBars()
   })
 
-  const updateEventId = gantt.attachEvent('onAfterTaskUpdate', (id) => {
-    if (ganttSyncing.value) return
-    const task = gantt.getTask(id)
-    ganttSyncing.value = true
-    try {
-      syncPlanTimeFromTask(task)
-      normalizeDeviceChildren(task.parent)
-      refreshPlanLinksByRowOrder()
-      refreshTimelineRangeByTasks()
-      gantt.refreshTask(id)
-    } finally {
-      ganttSyncing.value = false
-    }
+  const renderEventId = gantt.attachEvent('onGanttRender', () => {
+    nextTick(() => {
+      renderCustomPlanBars()
+    })
   })
-
-  ganttEventIds.value.push(beforeDragEventId, beforeMoveEventId, afterMoveEventId, contextMenuEventId, dragEventId, updateEventId)
-  refreshPlanLinksByRowOrder()
+  ganttEventIds.value.push(renderEventId)
 }
 
 onMounted(async () => {
@@ -1213,6 +643,11 @@ onBeforeUnmount(() => {
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 
+.schedule-gantt-container :deep(.gantt_task_line.schedule-device-row) {
+  visibility: hidden;
+  pointer-events: none;
+}
+
 .schedule-gantt-container :deep(.gantt_task_line.schedule-plan-task) {
   background: #67c23a;
 }
diff --git a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
index a3545f33..d485110f 100644
--- a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
+++ b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="schedule-preview-wrap">
-    <div ref="ganttContainerRef" class="schedule-gantt-container" :style="{ height }"></div>
+    <div class="gantt-main-area">
+      <div ref="ganttContainerRef" class="schedule-gantt-container" :style="{ height }"></div>
+    </div>
     <div class="schedule-detail-panel">
       <div class="schedule-detail-title">计划信息</div>
       <template v-if="activePreviewDevice">
@@ -8,7 +10,7 @@
           <el-descriptions-item label="设备名称">{{ activePreviewDevice.deviceName }}</el-descriptions-item>
           <el-descriptions-item label="设备ID">{{ activePreviewDevice.deviceId }}</el-descriptions-item>
           <el-descriptions-item v-if="activePreviewDevice.capacityType !== undefined" label="产能来源">{{ getCapacityTypeLabel(activePreviewDevice.capacityType) }}</el-descriptions-item>
-          <el-descriptions-item label="产能">{{ activePreviewDevice.ratedCapacity ?? '-' }}</el-descriptions-item>
+          <el-descriptions-item v-if="activePreviewDevice.capacityType === 1" label="产能">{{ activePreviewDevice.ratedCapacity ?? '-' }}</el-descriptions-item>
           <el-descriptions-item v-if="'dailyAverageValue' in activePreviewDevice" label="每日报工平均值">{{ activePreviewDevice.dailyAverageValue ?? '-' }}</el-descriptions-item>
           <el-descriptions-item v-if="'dataCollectionCapacity' in activePreviewDevice" label="数据采集产能">{{ activePreviewDevice.dataCollectionCapacity ?? '-' }}</el-descriptions-item>
           <el-descriptions-item label="计划条数">{{ activePreviewDevice.plans?.length ?? 0 }}</el-descriptions-item>
@@ -17,18 +19,23 @@
         <div class="schedule-plan-list">
           <div
             v-for="(plan, index) in activePreviewTask ? [activePreviewTask] : (activePreviewDevice?.plans ?? [])"
-            :key="`${activePreviewDevice?.deviceId}-${plan.taskDetailId}-${index}`"
+            :key="`${activePreviewDevice?.deviceId}-${plan.planId}-${index}`"
             :class="['schedule-plan-item', { 'schedule-plan-item-active': plan.sourceType === 'CURRENT' }]"
           >
             <div class="schedule-plan-item-head">
               <span class="schedule-plan-item-title">{{ plan.productCode ?? '-' }} / {{ plan.productName ?? '-' }}</span>
             </div>
             <div>计划编码：{{ plan.taskCode ?? '-' }}</div>
-            <div>计划数量：{{ plan.planNumber ?? '-' }}</div>
+            <div>计划数量：{{ plan.planNumber ?? '-' }}</div> 
+            <template v-if="activePreviewDevice.capacityType !== 1">
+              <div>产能：{{ plan.ratedCapacity ?? '-' }}</div>
+              <div>产能来源：{{ getCapacityTypeLabel(plan.capacityType) }}</div>
+            </template>
             <div>交货日期：{{ plan.deliveryDateStr ?? '-' }}</div>
             <div>开始：{{ plan.planStartTimeStr || '-' }}</div>
             <div>结束：{{ plan.planEndTimeStr || '-' }}</div>
             <div>最晚开工：{{ plan.latestStartTimeStr || '-' }}</div>
+           
           </div>
         </div>
       </template>
@@ -91,25 +98,22 @@ const message = useMessage()
 const ganttContainerRef = ref<HTMLDivElement>()
 const activePreviewDevice = ref<any>()
 const activePreviewTask = ref<any>()
-
-const getCapacityTypeLabel = (value: any) => {
-  if (value === undefined || value === null) return '-'
-  const options = getDictOptions('capacity_sources')
-  const found = options.find((opt) => Number(opt.value) === Number(value))
-  return found?.label ?? String(value)
-}
-const tooltipCleanupFns = ref<(() => void)[]>([])
 const ganttEventIds = ref<string[]>([])
 const ganttSyncing = ref(false)
 const taskAdjustDialogVisible = ref(false)
-const taskAdjustTaskId = ref<string | number | null>(null)
 const taskAdjustForm = reactive({
   deviceTaskId: '',
   startDate: '',
   endDate: ''
 })
-const taskMoveFromParentMap = ref<Record<string, string | number | undefined>>({})
-const taskDragDurationMap = ref<Record<string, number>>({})
+const editingPlanIdentity = ref<string | null>(null)
+
+const getCapacityTypeLabel = (value: any) => {
+  if (value === undefined || value === null) return '-'
+  const options = getDictOptions('capacity_sources')
+  const found = options.find((opt) => Number(opt.value) === Number(value))
+  return found?.label ?? String(value)
+}
 
 const previewScheduleList = computed(() => (Array.isArray(props.scheduleList) ? props.scheduleList : []))
 const previewDeviceOptions = computed(() =>
@@ -131,15 +135,9 @@ const getGlobalDateRange = (scheduleList: any[]) => {
   const ends = allPlans.map((item: any) => dayjs(item?.planEndTimeStr).valueOf()).filter((item: number) => Number.isFinite(item))
   if (!starts.length || !ends.length) {
     const now = Date.now()
-    return {
-      start: now,
-      end: now + 7 * 24 * 60 * 60 * 1000
-    }
-  }
-  return {
-    start: Math.min(...starts),
-    end: Math.max(...ends)
+    return { start: now, end: now + 7 * 24 * 60 * 60 * 1000 }
   }
+  return { start: Math.min(...starts), end: Math.max(...ends) }
 }
 
 const formatGanttDate = (value: unknown) => {
@@ -148,27 +146,10 @@ const formatGanttDate = (value: unknown) => {
   return date.format('YYYY-MM-DD HH:mm')
 }
 
-const getDeviceTaskRangeByChildren = (planTasks: any[]) => {
-  const starts = planTasks.map((item: any) => dayjs(item?.start_date)).filter((item: any) => item.isValid())
-  const ends = planTasks.map((item: any) => dayjs(item?.end_date)).filter((item: any) => item.isValid())
-  if (!starts.length || !ends.length) return undefined
-  const earliestStart = starts.reduce((min: any, current: any) => (current.valueOf() < min.valueOf() ? current : min))
-  const latestEnd = ends.reduce((max: any, current: any) => (current.valueOf() > max.valueOf() ? current : max))
-  const duration = Math.max(latestEnd.endOf('day').diff(earliestStart.startOf('day'), 'day') + 1, 1)
-  return {
-    start_date: earliestStart.toDate(),
-    end_date: latestEnd.toDate(),
-    duration
-  }
-}
-
 const buildPreviewGanttData = (scheduleList: any[]) => {
   const tasks: any[] = []
-  const links: any[] = []
-  let linkIndex = 1
 
   scheduleList.forEach((device: any) => {
-    const deviceId = `device-${device.deviceId}`
     const plans = (device?.plans ?? []).map((plan: any) => ({
       ...plan,
       _start: dayjs(plan?.planStartTimeStr),
@@ -177,628 +158,499 @@ const buildPreviewGanttData = (scheduleList: any[]) => {
     const validPlans = plans
       .filter((plan: any) => plan._start.isValid() && plan._end.isValid())
       .sort((a: any, b: any) => a._start.valueOf() - b._start.valueOf())
-    const firstPlan = validPlans[0]
-    const deviceRange = getDeviceTaskRangeByChildren(
-      validPlans.map((item: any) => ({
-        start_date: item?._start,
-        end_date: item?._end
-      }))
-    )
+
+    if (!validPlans.length) return
+
+    const allStarts = validPlans.map((p: any) => p._start.valueOf())
+    const allEnds = validPlans.map((p: any) => p._end.valueOf())
+    const earliestStart = dayjs(Math.min(...allStarts))
+    const latestEnd = dayjs(Math.max(...allEnds))
+    const totalDays = Math.max(latestEnd.endOf('day').diff(earliestStart.startOf('day'), 'day') + 1, 1)
 
     tasks.push({
-      id: deviceId,
-      text: `${device.deviceName ?? '-'}`,
-      start_date: formatGanttDate(deviceRange?.start_date ?? firstPlan?._start),
-      end_date: formatGanttDate(deviceRange?.end_date ?? firstPlan?._end),
-      duration: deviceRange?.duration ?? 1,
+      id: `device-${device.deviceId}`,
+      text: device.deviceName ?? '-',
+      start_date: formatGanttDate(earliestStart),
+      end_date: formatGanttDate(latestEnd),
+      duration: totalDays,
       parent: 0,
       progress: 0,
-      open: true,
       readonly: true,
       deviceName: device.deviceName ?? '-',
-      _deviceData: device
-    })
-
-    let previousPlanTaskId: string | null = null
-    validPlans.forEach((plan: any, index: number) => {
-      const startDate = formatGanttDate(plan.planStartTimeStr)
-      const endDate = formatGanttDate(plan.planEndTimeStr)
-      const duration = Number(plan.scheduleDays) > 0 ? Number(plan.scheduleDays) : Math.max(plan._end.diff(plan._start, 'day') + 1, 1)
-      if (!startDate || !endDate) return
-      const isHistory = String(plan.sourceType ?? '').toUpperCase() === 'HISTORY'
-      const planTaskId = `plan-${device.deviceId}-${plan.taskDetailId ?? index}-${index}`
-      tasks.push({
-        id: planTaskId,
-        text: `${plan.productCode ?? '-'} / ${plan.productName ?? '-'} / ${plan.taskCode ?? '-'}`,
-        start_date: startDate,
-        end_date: endDate,
-        duration,
-        parent: deviceId,
-        progress: 0,
-        readonly: isHistory,
-        _planData: plan,
-        _deviceData: device
-      })
-      if (previousPlanTaskId) {
-        links.push({
-          id: `link-${linkIndex++}`,
-          source: previousPlanTaskId,
-          target: planTaskId,
-          type: '0'
-        })
-      }
-      previousPlanTaskId = planTaskId
+      totalDays,
+      _deviceData: device,
+      _validPlans: validPlans
     })
   })
 
-  return { data: tasks, links }
-}
-
-const cleanupTaskTooltips = () => {
-  const tooltipsExt = (gantt.ext as any)?.tooltips
-  const tooltip = tooltipsExt?.tooltip
-  if (tooltipsExt?.detach) {
-    tooltipsExt.detach('.gantt_task_line')
-    tooltipsExt.detach('.gantt_task_content')
-  }
-  if (tooltip?.hide) {
-    tooltip.hide()
-  }
-  const node = tooltip?.getNode?.()
-  if (node) {
-    node.style.display = 'none'
-    node.style.visibility = 'hidden'
-    node.style.opacity = '0'
-  }
-  tooltipCleanupFns.value.forEach((fn) => fn())
-  tooltipCleanupFns.value = []
+  return { data: tasks, links: [] }
 }
 
 const destroyGantt = () => {
-  try {
-    cleanupTaskTooltips()
-  } catch {}
-  try {
-    ganttEventIds.value.forEach((eventId) => {
-      try {
-        gantt.detachEvent(eventId)
-      } catch {}
-    })
-  } catch {}
+  ganttEventIds.value.forEach((eventId) => {
+    try { gantt.detachEvent(eventId) } catch {}
+  })
   ganttEventIds.value = []
-  try {
-    gantt.clearAll()
-  } catch {}
+  try { gantt.clearAll() } catch {}
 }
 
-const formatGridDateText = (value: unknown) => {
-  const date = dayjs(value)
-  if (!date.isValid()) return '-'
-  return date.format('YYYY-MM-DD HH:mm:ss')
-}
 const formatTooltipDateTime = (value: unknown) => {
   const date = dayjs(value)
   if (!date.isValid()) return '-'
   return date.format('YYYY-MM-DD HH:mm:ss')
 }
-const getDeviceTaskSummary = (task: any) => {
-  if (!task) {
-    return {
-      planCount: 0,
-      totalPlanNumber: 0,
-      earliestStart: '-',
-      latestEnd: '-'
-    }
-  }
-  const childTaskIds = gantt.getChildren(task.id)
-  const childTasks = (Array.isArray(childTaskIds) ? childTaskIds : [])
-    .map((childId: string | number) => gantt.getTask(childId))
-    .filter((child: any) => child?._planData)
-  if (!childTasks.length) {
-    return {
-      planCount: 0,
-      totalPlanNumber: 0,
-      earliestStart: '-',
-      latestEnd: '-'
-    }
-  }
-  const starts = childTasks.map((child: any) => dayjs(child.start_date).valueOf()).filter((val: number) => Number.isFinite(val))
-  const ends = childTasks.map((child: any) => dayjs(child.end_date).valueOf()).filter((val: number) => Number.isFinite(val))
-  const totalPlanNumber = childTasks.reduce((sum: number, child: any) => sum + Number(child?._planData?.planNumber ?? 0), 0)
-  return {
-    planCount: childTasks.length,
-    totalPlanNumber,
-    earliestStart: starts.length ? formatTooltipDateTime(Math.min(...starts)) : '-',
-    latestEnd: ends.length ? formatTooltipDateTime(Math.max(...ends)) : '-'
-  }
+
+const clearCustomPlanBars = () => {
+  if (!ganttContainerRef.value) return
+  const existing = ganttContainerRef.value.querySelectorAll('.custom-plan-bar')
+  existing.forEach((el) => el.remove())
 }
-const buildTaskTooltipHtml = (task: any, start?: Date, end?: Date) => {
-  const plan = task?._planData
-  if (plan) {
-    return `
-      <div><b>任务明细</b></div>
-      <div>任务单：${plan.taskCode ?? '-'}</div>
-      <div>产品：${plan.productCode ?? '-'} / ${plan.productName ?? '-'}</div>
-      <div>明细ID：${plan.taskDetailId ?? '-'}</div>
-      <div>计划数量：${plan.planNumber ?? '-'}</div>
-      <div>开始：${formatTooltipDateTime(start ?? task?.start_date)}</div>
-      <div>结束：${formatTooltipDateTime(end ?? task?.end_date)}</div>
-      <div>最晚开工：${formatTooltipDateTime(plan.latestStartTimeStr)}</div>
-    `
-  }
-  const device = task?._deviceData
-  const summary = getDeviceTaskSummary(task)
+
+const buildPlanBarTooltipHtml = (plan: any, device: any) => {
   return `
-    <div><b>汇总</b></div>
+    <div><b>任务明细</b></div>
     <div>设备：${device?.deviceName ?? '-'}</div>
-    <div>任务明细条数：${summary.planCount}</div>
-    <div>计划总数：${summary.totalPlanNumber}</div>
-    <div>最早计划开始：${summary.earliestStart}</div>
-    <div>最晚计划结束：${summary.latestEnd}</div>
+    <div>任务单：${plan.taskCode ?? '-'}</div>
+    <div>产品：${plan.productCode ?? '-'} / ${plan.productName ?? '-'}</div>
+    <div>计划数量：${plan.planNumber ?? '-'}</div>
+    <div>开始：${formatTooltipDateTime(plan.planStartTimeStr)}</div>
+    <div>结束：${formatTooltipDateTime(plan.planEndTimeStr)}</div>
+    <div>最晚开工：${formatTooltipDateTime(plan.latestStartTimeStr)}</div>
   `
 }
-const getTaskByTooltipNode = (node: HTMLElement) => {
-  const holder = node.closest('[task_id]') || node.closest('[data-task-id]') || node.closest('.gantt_task_line') || node
-  const taskId = holder?.getAttribute('task_id') || holder?.getAttribute('data-task-id')
-  if (!taskId) return undefined
-  try {
-    return gantt.getTask(taskId)
-  } catch {
-    return undefined
+
+const makePlanIdentity = (plan: any) =>
+  `${plan?.taskId ?? ''}-${plan?.taskDetailId ?? ''}-${plan?.planId ?? ''}`
+
+const updatePlanTime = (plan: any, newStart: dayjs.Dayjs, newEnd: dayjs.Dayjs) => {
+  plan.planStartTimeStr = newStart.format('YYYY-MM-DD HH:mm:ss')
+  plan.planEndTimeStr = newEnd.format('YYYY-MM-DD HH:mm:ss')
+  plan.planStartTime = newStart.valueOf()
+  plan.planEndTime = newEnd.valueOf()
+  plan.scheduleDays = Math.max(newEnd.diff(newStart, 'day') + 1, 1)
+}
+
+const movePlanToDevice = (plan: any, sourceDevice: any, targetDevice: any) => {
+  if (sourceDevice?.deviceId === targetDevice?.deviceId) return
+  const identity = makePlanIdentity(plan)
+  if (sourceDevice?.plans && Array.isArray(sourceDevice.plans)) {
+    sourceDevice.plans = sourceDevice.plans.filter((item: any) => makePlanIdentity(item) !== identity)
+  }
+  if (!Array.isArray(targetDevice.plans)) {
+    targetDevice.plans = []
   }
+  const exists = targetDevice.plans.some((item: any) => makePlanIdentity(item) === identity)
+  if (!exists) {
+    targetDevice.plans.push(plan)
+  }
+  plan.deviceId = targetDevice.deviceId
+  plan.feedingPipeline = targetDevice.deviceId
 }
 
-const initTaskTooltips = () => {
-  const tooltipsExt = (gantt.ext as any)?.tooltips
-  const tooltip = tooltipsExt?.tooltip
-  if (!tooltipsExt || !tooltip || !ganttContainerRef.value) return
+const renderCustomPlanBars = () => {
+  clearCustomPlanBars()
+  if (!ganttContainerRef.value) return
 
-  let tooltipHideTimer: ReturnType<typeof setTimeout> | null = null
+  const taskRows = ganttContainerRef.value.querySelectorAll('.gantt_task_row')
+  taskRows.forEach((row: Element) => {
+    const taskId = row.getAttribute('task_id')
+    if (!taskId) return
+    const task = gantt.getTask(taskId)
+    if (!task?._validPlans) return
+
+    const plans = task._validPlans as any[]
+    const rowHeight = gantt.config.row_height
+    const barHeight = Math.min(gantt.config.bar_height, rowHeight - 8)
+    const barTop = (rowHeight - barHeight) / 2
+
+    plans.forEach((plan: any) => {
+      const planStart = dayjs(plan.planStartTimeStr)
+      const planEnd = dayjs(plan.planEndTimeStr)
+      if (!planStart.isValid() || !planEnd.isValid()) return
+
+      const leftPos = gantt.posFromDate(planStart.toDate())
+      const rightPos = gantt.posFromDate(planEnd.toDate())
+      const width = Math.max(rightPos - leftPos, 4)
+      const isCurrent = String(plan.sourceType ?? '').toUpperCase() === 'CURRENT'
+
+      const bar = document.createElement('div')
+      bar.className = 'custom-plan-bar'
+      if (isCurrent) {
+        bar.classList.add('custom-plan-bar-current')
+      }
+      bar.style.cssText = `
+        position: absolute;
+        left: ${leftPos}px;
+        top: ${barTop}px;
+        width: ${width}px;
+        height: ${barHeight}px;
+        border-radius: 6px;
+        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+        cursor: ${isCurrent ? 'grab' : 'pointer'};
+        z-index: 2;
+        display: flex;
+        align-items: center;
+        padding: 0 8px;
+        font-size: 12px;
+        font-weight: 500;
+        color: #ffffff;
+        text-shadow: 0 1px 2px rgba(0,0,0,0.1);
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        box-sizing: border-box;
+      `
+
+      if (isCurrent) {
+        bar.style.backgroundColor = '#67c23a'
+      } else {
+        const planStatus = plan.planStatus
+        const statusColors: Record<number, string> = {
+          1: '#3b82f6',
+          8: '#10b981',
+          3: '#f59e0b',
+          4: '#f56c6c',
+          5: '#8e7cc3'
+        }
+        bar.style.backgroundColor = statusColors[planStatus] || '#6b7280'
+      }
 
-  const forceHideTooltip = () => {
-    if (tooltipHideTimer) {
-      clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = null
-    }
-    tooltip.hide()
-    const node = tooltip.getNode?.()
-    if (node) {
-      node.style.display = 'none'
-      node.style.visibility = 'hidden'
-      node.style.opacity = '0'
-    }
-  }
+      bar.textContent = `${plan.productCode ?? '-'} / ${plan.productName ?? '-'}`
 
-  const showTooltip = (event: MouseEvent, html: string) => {
-    if (tooltipHideTimer) {
-      clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = null
-    }
-    tooltip.setContent(html)
-    tooltip.show(event)
-    const node = tooltip.getNode?.()
-    if (node) {
-      node.style.display = 'block'
-      node.style.visibility = 'visible'
-      node.style.opacity = '1'
-      node.style.zIndex = '10000'
-      node.style.pointerEvents = 'none'
-    }
-  }
+      bar.setAttribute('data-plan-id', String(plan.planId ?? ''))
+      bar.setAttribute('data-device-id', String(task._deviceData?.deviceId ?? ''))
 
-  tooltipsExt.detach('.gantt_task_line')
-  tooltipsExt.detach('.gantt_task_content')
-  tooltipsExt.attach({
-    selector: '.gantt_task_line,.gantt_task_content',
-    onmouseenter: (event: MouseEvent, node: HTMLElement) => {
-      const task = getTaskByTooltipNode(node)
-      if (!task) return
-      showTooltip(event, buildTaskTooltipHtml(task))
-    },
-    onmousemove: (event: MouseEvent, node: HTMLElement) => {
-      const task = getTaskByTooltipNode(node)
-      if (!task) return
-      showTooltip(event, buildTaskTooltipHtml(task))
-    },
-    onmouseleave: () => {
-      forceHideTooltip()
-    }
-  })
+      bar.addEventListener('click', (e) => {
+        e.stopPropagation()
+        activePreviewTask.value = plan
+        activePreviewDevice.value = task._deviceData
+      })
 
-  const containerEl = ganttContainerRef.value
-  const containerMouseLeaveHandler = () => {
-    forceHideTooltip()
-  }
-  containerEl.addEventListener('mouseleave', containerMouseLeaveHandler)
+      bar.addEventListener('mouseenter', (e) => {
+        const tooltipsExt = (gantt.ext as any)?.tooltips
+        const tooltip = tooltipsExt?.tooltip
+        if (!tooltip) return
+        const html = buildPlanBarTooltipHtml(plan, task._deviceData)
+        tooltip.setContent(html)
+        tooltip.show(e)
+        const node = tooltip.getNode?.()
+        if (node) {
+          node.style.display = 'block'
+          node.style.visibility = 'visible'
+          node.style.opacity = '1'
+          node.style.zIndex = '10000'
+          node.style.pointerEvents = 'none'
+        }
+      })
 
-  const documentMouseMoveHandler = (e: MouseEvent) => {
-    const target = e.target as HTMLElement
-    if (!target) return
-    const isOverTask = target.closest('.gantt_task_line') || target.closest('.gantt_task_content')
-    if (!isOverTask) {
-      if (tooltipHideTimer) clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = setTimeout(forceHideTooltip, 150)
-    } else {
-      if (tooltipHideTimer) {
-        clearTimeout(tooltipHideTimer)
-        tooltipHideTimer = null
-      }
-    }
-  }
-  document.addEventListener('mousemove', documentMouseMoveHandler)
-
-  tooltipCleanupFns.value.push(() => {
-    containerEl.removeEventListener('mouseleave', containerMouseLeaveHandler)
-    document.removeEventListener('mousemove', documentMouseMoveHandler)
-    if (tooltipHideTimer) {
-      clearTimeout(tooltipHideTimer)
-      tooltipHideTimer = null
-    }
-  })
-}
+      bar.addEventListener('mouseleave', () => {
+        const tooltipsExt = (gantt.ext as any)?.tooltips
+        const tooltip = tooltipsExt?.tooltip
+        if (tooltip) { tooltip.hide() }
+      })
 
-const syncPlanTimeFromTask = (task: any) => {
-  if (!task?._planData) return
-  if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return
-  const start = dayjs(task.start_date)
-  const end = dayjs(task.end_date)
-  if (!start.isValid() || !end.isValid()) return
-  const duration = Math.max(Number(task.duration) || end.diff(start, 'day') + 1, 1)
-  task.duration = duration
-  task._planData.planStartTimeStr = start.format('YYYY-MM-DD HH:mm:ss')
-  task._planData.planEndTimeStr = end.format('YYYY-MM-DD HH:mm:ss')
-  task._planData.scheduleDays = duration
-  activePreviewDevice.value = task._deviceData
-  if (activePreviewTask.value && String(activePreviewTask.value.taskDetailId) === String(task._planData.taskDetailId)) {
-    activePreviewTask.value = task._planData
-  }
-}
+      bar.addEventListener('contextmenu', (e) => {
+        if (!isCurrent) { e.preventDefault(); return }
+        e.preventDefault()
+        openTaskAdjustDialogForPlan(plan, task._deviceData)
+      })
 
-const syncDeviceTaskRangeFromChildren = (task: any) => {
-  if (!task?._planData) return
-  const deviceTaskId = task.parent
-  if (!deviceTaskId) return
-  const childTaskIds = gantt.getChildren(deviceTaskId)
-  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return
-  const childTasks = childTaskIds.map((childId: string | number) => gantt.getTask(childId)).filter((item: any) => item?._planData)
-  if (!childTasks.length) return
-  const deviceRange = getDeviceTaskRangeByChildren(childTasks)
-  if (!deviceRange) return
-  const deviceTask = gantt.getTask(deviceTaskId)
-  deviceTask.start_date = deviceRange.start_date
-  deviceTask.end_date = deviceRange.end_date
-  deviceTask.duration = deviceRange.duration
-  gantt.updateTask(deviceTaskId)
-}
+      if (isCurrent) {
+        attachPlanBarDrag(bar, plan, task)
+        attachPlanBarResize(bar, plan, task)
+      }
 
-const movePlanDataToDevice = (task: any, targetDeviceTaskId: string | number, sourceDeviceTaskId?: string | number) => {
-  if (!task?._planData) return
-  const targetDeviceTask = gantt.getTask(targetDeviceTaskId)
-  const targetDeviceData = targetDeviceTask?._deviceData
-  if (!targetDeviceData) return
-  const planIdentity = `${task?._planData?.taskId ?? ''}-${task?._planData?.taskDetailId ?? ''}`
-  const sourceDeviceTask = sourceDeviceTaskId ? gantt.getTask(sourceDeviceTaskId) : undefined
-  const sourceDeviceData = sourceDeviceTask?._deviceData
-  if (sourceDeviceData?.plans && Array.isArray(sourceDeviceData.plans)) {
-    sourceDeviceData.plans = sourceDeviceData.plans.filter((item: any) => {
-      const itemIdentity = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
-      return itemIdentity !== planIdentity
+      row.appendChild(bar)
     })
-  }
-  if (!Array.isArray(targetDeviceData.plans)) {
-    targetDeviceData.plans = []
-  }
-  const targetExists = targetDeviceData.plans.some((item: any) => {
-    const itemIdentity = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
-    return itemIdentity === planIdentity
   })
-  if (!targetExists) {
-    targetDeviceData.plans.push(task._planData)
-  }
-  task._planData.deviceId = targetDeviceData.deviceId
-  task._planData.feedingPipeline = targetDeviceData.deviceId
-  task._deviceData = targetDeviceData
 }
 
-const normalizeDeviceChildren = (deviceTaskId: string | number, priorityTaskId?: string | number) => {
-  try {
-    gantt.getTask(deviceTaskId)
-  } catch {
-    return
+const findOriginalPlan = (planIdentity: string) => {
+  for (const device of previewScheduleList.value) {
+    const plan = (device?.plans ?? []).find(
+      (p: any) => makePlanIdentity(p) === planIdentity
+    )
+    if (plan) return { plan, device }
   }
-  const childTaskIds = gantt.getChildren(deviceTaskId)
-  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return
-  const childTasks = childTaskIds
-    .map((childId: string | number) => gantt.getTask(childId))
-    .filter((item: any) => item?._planData)
-    .sort((a: any, b: any) => {
-      const startDiff = dayjs(a.start_date).valueOf() - dayjs(b.start_date).valueOf()
-      if (startDiff !== 0) return startDiff
-      if (priorityTaskId !== undefined && String(a.id) === String(priorityTaskId)) return -1
-      if (priorityTaskId !== undefined && String(b.id) === String(priorityTaskId)) return 1
-      return 0
-    })
-  childTasks.forEach((item: any) => {
-    syncPlanTimeFromTask(item)
-    gantt.updateTask(item.id)
-  })
-  const fakePlanTask = { _planData: true, parent: deviceTaskId }
-  syncDeviceTaskRangeFromChildren(fakePlanTask)
+  return null
 }
 
-const refreshPlanLinksByRowOrder = () => {
-  try {
-    const allLinks = gantt.getLinks()
-    allLinks.forEach((item: any) => gantt.deleteLink(item.id))
-    let linkIndex = 1
-    const deviceTaskIds = gantt.getChildren(0)
-    deviceTaskIds.forEach((deviceTaskId: string | number) => {
-      try {
-        const childTaskIds = gantt.getChildren(deviceTaskId).filter((childId: string | number) => {
-          const task = gantt.getTask(childId)
-          return !!task?._planData
-        })
-        let previousTaskId: string | number | null = null
-        childTaskIds.forEach((taskId: string | number) => {
-          if (previousTaskId !== null) {
-            gantt.addLink({
-              id: `link-${linkIndex++}`,
-              source: previousTaskId,
-              target: taskId,
-              type: '0'
-            })
-          }
-          previousTaskId = taskId
-        })
-      } catch {}
-    })
-  } catch {}
-}
+const attachPlanBarDrag = (bar: HTMLElement, plan: any, task: any) => {
+  let startX = 0
+  let startLeft = 0
+  let dragging = false
+  let moved = false
 
-const getDeviceInsertIndex = (deviceTaskId: string | number, startDate: dayjs.Dayjs) => {
-  const childTaskIds = gantt.getChildren(deviceTaskId)
-  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return 0
-  const targetStart = startDate.startOf('day').valueOf()
-  for (let index = 0; index < childTaskIds.length; index += 1) {
-    const childTask = gantt.getTask(childTaskIds[index])
-    if (!childTask?._planData) continue
-    const childStart = dayjs(childTask.start_date).startOf('day').valueOf()
-    if (childStart >= targetStart) return index
+  const onMouseDown = (e: MouseEvent) => {
+    if (e.button !== 0) return
+    const target = e.target as HTMLElement
+    if (target.classList.contains('custom-plan-resize-handle')) return
+    e.preventDefault()
+    e.stopPropagation()
+    startX = e.clientX
+    startLeft = bar.offsetLeft
+    dragging = true
+    moved = false
+    bar.style.cursor = 'grabbing'
+    bar.style.zIndex = '10'
+    bar.style.opacity = '0.85'
+    document.addEventListener('mousemove', onMouseMove)
+    document.addEventListener('mouseup', onMouseUp)
+  }
+
+  const onMouseMove = (e: MouseEvent) => {
+    if (!dragging) return
+    const dx = e.clientX - startX
+    if (Math.abs(dx) < 3 && !moved) return
+    moved = true
+    const newLeft = Math.max(0, startLeft + dx)
+    bar.style.left = `${newLeft}px`
+  }
+
+  const onMouseUp = (e: MouseEvent) => {
+    document.removeEventListener('mousemove', onMouseMove)
+    document.removeEventListener('mouseup', onMouseUp)
+    dragging = false
+    bar.style.cursor = 'grab'
+    bar.style.zIndex = '2'
+    bar.style.opacity = '1'
+
+    if (!moved) return
+    moved = false
+
+    const dx = e.clientX - startX
+    const newLeft = Math.max(0, startLeft + dx)
+    const newStartDate = gantt.dateFromPos(newLeft)
+    const planDuration = dayjs(plan.planEndTimeStr).diff(dayjs(plan.planStartTimeStr), 'millisecond')
+    const newEndDate = new Date(newStartDate.getTime() + planDuration)
+
+    const newStart = dayjs(newStartDate)
+    const newEnd = dayjs(newEndDate)
+
+    const identity = makePlanIdentity(plan)
+    const original = findOriginalPlan(identity)
+    if (original) {
+      updatePlanTime(original.plan, newStart, newEnd)
+    } else {
+      updatePlanTime(plan, newStart, newEnd)
+    }
+
+    const targetDeviceEl = findDeviceRowAtPosition(bar, newLeft)
+    if (targetDeviceEl) {
+      const targetDeviceId = targetDeviceEl.getAttribute('data-device-id')
+      const targetDevice = previewScheduleList.value.find((d: any) => String(d.deviceId) === targetDeviceId)
+      if (targetDevice && targetDevice.deviceId !== task._deviceData?.deviceId) {
+        const sourceDevice = original?.device ?? task._deviceData
+        movePlanToDevice(original?.plan ?? plan, sourceDevice, targetDevice)
+      }
+    }
+
+    editingPlanIdentity.value = identity
+    initGanttPreview()
   }
-  return childTaskIds.length
+
+  bar.addEventListener('mousedown', onMouseDown)
 }
 
-const addDeviceToGantt = (device: any, excludePlanIdentity?: string) => {
-  const deviceId = `device-${device.deviceId}`
-  try {
-    gantt.getTask(deviceId)
-    return
-  } catch {}
-  const plans = (device?.plans ?? []).map((plan: any) => ({
-    ...plan,
-    _start: dayjs(plan?.planStartTimeStr),
-    _end: dayjs(plan?.planEndTimeStr)
-  }))
-  const validPlans = plans
-    .filter((plan: any) => plan._start.isValid() && plan._end.isValid())
-    .sort((a: any, b: any) => a._start.valueOf() - b._start.valueOf())
-  const firstPlan = validPlans[0]
-  const deviceRange = getDeviceTaskRangeByChildren(
-    validPlans.map((item: any) => ({ start_date: item?._start, end_date: item?._end }))
-  )
-  gantt.addTask({
-    id: deviceId,
-    text: `${device.deviceName ?? '-'}`,
-    start_date: formatGanttDate(deviceRange?.start_date ?? firstPlan?._start),
-    end_date: formatGanttDate(deviceRange?.end_date ?? firstPlan?._end),
-    duration: deviceRange?.duration ?? 1,
-    parent: 0,
-    progress: 0,
-    open: true,
-    readonly: true,
-    deviceName: device.deviceName ?? '-',
-    _deviceData: device
-  })
-  validPlans.forEach((plan: any, index: number) => {
-    const planIdentity = `${plan?.taskId ?? ''}-${plan?.taskDetailId ?? ''}`
-    if (excludePlanIdentity && planIdentity === excludePlanIdentity) return
-    const startDate = formatGanttDate(plan.planStartTimeStr)
-    const endDate = formatGanttDate(plan.planEndTimeStr)
-    if (!startDate || !endDate) return
-    const duration = Number(plan.scheduleDays) > 0 ? Number(plan.scheduleDays) : Math.max(plan._end.diff(plan._start, 'day') + 1, 1)
-    const isHistory = String(plan.sourceType ?? '').toUpperCase() === 'HISTORY'
-    const planTaskId = `plan-${device.deviceId}-${plan.taskDetailId ?? index}-${index}`
-    gantt.addTask({
-      id: planTaskId,
-      text: `${plan.productCode ?? '-'} / ${plan.productName ?? '-'} / ${plan.taskCode ?? '-'}`,
-      start_date: startDate,
-      end_date: endDate,
-      duration,
-      parent: deviceId,
-      progress: 0,
-      readonly: isHistory,
-      _planData: plan,
-      _deviceData: device
-    })
-  })
+const findDeviceRowAtPosition = (bar: HTMLElement, left: number) => {
+  const barRect = bar.getBoundingClientRect()
+  const centerY = barRect.top + barRect.height / 2
+  const centerX = barRect.left + left + barRect.width / 2
+  const elAtCenter = document.elementFromPoint(centerX, centerY)
+  if (!elAtCenter) return null
+  const row = elAtCenter.closest('.gantt_task_row') as HTMLElement
+  if (!row) return null
+  const taskId = row.getAttribute('task_id')
+  if (!taskId) return null
+  const ganttTask = gantt.getTask(taskId)
+  if (!ganttTask?._deviceData) return null
+  return { getAttribute: (attr: string) => String(ganttTask._deviceData.deviceId ?? '') }
 }
 
-const removeDeviceFromGanttIfNoCurrent = (deviceTaskId: string | number) => {
-  try {
-    const deviceTask = gantt.getTask(deviceTaskId)
-    if (!deviceTask || deviceTask?._planData) return
-    const childTaskIds = gantt.getChildren(deviceTaskId)
-    const hasCurrent = (Array.isArray(childTaskIds) ? childTaskIds : []).some((childId: string | number) => {
-      const childTask = gantt.getTask(childId)
-      return childTask?._planData && String(childTask._planData.sourceType ?? '').toUpperCase() === 'CURRENT'
-    })
-    if (!hasCurrent) {
-      gantt.deleteTask(String(deviceTaskId))
+const attachPlanBarResize = (bar: HTMLElement, plan: any, task: any) => {
+  const leftHandle = document.createElement('div')
+  leftHandle.className = 'custom-plan-resize-handle custom-plan-resize-left'
+  leftHandle.style.cssText = `
+    position: absolute; left: 0; top: 0; width: 8px; height: 100%;
+    cursor: w-resize; z-index: 3;
+  `
+  const rightHandle = document.createElement('div')
+  rightHandle.className = 'custom-plan-resize-handle custom-plan-resize-right'
+  rightHandle.style.cssText = `
+    position: absolute; right: 0; top: 0; width: 8px; height: 100%;
+    cursor: e-resize; z-index: 3;
+  `
+  bar.appendChild(leftHandle)
+  bar.appendChild(rightHandle)
+
+  const attachResize = (handle: HTMLElement, isLeft: boolean) => {
+    let startX = 0
+    let startLeft = 0
+    let startWidth = 0
+    let resizing = false
+
+    const onMouseDown = (e: MouseEvent) => {
+      e.preventDefault()
+      e.stopPropagation()
+      startX = e.clientX
+      startLeft = bar.offsetLeft
+      startWidth = bar.offsetWidth
+      resizing = true
+      bar.style.zIndex = '10'
+      document.addEventListener('mousemove', onMouseMove)
+      document.addEventListener('mouseup', onMouseUp)
     }
-  } catch {}
-}
 
-const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDate: string, endDate: string) => {
-  const sourceDeviceTaskId = task.parent
-  const nextStart = dayjs(startDate)
-  const nextEnd = dayjs(endDate)
-  const duration = Math.max(nextEnd.diff(nextStart, 'day') + 1, 1)
-  const planIdentity = `${task?._planData?.taskId ?? ''}-${task?._planData?.taskDetailId ?? ''}`
-
-  const targetDeviceData = previewScheduleList.value.find((d: any) => `device-${d.deviceId}` === targetDeviceTaskId)
-  if (!targetDeviceData) return
-
-  const sourceDeviceData = task._deviceData
-  if (sourceDeviceData?.plans && Array.isArray(sourceDeviceData.plans)) {
-    sourceDeviceData.plans = sourceDeviceData.plans.filter((item: any) => {
-      const itemId = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
-      return itemId !== planIdentity
-    })
-  }
-  if (!Array.isArray(targetDeviceData.plans)) {
-    targetDeviceData.plans = []
-  }
-  const targetExists = targetDeviceData.plans.some((item: any) => {
-    const itemId = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
-    return itemId === planIdentity
-  })
-  if (!targetExists) {
-    targetDeviceData.plans.push(task._planData)
-  }
-  task._planData.deviceId = targetDeviceData.deviceId
-  task._planData.feedingPipeline = targetDeviceData.deviceId
-  task._deviceData = targetDeviceData
-
-  let targetDeviceInGantt = true
-  try {
-    gantt.getTask(targetDeviceTaskId)
-  } catch {
-    targetDeviceInGantt = false
-  }
+    const onMouseMove = (e: MouseEvent) => {
+      if (!resizing) return
+      const dx = e.clientX - startX
+      if (isLeft) {
+        const newLeft = Math.max(0, startLeft + dx)
+        const newWidth = Math.max(20, startWidth - dx)
+        bar.style.left = `${newLeft}px`
+        bar.style.width = `${newWidth}px`
+      } else {
+        const newWidth = Math.max(20, startWidth + dx)
+        bar.style.width = `${newWidth}px`
+      }
+    }
 
-  if (!targetDeviceInGantt) {
-    addDeviceToGantt(targetDeviceData, planIdentity)
-  }
+    const onMouseUp = () => {
+      document.removeEventListener('mousemove', onMouseMove)
+      document.removeEventListener('mouseup', onMouseUp)
+      if (!resizing) return
+      resizing = false
+      bar.style.zIndex = '2'
+
+      const newLeft = parseFloat(bar.style.left) || startLeft
+      const newWidth = parseFloat(bar.style.width) || startWidth
+      const newStartDate = gantt.dateFromPos(newLeft)
+      const newEndDate = gantt.dateFromPos(newLeft + newWidth)
+
+      const identity = makePlanIdentity(plan)
+      const original = findOriginalPlan(identity)
+      if (original) {
+        updatePlanTime(original.plan, dayjs(newStartDate), dayjs(newEndDate))
+      } else {
+        updatePlanTime(plan, dayjs(newStartDate), dayjs(newEndDate))
+      }
+      editingPlanIdentity.value = identity
+      initGanttPreview()
+    }
 
-  task.parent = targetDeviceTaskId
-  task.start_date = nextStart.toDate()
-  task.end_date = nextEnd.toDate()
-  task.duration = duration
-  const targetIndex = getDeviceInsertIndex(targetDeviceTaskId, nextStart)
-  gantt.moveTask(task.id, targetIndex, targetDeviceTaskId)
-  gantt.updateTask(task.id)
-  syncPlanTimeFromTask(task)
-  normalizeDeviceChildren(targetDeviceTaskId, task.id)
-  if (sourceDeviceTaskId && sourceDeviceTaskId !== targetDeviceTaskId) {
-    removeDeviceFromGanttIfNoCurrent(sourceDeviceTaskId)
-    normalizeDeviceChildren(sourceDeviceTaskId)
+    handle.addEventListener('mousedown', onMouseDown)
   }
-  refreshPlanLinksByRowOrder()
-  refreshTimelineRangeByTasks()
-  gantt.render()
+
+  attachResize(leftHandle, true)
+  attachResize(rightHandle, false)
 }
 
-const openTaskAdjustDialog = (task: any) => {
-  if (!task?._planData) return
-  taskAdjustTaskId.value = task.id
-  taskAdjustForm.deviceTaskId = String(task.parent ?? '')
-  taskAdjustForm.startDate = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
-  taskAdjustForm.endDate = dayjs(task.end_date).format('YYYY-MM-DD HH:mm:ss')
+const openTaskAdjustDialogForPlan = (plan: any, device: any) => {
+  taskAdjustForm.deviceTaskId = `device-${device?.deviceId ?? ''}`
+  taskAdjustForm.startDate = plan.planStartTimeStr || ''
+  taskAdjustForm.endDate = plan.planEndTimeStr || ''
+  editingPlanIdentity.value = makePlanIdentity(plan)
   taskAdjustDialogVisible.value = true
 }
 
 const handleTaskAdjustSubmit = () => {
-  if (!taskAdjustTaskId.value) return
   if (!taskAdjustForm.deviceTaskId || !taskAdjustForm.startDate || !taskAdjustForm.endDate) {
     message.warning('请完善设备、计划开始日期和计划结束日期')
     return
   }
-  const task = gantt.getTask(taskAdjustTaskId.value)
-  if (!task?._planData) return
-  ganttSyncing.value = true
-  try {
-    applyTaskAdjust(task, taskAdjustForm.deviceTaskId, taskAdjustForm.startDate, taskAdjustForm.endDate)
-  } finally {
-    ganttSyncing.value = false
+  if (!editingPlanIdentity.value) return
+
+  const targetDevice = previewScheduleList.value.find(
+    (d: any) => `device-${d.deviceId}` === taskAdjustForm.deviceTaskId
+  )
+  if (!targetDevice) return
+
+  let foundPlan: any = null
+  let sourceDevice: any = null
+  for (const device of previewScheduleList.value) {
+    const plan = (device?.plans ?? []).find(
+      (p: any) => makePlanIdentity(p) === editingPlanIdentity.value
+    )
+    if (plan) {
+      foundPlan = plan
+      sourceDevice = device
+      break
+    }
   }
-  taskAdjustDialogVisible.value = false
-}
+  if (!foundPlan) return
 
-const refreshTimelineRangeByTasks = () => {
-  let minStart = Number.POSITIVE_INFINITY
-  let maxEnd = Number.NEGATIVE_INFINITY
-  gantt.eachTask((task: any) => {
-    if (!task?._planData) return
-    const start = dayjs(task.start_date).valueOf()
-    const end = dayjs(task.end_date).valueOf()
-    if (!Number.isFinite(start) || !Number.isFinite(end)) return
-    minStart = Math.min(minStart, start)
-    maxEnd = Math.max(maxEnd, end)
-  })
-  if (!Number.isFinite(minStart) || !Number.isFinite(maxEnd)) return
-
-  const nextStartDate = dayjs(minStart).startOf('day').toDate()
-  const nextEndDate = dayjs(maxEnd).endOf('day').toDate()
-  const currentStart = dayjs(gantt.config.start_date).valueOf()
-  const currentEnd = dayjs(gantt.config.end_date).valueOf()
-  const nextStart = dayjs(nextStartDate).valueOf()
-  const nextEnd = dayjs(nextEndDate).valueOf()
-  if (currentStart === nextStart && currentEnd === nextEnd) return
-
-  gantt.config.start_date = nextStartDate
-  gantt.config.end_date = nextEndDate
-  gantt.render()
+  const newStart = dayjs(taskAdjustForm.startDate)
+  const newEnd = dayjs(taskAdjustForm.endDate)
+  if (!newStart.isValid() || !newEnd.isValid()) {
+    message.warning('请选择有效的时间')
+    return
+  }
+  if (newEnd.isBefore(newStart)) {
+    message.warning('结束时间不能早于开始时间')
+    return
+  }
+
+  updatePlanTime(foundPlan, newStart, newEnd)
+  if (sourceDevice?.deviceId !== targetDevice.deviceId) {
+    movePlanToDevice(foundPlan, sourceDevice, targetDevice)
+  }
+
+  taskAdjustDialogVisible.value = false
+  editingPlanIdentity.value = makePlanIdentity(foundPlan)
+  initGanttPreview()
 }
 
 const initGanttPreview = () => {
   if (!ganttContainerRef.value) return
   destroyGantt()
-  if (!previewScheduleList.value.length) {
+  clearCustomPlanBars()
+
+  const ganttScheduleData = getGanttScheduleList()
+  if (!ganttScheduleData.length) {
     activePreviewDevice.value = undefined
     activePreviewTask.value = undefined
     return
   }
 
-  gantt.plugins({ tooltip: true, inline_edit: true,undo: true })
-
-  // 编辑相关配置
-  gantt.config.readonly = false                     // 是否只读模式
-  gantt.config.drag_move = true                     // 是否允许拖动任务
-  gantt.config.drag_links = false                   // 是否允许拖动链接
-  gantt.config.drag_progress = false                // 是否允许拖动进度
-  gantt.config.drag_resize = true                   // 是否允许调整任务大小
-  gantt.config.order_branch = true                  // 是否允许分支内排序
-  gantt.config.order_branch_free = true             // 是否允许跨分支排序
-  gantt.config.details_on_dblclick = false          // 双击是否显示详情
-  gantt.config.show_progress = false                // 是否显示进度条
-
-  // 布局相关配置
-  gantt.config.row_height = 48                      // 任务行高度
-  gantt.config.scale_height = 70                    // 时间轴高度
-  gantt.config.xml_date = '%Y-%m-%d %H:%i'          // 日期格式
-  gantt.config.task_height = 36                     // 任务条高度
-  gantt.config.min_column_width = 80                // 最小列宽
-  gantt.config.column_width = 90                    // 默认列宽
-  gantt.config.bar_height = 34                      // 任务条实际高度
-  gantt.config.resize_step = 15                     // 调整步长
+  gantt.plugins({ tooltip: true })
+
+  gantt.config.tooltip_timeout = 0
+  gantt.templates.tooltip_text = () => ''
+
+  gantt.config.readonly = true
+  gantt.config.drag_move = false
+  gantt.config.drag_links = false
+  gantt.config.drag_progress = false
+  gantt.config.drag_resize = false
+  gantt.config.order_branch = false
+  gantt.config.order_branch_free = false
+  gantt.config.details_on_dblclick = false
+  gantt.config.show_progress = false
+
+  gantt.config.row_height = 48
+  gantt.config.scale_height = 70
+  gantt.config.xml_date = '%Y-%m-%d %H:%i'
+  gantt.config.task_height = 36
+  gantt.config.min_column_width = 80
+  gantt.config.column_width = 90
+  gantt.config.bar_height = 34
+  gantt.config.resize_step = 15
 
   gantt.config.columns = [
     {
       name: 'text',
-      label: '任务名称',
-      tree: true,
+      label: '设备名称',
+      tree: false,
       width: '*',
-      min_width: 200
+      min_width: 100,
+      template: (task: any) => task.deviceName ?? task.text ?? '-'
     },
     {
-      name: 'start_date',
-      label: '计划时间',
+      name: 'duration',
+      label: '天数',
       align: 'center',
-      width: 210,
-      template: (task: any) =>
-        task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
-          ? `<span class="gantt-inline-editor-trigger" data-field="start_date" data-task-id="${task.id}">${formatGridDateText(task.start_date)}</span>`
-          : formatGridDateText(task.start_date)
+      width: 80,
+      template: (task: any) => String(task.totalDays ?? task.duration ?? 0)
     }
   ]
 
@@ -807,14 +659,11 @@ const initGanttPreview = () => {
     { unit: 'day', step: 1, format: (date) => dayjs(date).format('MM-DD') }
   ]
 
-  gantt.templates.tooltip_text = (start, end, task: any) => buildTaskTooltipHtml(task, start, end)
   gantt.templates.task_class = (_start, _end, task: any) => {
-    if (!task?._planData) return ''
-    const sourceType = String(task?._planData?.sourceType ?? '').toUpperCase()
-    return sourceType === 'HISTORY' ? 'schedule-plan-task-history' : 'schedule-plan-task'
+    if (task._validPlans) return 'schedule-device-row'
+    return ''
   }
 
-  const ganttScheduleData = getGanttScheduleList()
   const globalRange = getGlobalDateRange(ganttScheduleData)
   gantt.config.start_date = dayjs(globalRange.start).startOf('day').toDate()
   gantt.config.end_date = dayjs(globalRange.end).endOf('day').toDate()
@@ -823,16 +672,14 @@ const initGanttPreview = () => {
 
   const ganttData = buildPreviewGanttData(ganttScheduleData)
   gantt.parse(ganttData)
-  
-  // 强制刷新所有任务的样式，确保颜色正确应用
-  gantt.eachTask((task: any) => {
-    gantt.refreshTask(task.id)
-  })
-  
-  initTaskTooltips()
 
   if (ganttData.data.length) {
-    activePreviewDevice.value = ganttData.data[0]._deviceData
+    const restoreDevice = editingPlanIdentity.value
+      ? ganttScheduleData.find((d: any) =>
+          (d?.plans ?? []).some((p: any) => makePlanIdentity(p) === editingPlanIdentity.value)
+        )
+      : null
+    activePreviewDevice.value = restoreDevice || ganttData.data[0]._deviceData
     const today = dayjs().startOf('day').toDate()
     const pos = gantt.posFromDate(today)
     const scrollState = gantt.getScrollState()
@@ -844,140 +691,29 @@ const initGanttPreview = () => {
     }
   }
 
-  const clickEventId = gantt.attachEvent('onTaskClick', (id, event: MouseEvent) => {
-    const task = gantt.getTask(id)
-    if (task?._planData) {
-      activePreviewTask.value = task._planData
-      activePreviewDevice.value = task._deviceData
-    } else {
+  const clickEventId = gantt.attachEvent('onTaskClick', (id) => {
+    const ganttTask = gantt.getTask(id)
+    if (ganttTask?._deviceData) {
       activePreviewTask.value = undefined
-      activePreviewDevice.value = task?._deviceData
+      activePreviewDevice.value = ganttTask._deviceData
     }
-    const target = event?.target as HTMLElement | null
-    const editableNode = target?.closest('.gantt-inline-editor-trigger') as HTMLElement | null
-    const field = editableNode?.dataset?.field
-    if (!field || !task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return true
-    if (field === 'start_date') {
-      openTaskAdjustDialog(task)
-      return false
-    }
-    const inlineEditors = (gantt.ext as any)?.inlineEditors
-    if (inlineEditors?.startEdit) {
-      inlineEditors.startEdit(id, field)
-      return false
-    }
-    return true
-  })
-  ganttEventIds.value.push(clickEventId)
-
-  if (ganttContainerRef.value) {
-    const gridClickHandler = (e: MouseEvent) => {
-      const target = e.target as HTMLElement
-      const trigger = target.closest('.gantt-inline-editor-trigger[data-field="start_date"]') as HTMLElement | null
-      if (!trigger) return
-      const taskId = trigger.getAttribute('data-task-id')
-      if (!taskId) return
-      try {
-        const task = gantt.getTask(taskId)
-        if (!task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return
-        e.stopPropagation()
-        openTaskAdjustDialog(task)
-      } catch {}
-    }
-    ganttContainerRef.value.addEventListener('click', gridClickHandler, true)
-    tooltipCleanupFns.value.push(() => {
-      ganttContainerRef.value?.removeEventListener('click', gridClickHandler, true)
+    nextTick(() => {
+      renderCustomPlanBars()
     })
-  }
-
-  const beforeDragEventId = gantt.attachEvent('onBeforeTaskDrag', (id) => {
-    const task = gantt.getTask(id)
-    if (!task?._planData) return false
-    taskDragDurationMap.value[String(id)] = Math.max(Number(task.duration) || 1, 1)
-    return String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
-  })
-
-  const beforeMoveEventId = gantt.attachEvent('onBeforeTaskMove', (id, parent) => {
-    const task = gantt.getTask(id)
-    if (!task?._planData) return false
-    if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return false
-    const targetTask = gantt.getTask(parent)
-    if (!targetTask || targetTask?._planData) return false
-    taskMoveFromParentMap.value[String(id)] = task.parent
     return true
   })
+  ganttEventIds.value.push(clickEventId)
 
-  const afterMoveEventId = gantt.attachEvent('onAfterTaskMove', (id, parent) => {
-    const task = gantt.getTask(id)
-    if (!task?._planData) return
-    const sourceParent = taskMoveFromParentMap.value[String(id)]
-    delete taskMoveFromParentMap.value[String(id)]
-    if (!sourceParent && sourceParent !== 0) return
-    if (sourceParent === parent) {
-      refreshPlanLinksByRowOrder()
-      return
-    }
-    if (ganttSyncing.value) return
-    ganttSyncing.value = true
-    try {
-      movePlanDataToDevice(task, parent, sourceParent)
-      syncPlanTimeFromTask(task)
-      normalizeDeviceChildren(parent)
-      normalizeDeviceChildren(sourceParent)
-      removeDeviceFromGanttIfNoCurrent(sourceParent)
-      refreshPlanLinksByRowOrder()
-      refreshTimelineRangeByTasks()
-    } finally {
-      ganttSyncing.value = false
-    }
-  })
-
-  const contextMenuEventId = gantt.attachEvent('onContextMenu', (taskId, _linkId, event: MouseEvent) => {
-    const task = gantt.getTask(taskId)
-    if (!task?._planData) return true
-    if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return false
-    event.preventDefault()
-    openTaskAdjustDialog(task)
-    return false
-  })
-
-  const dragEventId = gantt.attachEvent('onAfterTaskDrag', (id, mode) => {
-    if (ganttSyncing.value) return
-    const task = gantt.getTask(id)
-    const taskId = String(id)
-    const originalDuration = taskDragDurationMap.value[taskId]
-    delete taskDragDurationMap.value[taskId]
-    ganttSyncing.value = true
-    try {
-      if (mode === gantt.config.drag_mode.move && Number(originalDuration) > 0) {
-        task.duration = originalDuration
-      }
-      syncPlanTimeFromTask(task)
-      normalizeDeviceChildren(task.parent)
-      refreshPlanLinksByRowOrder()
-      refreshTimelineRangeByTasks()
-    } finally {
-      ganttSyncing.value = false
-    }
+  nextTick(() => {
+    renderCustomPlanBars()
   })
 
-  const updateEventId = gantt.attachEvent('onAfterTaskUpdate', (id) => {
-    if (ganttSyncing.value) return
-    const task = gantt.getTask(id)
-    ganttSyncing.value = true
-    try {
-      syncPlanTimeFromTask(task)
-      normalizeDeviceChildren(task.parent)
-      refreshPlanLinksByRowOrder()
-      refreshTimelineRangeByTasks()
-      gantt.refreshTask(id)
-    } finally {
-      ganttSyncing.value = false
-    }
+  const renderEventId = gantt.attachEvent('onGanttRender', () => {
+    nextTick(() => {
+      renderCustomPlanBars()
+    })
   })
-
-  ganttEventIds.value.push(beforeDragEventId, beforeMoveEventId, afterMoveEventId, contextMenuEventId, dragEventId, updateEventId)
-  refreshPlanLinksByRowOrder()
+  ganttEventIds.value.push(renderEventId)
 }
 
 onMounted(async () => {
@@ -1005,11 +741,20 @@ onBeforeUnmount(() => {
 .schedule-preview-wrap {
   display: flex;
   width: 100%;
+  height: 100%;
   gap: 12px;
+  overflow: hidden;
 }
 
-.schedule-gantt-container {
+.gantt-main-area {
   flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.schedule-gantt-container {
   min-width: 0;
   border: 1px solid var(--el-border-color);
   border-radius: 4px;
@@ -1045,6 +790,7 @@ onBeforeUnmount(() => {
   border-radius: 4px;
   background: var(--el-fill-color-light);
 }
+
 .schedule-plan-item-head {
   display: flex;
   align-items: center;
@@ -1052,6 +798,7 @@ onBeforeUnmount(() => {
   gap: 8px;
   margin-bottom: 4px;
 }
+
 .schedule-plan-item-title {
   font-weight: 600;
   color: var(--el-text-color-primary);
@@ -1069,108 +816,9 @@ onBeforeUnmount(() => {
   margin-top: 8px;
 }
 
-.schedule-gantt-container :deep(.gantt_grid_data .gantt_row) {
-  font-weight: 600;
-  background: linear-gradient(180deg, #f8fafc 0%, #f0f4f8 100%);
-  border-bottom: 1px solid #e2e8f0;
-  height: 48px;
-  display: flex;
-  align-items: flex-end;
-}
-
-.schedule-gantt-container :deep(.gantt_grid_data .gantt_row:nth-child(even)) {
-  background: linear-gradient(180deg, #ffffff 0%, #f9fafb 100%);
-}
-
-.schedule-gantt-container :deep(.gantt_grid_data .gantt_row:hover) {
-  background: linear-gradient(180deg, #f3f4f6 0%, #e5e7eb 100%) !important;
-}
-
-.schedule-gantt-container :deep(.gantt_grid_data .gantt_cell) {
-  text-overflow: clip;
-  font-size: 13px;
-  color: #4b5563;
-  border-right: 1px solid #e5e7eb;
-  padding: 0 12px;
-  line-height: 36px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-
-.schedule-gantt-container :deep(.gantt_scale_line) {
-  border-bottom: 2px solid #d1d5db;
-  background: linear-gradient(180deg, #ffffff 0%, #f9fafb 100%);
-  display: flex;
-  align-items: center;
-  margin-bottom: 2px;
-}
-
-.schedule-gantt-container :deep(.gantt_scale_line:last-child) {
-  margin-bottom: 0;
-  border-bottom: 1px solid #e5e7eb;
-}
-
-.schedule-gantt-container :deep(.gantt_scale_cell) {
-  font-size: 14px;
-  font-weight: 600;
-  color: #374151;
-  border-right: 1px solid #e5e7eb;
-  padding: 0 8px;
-  text-align: center;
-  background: linear-gradient(180deg, #ffffff 0%, #f9fafb 100%);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 35px;
-}
-
-.schedule-gantt-container :deep(.gantt_scale_line:last-child .gantt_scale_cell) {
-  font-size: 13px;
-  font-weight: 500;
-  color: #6b7280;
-  background: linear-gradient(180deg, #f9fafb 0%, #f3f4f6 100%);
-  border-bottom: 1px solid #e5e7eb;
-  height: 35px;
-}
-
-.schedule-gantt-container :deep(.gantt_task_bg) {
-  background: #ffffff;
-}
-
-.schedule-gantt-container :deep(.gantt_task_bg .gantt_task_cell) {
-  border-right: 1px solid #f3f4f6;
-  border-bottom: 1px solid #f3f4f6;
-}
-
-.schedule-gantt-container :deep(.gantt_task_bg .gantt_task_row:nth-child(even)) {
-  background: #f9fafb;
-}
-
-.schedule-gantt-container :deep(.gantt_task_bg .gantt_task_row:hover) {
-  background: #f3f4f6 !important;
-}
-
-.schedule-gantt-container :deep(.gantt_task_line) {
-  border-radius: 10px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  border: none;
-}
-
-.schedule-gantt-container :deep(.gantt_task_content) {
-  font-size: 12px;
-  font-weight: 500;
-  color: #ffffff;
-  padding: 0 12px;
-  line-height: 32px;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-
-.schedule-gantt-container :deep(.gantt_inline-editor-trigger) {
-  display: inline-block;
-  width: 100%;
-  overflow: visible;
-  cursor: pointer;
+.schedule-gantt-container :deep(.gantt_task_line.schedule-device-row) {
+  visibility: hidden;
+  pointer-events: none;
 }
 
 .schedule-gantt-container :deep(.gantt_task_line.schedule-plan-task) {
@@ -1202,14 +850,15 @@ onBeforeUnmount(() => {
 }
 
 :deep(.gantt_tooltip) div {
-  margin-bottom: 6px !important;
+  margin-bottom: 4px;
 }
 
 :deep(.gantt_tooltip) div:last-child {
-  margin-bottom: 0 !important;
+  margin-bottom: 0;
 }
 
-:deep(.gantt_tree_content) {
-  line-height: 50px;
+:deep(.gantt_tooltip) b {
+  font-size: 14px;
+  color: var(--el-text-color-primary);
 }
 </style>