Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/views/projectManage/requirement/components/ganntViews.vue

@@ -77,7 +77,7 @@ export default {
         html: true,
         collapsed: true,
         start: moment(item.optionsObject.startTime).toDate().getTime(),
-        duration: moment(item.optionsObject.endTime).toDate().getTime() - moment(item.optionsObject.startTime).toDate().getTime(),
+        duration: moment(item.optionsObject.endTime).add('day', 1).toDate().getTime() - moment(item.optionsObject.startTime).toDate().getTime(),
         style: {
           base: {
             fill: colorlist[key % colorlist.length]
@@ -90,6 +90,7 @@ export default {
       const colorlist = ['#A1DEFF', '#FAB5B5', '#BCED86', '#FFA87F', '#8E44AD', '#1EBC61', '#0287D0']
       for (const key in data) {
         const arr = data[key]
+        console.log(arr)
         for (const vel in arr) {
           const ds = {
             id: arr[vel].id,
@@ -102,7 +103,7 @@ export default {
             html: true,
             parentId: Number(key),
             start: moment(arr[vel].dayList[0]).toDate().getTime(),
-            duration: moment(arr[vel].dayList[arr[vel].dayList.length - 1]).toDate().getTime() - moment(arr[vel].dayList[0]).toDate().getTime(),
+            duration: moment(arr[vel].dayList[arr[vel].dayList.length - 1]).add('day', 1).toDate().getTime() - moment(arr[vel].dayList[0]).toDate().getTime(),
             style: {
               base: {
                 fill: colorlist[key % colorlist.length]

src/views/workbench/team/components/ganntViews.vue

@@ -195,7 +195,7 @@ export default {
           progress: 0,
           needLegalAllDays: data[i].workNum.needDays + '/' + data[i].workNum.legalDays + '/' + data[i].workNum.allDays,
           start: data[i].workNum.startTime ? moment(data[i].workNum.startTime).toDate().getTime() : today.getTime(),
-          duration: data[i].workNum.endTime ? moment(data[i].workNum.endTime).toDate().getTime() - moment(data[i].workNum.startTime).toDate().getTime() : 0,
+          duration: data[i].workNum.endTime ? moment(data[i].workNum.endTime).add('day', 1).toDate().getTime() - moment(data[i].workNum.startTime).toDate().getTime() : 0,
           startDate: data[i].workNum.startTime ? moment(data[i].workNum.startTime).format('YYYY-MM-DD') : '',
           endDate: data[i].workNum.endTime ? moment(data[i].workNum.endTime).format('YYYY-MM-DD') : '',
           type: 'task',
@@ -224,7 +224,7 @@ export default {
             progress: 0,
             needLegalAllDays: data[i].workData[j].needDays + '/' + data[i].workData[j].legalDays + '/' + data[i].workData[j].allDays,
             start: moment(data[i].workData[j].startTime).toDate().getTime(),
-            duration: moment(data[i].workData[j].endTime).toDate().getTime() - moment(data[i].workData[j].startTime).toDate().getTime(),
+            duration: moment(data[i].workData[j].endTime).add('day', 1).toDate().getTime() - moment(data[i].workData[j].startTime).toDate().getTime(),
             startDate: moment(data[i].workData[j].startTime).format('YYYY-MM-DD'),
             endDate: moment(data[i].workData[j].endTime).format('YYYY-MM-DD'),
             type: 'task',