Browse Source

修改周判断

11wqe1 3 days ago
parent
commit
73dfbdcb8c
1 changed files with 8 additions and 5 deletions
  1. 8 5
      src/views/kanBan/components/dataBoardNew/baseData/index.vue

+ 8 - 5
src/views/kanBan/components/dataBoardNew/baseData/index.vue

@@ -98,7 +98,7 @@ export default {
                         return existingEntry ? existingEntry : { lab, num: 0 };
                     });
 
-                    res.data[5] = Array.from({ length: res.data[5].length ? res.data[5][res.data[5].length-1].lab * 1 : week}, (_, i) => {
+                    res.data[5] = Array.from({ length: week}, (_, i) => {
                         const lab = String(i + 1).padStart(2, '0'); // 生成lab为01到最新日期
                         const existingEntry = res.data[5].find(entry => '0'+entry.lab === lab);   
                         return existingEntry ? existingEntry : { lab, num: 0 };
@@ -117,7 +117,7 @@ export default {
                         return existingEntry ? existingEntry : { lab, num: 0 };
                     });
 
-                    res.data[12] = Array.from({ length: res.data[12].length ? res.data[12][res.data[12].length-1].lab * 1 : week}, (_, i) => {
+                    res.data[12] = Array.from({ length: week}, (_, i) => {
                         const lab = String(i + 1).padStart(2, '0'); // 生成lab为01到最新日期
                         const existingEntry = res.data[12].find(entry => '0'+entry.lab === lab);                        
                         return existingEntry ? existingEntry : { lab, num: 0 };
@@ -146,11 +146,14 @@ export default {
         getWeekOfMonth() {
             const date = new Date();
             const dayOfMonth = date.getDate();
-            const firstDayOfMonth = new Date(date.getFullYear(), date.getMonth(), 1);
-            const dayOfWeek = firstDayOfMonth.getDay() || 7; // 将周日(0)转换为7
+
+            // 确定当前日期是本月的第几周
+            const weekNumber = Math.ceil(dayOfMonth / 7);
+            
+            console.log('weekNumber',weekNumber);
             
             // 计算本月的第几周
-            return Math.ceil((dayOfMonth + dayOfWeek - 1) / 7);
+            return weekNumber;
         }
     },
     mounted() {