From b3da397ce483637d59d203d67223a5e02c84250a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 22 May 2022 15:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=94=98=E7=89=B9=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                              |  2 +-
 src/views/xm/core/components/xm-gantt.vue | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index c7aaab0b..f21a5122 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "vue-router": "3.0.1",
     "vuedraggable": "2.15.0",
     "vuex": "3.0.1",
-    "wl-gantt": "^1.0.4",
+    "wl-gantt": "^1.0.6",
     "xlsx": "^0.14.5"
   },
   "devDependencies": {
diff --git a/src/views/xm/core/components/xm-gantt.vue b/src/views/xm/core/components/xm-gantt.vue
index 6882201f..09b0552e 100644
--- a/src/views/xm/core/components/xm-gantt.vue
+++ b/src/views/xm/core/components/xm-gantt.vue
@@ -1,13 +1,15 @@
 <template> 
   <section>
     <wl-gantt :data="treeData" 
-            :start-date="projectPhase.startTime"
-            :end-date="projectPhase.endTime"
             :usePreColumn="true"
+            :dateType="'monthAndDay'"
+            :startDate="projectDateRange.startTime"
+            :endDate="projectDateRange.endTime"
+            :autoGanttDateType="true"
             :checkSource="true"
-            :useRealTime="useRealTime"
-						:treeProps="{children: 'children', hasChildren: 'hasChildren',pid:'parentPhaseId', pre: 'taskFinishCnt'}"
-						:props="columns"
+            :useRealTime="useRealTime" 
+						:treeProps="{children: 'children', hasChildren: 'hasChildren',pid:'parentTaskid', pre: 'preTaskid',startDate:'startTime',endDate:'endTime',realStartDate:'actStartTime',realEndDate:'actEndTime'}"
+ 
             row-key="id">
             <!-- <el-table-column prop="name" label="计划名称" min-width="160" > 
               <template slot-scope="scope">
@@ -41,12 +43,12 @@ Vue.use(wlGantt)
         return {};
       }
     },
-    projectPhase: {
+    projectDateRange: {
       type: Object,
       default: () => {
         return {
-          startTime: '2020-06-01',
-          endTime: '2021-12-30'
+          startTime: '2022-01-01',
+          endTime: '2022-12-30'
         }
       }
     },