ruoyi-ui-vue2/src/main.js

@@ -28,6 +28,7 @@ import {
   selectDictLabel,
   selectDictLabels,
   selectLabelList,
+  changeDateRange,
 } from "@/utils/ruoyi";
 import {getMessageTitle} from "@/utils/common";
 import {createSSE} from "@/utils/SSE";
@@ -82,6 +83,8 @@ Vue.prototype.$moment = moment;
 Vue.prototype.getDicts = getDicts;
 Vue.prototype.getConfigKey = getConfigKey;
 Vue.prototype.parseTime = parseTime;
+Vue.prototype.changeDateRange = changeDateRange;
+
 Vue.prototype.resetForm = resetForm;
 Vue.prototype.addDateRange = addDateRange;
 

ruoyi-ui-vue2/src/utils/ruoyi.js

@@ -287,3 +287,50 @@ export function trimFormListFields(list, fieldNames) {
     })
   })
 }
+
+/**
+ * 处理查询时间段
+ */
+export function changeDateRange(dateParam, type) {
+  let s = ' 00:00:00';
+  let e = ' 23:59:59';
+  let now = parseTime(new Date(),'{y}-{m}-{d}');
+  if(!dateParam){
+    //返回当天时间
+    return [now+s,now+e];
+  }
+  let dateS = new Date(dateParam[0]);
+  let new_yearS = dateS.getFullYear();
+  let date = new Date(dateParam[1]);
+  let new_yearE = date.getFullYear(); // 取当前的年份（实际是输入日期的年份）
+  let month = date.getMonth(); // 获取月份（0-11）
+  let new_month = month + 1; // 将月份转换为可读的格式（1-12）
+
+  // 获取当月的最后一天
+  // 创建一个新的Date对象，年份和月份与firstDay相同，但日期是下个月的第0天（即上个月的最后一天）
+  let lastDay = new Date(new_yearE, new_month, 0).getDate();
+
+  // 格式化月份（总是两位数）
+  let mon = (new_month < 10 ? '0' : '') + new_month;
+
+  // endDate的日期部分已经是两位数（因为getDate()总是返回0-31之间的整数）
+  let endDate = new_yearE + '-' + mon + '-' + lastDay;
+
+  if(type=="day"){
+    //直接加加上时分秒
+    dateParam[0] = dateParam[0]+s;
+    dateParam[1] = dateParam[1]+e;
+    return dateParam;
+  }
+  if(type=="month"){
+    //替换最后一天
+    dateParam[0] = dateParam[0]+s;
+    dateParam[1] = endDate+e;
+    return dateParam;
+  }
+  if(type=="year"){
+    let yearS = new_yearS + '-01-01 00:00:00';
+    let yearE = new_yearE + '-12-31 23:59:59';
+    return [yearS,yearE];
+  }
+}

ruoyi-ui-vue2/src/views/board/lossProject/index.vue

@@ -299,7 +299,6 @@ export default {
     }
   },
   created() {
-
     // 默认最近半年
     this.resetDate()
     this.$nextTick(async () => {
@@ -315,8 +314,6 @@ export default {
   },
   methods: {
     leadStatModeChange(val) {
-      // console.log(val)
-      // console.log(this.statMode)
       if (!val) {
         return
       }
@@ -334,6 +331,7 @@ export default {
           this.query.leadDateRange = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
           break
       }
+
     },
 
     resetDate() {
@@ -411,8 +409,10 @@ export default {
     async getList() {
       this.loading = true;
       this.$set(this.queryParams,"progress",['0%','0% '])
-      this.$set(this.queryParams,"startDate",this.query.leadDateRange[0])
-      this.$set(this.queryParams,"endDate",this.query.leadDateRange[1])
+      let dateRange = this.changeDateRange([...this.query.leadDateRange],this.statMode)
+      console.log(dateRange)
+      this.$set(this.queryParams,"startDate",dateRange[0])
+      this.$set(this.queryParams,"endDate",dateRange[1])
       // this.queryParams.progress = ['0%','0% ']
       try {
         const response = await listProjectBoard(this.queryParams);