1202

ruoyi-ui/src/views/evaluate/index.vue

@@ -262,6 +262,37 @@ function getDaysFromFirstToToday() {
     
     return daysArray;
 }
+function getDateRangeArray(dateStr) {
+  const inputDate = new Date(dateStr);
+  const inputYear = inputDate.getFullYear();
+  const inputMonth = inputDate.getMonth(); // 0-based
+  const inputDay = inputDate.getDate();
+
+  const currentDate = new Date();
+  const currentYear = currentDate.getFullYear();
+  const currentMonth = currentDate.getMonth();
+  const currentDay = currentDate.getDate();
+
+  const daysArray = [];
+
+  // 判断是否属于当前月
+  if (inputYear === currentYear && inputMonth === currentMonth) {
+    // 若输入日期晚于当前日期，返回空数组
+    if (inputDay > currentDay) return daysArray;
+    
+    for (let day = inputDay; day <= currentDay; day++) {
+      daysArray.push(day);
+    }
+  } else {
+    // 生成传入月份的全部天数
+    const daysInMonth = new Date(inputYear, inputMonth + 1, 0).getDate();
+    for (let day = 1; day <= daysInMonth; day++) {
+      daysArray.push(day);
+    }
+  }
+
+  return daysArray;
+}
 function getDay(){
   var mdName
   for(var i = 0;i<optionsModel.value.length;i++){
@@ -269,7 +300,6 @@ function getDay(){
       mdName = optionsModel.value[i].label
     }
   }
-  console.log(mdName)
   var par = {
     params:{
       beginTime:valueYue.value,
@@ -277,7 +307,9 @@ function getDay(){
     },
     mdId:valueMod.value
   }
-  var x = getDaysFromFirstToToday(valueYue.value)
+
+  var x = getDateRangeArray(valueYue.value)
+  console.log(x)
   var y = []
   x.forEach(item=>{
     y.push(0)