diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue index 402786dd..7fc47f66 100644 --- a/src/views/commandScreen/dialogCompnnents/weather-info.vue +++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue @@ -1105,23 +1105,34 @@ const getGanttStyle = (project: any) => { let endRef = null; // 抹灰工程1-1-2022/09/03 - const a = !(startArr[2] % 2); - // console.log(a, ":!(startArr[2] % 2:"); - if (a) { - const day = startArr[2] - 1; - startArr[2] = day < 10 ? "0" + day : day; - startDate = startArr.join("-"); - } - const b = !(endArr[2] % 2); - // console.log(a, ":!(endArr[2] % 2):"); - if (!(endArr[2] % 2)) { - const day = endArr[2] - 1; - endArr[2] = day < 10 ? "0" + day : day; - finishDate = endArr.join("-"); - } + const a = true; + console.log(a, ":!(startArr[2] % 2:"); + if (a) { + const day = +startArr[2]; + startArr[2] = day < 10 ? "0" + day : day; + startDate = startArr.join("-"); + } + const b = true; + console.log(a, ":!(endArr[2] % 2):"); + if (b) { + const day = +endArr[2]; + endArr[2] = day < 10 ? "0" + day : day; + finishDate = endArr.join("-"); + } + + // const a = !(startArr[2] % 2); + // if (a) { + // const day = startArr[2] - 1; + // startArr[2] = day < 10 ? "0" + day : day; + // startDate = startArr.join("-"); + // } + // const b = !(endArr[2] % 2); + // if (!(endArr[2] % 2)) { + // const day = endArr[2] - 1; + // endArr[2] = day < 10 ? "0" + day : day; + // finishDate = endArr.join("-"); + // } - // console.log(dateList, "finishDate ------------", itemRefs.length); - // console.log(id, "甘特图"); for (let index = 0; index < itemRefs.length; index++) { const data = itemRefs[index]; @@ -1210,7 +1221,7 @@ const getDays = (date: any) => { let fulldate = date + (num < 10 ? "-0" + num : "-" + num); return { num, date: fulldate }; }) - .filter(item => item.num % 2); + // .filter(item => item.num % 2); if (count === 28) { days.push({ num: 28, date: date + "-28" }); } else if (count === 30) { @@ -1860,7 +1871,7 @@ onMounted(async () => { } &:nth-child(n + 4) { - width: 400px; + width: 600px; } } } @@ -1965,12 +1976,12 @@ onMounted(async () => { } &:nth-child(n + 4) { - width: 400px; + width: 600px; } } .progress { - flex-shrink: 0; + // flex-shrink: 0; position: absolute; top: calc(50% - 7px); width: 20px;