From 4115adbdb02aec49e15fcc9e0794835856e0bc3a Mon Sep 17 00:00:00 2001
From: xuli <jswawa@qq.com>
Date: Thu, 20 Nov 2025 17:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/searchDate.vue           |  6 +++++-
 src/pages/business/polling/taskList.vue | 12 ++++++++----
 src/utils/datetime.js                   | 22 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/components/searchDate.vue b/src/components/searchDate.vue
index c7f2b20..f7e0fd4 100644
--- a/src/components/searchDate.vue
+++ b/src/components/searchDate.vue
@@ -77,7 +77,11 @@ const handleClose = ()=>{
     emit('close');
 }
 const handleConfirm = ()=>{
-    emit('confirm',{startDate:beginDate.value,endDate:endDate.value});
+    emit('confirm',{
+        startDate:beginDate.value,
+        endDate:endDate.value,
+        lastType:lastType.value
+    });
 }
 
 // 选择最近
diff --git a/src/pages/business/polling/taskList.vue b/src/pages/business/polling/taskList.vue
index 9bc4b99..16ded08 100644
--- a/src/pages/business/polling/taskList.vue
+++ b/src/pages/business/polling/taskList.vue
@@ -11,7 +11,7 @@
         <view class="search">
             <view class="search-bg s-b-left" @click="chooseDate">
                 <img :src="'static/images/polling/icon-search-clock.png'" class="img-icon" />
-                近3天
+                {{dateStrName}}
                 <uni-icons type="down" size="16" color="#C8DCFF" style="margin-left:auto;"></uni-icons>
             </view>
             <view class="search-bg s-b-right">
@@ -99,7 +99,7 @@ import { onLoad,onHide } from '@dcloudio/uni-app';
 import customHeader from '@/components/customHeader.vue';
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import searchDate from '@/components/searchDate.vue';
-import { parseTime,getDateRange } from '@/utils/datetime.js';
+import { parseTime,getDateRange,getDateRangeName } from '@/utils/datetime.js';
 import { taskTypeOptions,formatTaskType,formatTaskStatus } from '@/utils/status.js';
 import { noticeList } from '@/api/notice.js'
 
@@ -113,23 +113,27 @@ const chooseDate = ()=>{
 const dateClose=()=>{
     isShow.value = false;
 }
+// 选完日期提交回显
 const dateConfirm=(dateObj)=>{
     console.log(dateObj)
     isShow.value = false;
-    dateStr.value =  dateObj.startDate + ' 至 '+dateObj.endDate
+    dateStr.value =  dateObj.startDate + ' 至 '+dateObj.endDate;
+    dateStrName.value = getDateRangeName(dateObj.lastType)
 }
 
 // 类型索引
 let taskTypeIndex = ref(0);
 let taskTypeArr = ref([]);
 let dateStr = ref('');
+let dateStrName=ref('');
 onLoad(option => {
     taskTypeOptions.forEach(item => {
         taskTypeArr.value.push(item.label)
     });
 
     let dateObj = getDateRange('3days');
-    dateStr.value = dateObj.startDate + ' 至 '+dateObj.endDate
+    dateStr.value = dateObj.startDate + ' 至 '+dateObj.endDate;
+    dateStrName.value="近3天"
 })
 
 
diff --git a/src/utils/datetime.js b/src/utils/datetime.js
index abc29b7..8309984 100644
--- a/src/utils/datetime.js
+++ b/src/utils/datetime.js
@@ -162,3 +162,25 @@ export function getDateRange(rangeType) {
     endDate: format(endDate)
   };
 }
+// 获取rangeType名称
+export function getDateRangeName(rangeType){
+  let str = "";
+  switch (rangeType) {
+    case '3days':
+      str = "近3天"; // 近3天，含今天
+      break;
+    case '7days':
+      str = "近7天";// 近7天，含今天
+      break;
+    case '1month':
+      str = "近1月";// 近1月
+      break;
+    case '3months':
+      str = "近3月"; // 近3月
+      break;
+    default:
+      str="请选择";
+      // throw new Error('不支持的rangeType');
+  }
+  return str;
+}